simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-09-03 02:08:19 +02:00
parent 1a14e80d37
commit 890d523543
1 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
arch-graphical-install-auto
View file

@ -166,19 +166,19 @@ function ldconfigcache() {
function addusers() { function addusers() {
if ! cat /etc/group | grep users; then if ! cat /etc/group | grep users; then
groupadd users groupadd users
fi fi
if ! cat /etc/group | grep wheel; then if ! cat /etc/group | grep wheel; then
groupadd wheel groupadd wheel
fi fi
if ! cat /etc/group | grep audio; then if ! cat /etc/group | grep audio; then
groupadd audio groupadd audio
fi fi
if ! cat /etc/group | grep video; then if ! cat /etc/group | grep video; then
groupadd video groupadd video
fi fi
if ! cat /etc/group | grep optical; then if ! cat /etc/group | grep optical; then
groupadd optical groupadd optical
fi fi
useradd -m -g users -G wheel,audio,video,sys,optical -s /bin/bash $username useradd -m -g users -G wheel,audio,video,sys,optical -s /bin/bash $username
passwd ${username} <<EOT passwd ${username} <<EOT
@ -343,9 +343,11 @@ gitclone
# startup # startup
cp /opt/${repo}/startup /usr/bin/ cp /opt/${repo}/startup /usr/bin/
chmod 755 /usr/bin/startup chmod 755 /usr/bin/startup
cp /opt/${repo}/startup.service /etc/systemd/system/ if ! [ "${version}" == "libre-xfce4-openrc" ]; then
chmod 644 /etc/systemd/system/startup.service cp /opt/${repo}/startup.service /etc/systemd/system/
systemctl enable startup.service chmod 644 /etc/systemd/system/startup.service
systemctl enable startup.service
fi
# pacman-config # pacman-config
if [ "${version%-*-*}" == "libre" ]; then if [ "${version%-*-*}" == "libre" ]; then
@ -446,13 +448,17 @@ then
echo "[Service]" > /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "[Service]" > /etc/systemd/system/getty\@tty1.service.d/autologin.conf
echo "ExecStart=" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "ExecStart=" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf
echo "ExecStart=-/usr/bin/agetty --autologin root -s %I 115200,38400,9600 vt102" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "ExecStart=-/usr/bin/agetty --autologin root -s %I 115200,38400,9600 vt102" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf
systemctl enable getty@tty1 if ! [ "${version}" == "libre-xfce4-openrc" ]; then
systemctl enable getty@tty1
fi
else else
mkdir -p /etc/systemd/system/getty\@tty1.service.d mkdir -p /etc/systemd/system/getty\@tty1.service.d
echo "[Service]" > /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "[Service]" > /etc/systemd/system/getty\@tty1.service.d/autologin.conf
echo "ExecStart=" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "ExecStart=" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf
echo "ExecStart=-/usr/bin/agetty --autologin $username -s %I 115200,38400,9600 vt102" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf echo "ExecStart=-/usr/bin/agetty --autologin $username -s %I 115200,38400,9600 vt102" >> /etc/systemd/system/getty\@tty1.service.d/autologin.conf
systemctl enable getty@tty1 if ! [ "${version}" == "libre-xfce4-openrc" ]; then
systemctl enable getty@tty1
fi
fi fi
elif [ "$start" == "xdm" ] elif [ "$start" == "xdm" ]
@ -468,26 +474,28 @@ else
echo "Kein Start gewählt!!!" echo "Kein Start gewählt!!!"
fi fi
systemctl enable acpid if ! [ "${version}" == "libre-xfce4-openrc" ]; then
systemctl enable ntpd systemctl enable acpid
systemctl enable avahi-daemon systemctl enable ntpd
systemctl enable org.cups.cupsd.service systemctl enable avahi-daemon
systemctl enable sshd systemctl enable org.cups.cupsd.service
systemctl enable cronie systemctl enable sshd
systemctl enable systemd-timesyncd.service systemctl enable cronie
echo "Bitte OpenVPN config in die /etc/openvpn/client/client.conf kopieren!!!" systemctl enable systemd-timesyncd.service
if [ -f /lib/systemd/system/openvpn-client@client.service ]; then echo "Bitte OpenVPN config in die /etc/openvpn/client/client.conf kopieren!!!"
echo "link vorhanden!" if [ -f /lib/systemd/system/openvpn-client@client.service ]; then
else echo "link vorhanden!"
ln /lib/systemd/system/openvpn-client@.service /lib/systemd/system/openvpn-client@client.service else
ln /lib/systemd/system/openvpn-client@.service /lib/systemd/system/openvpn-client@client.service
fi
#Bei ausdokumentierung wird eine/die VPN automatisch aus der /etc/openvpn/client/client.conf gestartet!!!
#systemctl enable openvpn-client@client.service
systemctl enable fail2ban
systemctl disable dhcpcd
systemctl enable NetworkManager.service
systemctl enable bluetooth.service
systemctl enable httpd
fi fi
#Bei ausdokumentierung wird eine/die VPN automatisch aus der /etc/openvpn/client/client.conf gestartet!!!
#systemctl enable openvpn-client@client.service
systemctl enable fail2ban
systemctl disable dhcpcd
systemctl enable NetworkManager.service
systemctl enable bluetooth.service
systemctl enable httpd
# set systemconfiguration # set systemconfiguration
echo "systemconfiguration" echo "systemconfiguration"
@ -628,8 +636,9 @@ if [ -f /etc/systemd/system/x11vnc.service ]; then
fi fi
cp /opt/${repo}/x11vnc.service /etc/systemd/system/x11vnc.service cp /opt/${repo}/x11vnc.service /etc/systemd/system/x11vnc.service
chmod 644 /etc/systemd/system/x11vnc.service chmod 644 /etc/systemd/system/x11vnc.service
systemctl enable x11vnc.service if ! [ "${version}" == "libre-xfce4-openrc" ]; then
systemctl enable x11vnc.service
fi
# .Conky # .Conky
compress restore /opt/${repo}/.Conky.tar.pxz /opt/ compress restore /opt/${repo}/.Conky.tar.pxz /opt/
chmod 755 -Rv /opt/.Conky/ chmod 755 -Rv /opt/.Conky/