This commit is contained in:
simono41 2018-05-06 01:29:06 +02:00
parent b188082038
commit 819fc35dc7

View file

@ -21,11 +21,11 @@ echo "Logged in as root"
function minimalinstallation() { function minimalinstallation() {
if [ -f base.txt ]; then if [ -f base.txt ]; then
pacstrap -c -d -G -M ${mountpoint} $(cat base.txt) pacstrap -c -d -G -M ${mountpoint} $(cat base.txt)
elif [ -f /opt/${repo}/base.txt ]; then elif [ -f /opt/${repo}/base.txt ]; then
pacstrap -c -d -G -M ${mountpoint} $(cat /opt/${repo}/base.txt) pacstrap -c -d -G -M ${mountpoint} $(cat /opt/${repo}/base.txt)
fi fi
} }
@ -813,7 +813,7 @@ function abfrage() {
# berechnungen # berechnungen
# if [ "${update}" != "n" ]; then # if [ "${update}" != "n" ]; then
read -p "Should an offline installation be carried out? : [Y/n] " offline read -p "Should an offline installation be carried out? : [Y/n] " offline
if [ "${offline}" != "n" ] if [ "${offline}" != "n" ]
then then
@ -821,9 +821,9 @@ function abfrage() {
else else
install="online" install="online"
fi fi
# else # else
# install="offline" # install="offline"
# fi # fi
if [ "${offline}" != "n" ] && [ "${update}" != "n" ]; then if [ "${offline}" != "n" ] && [ "${update}" != "n" ]; then
read -p "Do you want to activate the VNC protocol? : [y/N] " x11vnc read -p "Do you want to activate the VNC protocol? : [y/N] " x11vnc
@ -1110,12 +1110,12 @@ if [ "${name}" != "noinstall" ] && [ -z "${installationsfehler}" ] && [ "${offli
arch-chroot ${mountpoint} chfn -f "${name}" user1 arch-chroot ${mountpoint} chfn -f "${name}" user1
arch-chroot ${mountpoint} passwd user1 arch-chroot ${mountpoint} passwd user1
if [ -f /usr/bin/lightdm ]; then
mkdir -p ${mountpoint}/etc/lightdm/ mkdir -p ${mountpoint}/etc/lightdm/
cp /opt/${repo}/Xsession /opt/${repo}/keys.conf /opt/${repo}/lightdm-gtk-greeter.conf /opt/${repo}/lightdm.conf /opt/${repo}/users.conf ${mountpoint}/etc/lightdm/ cp /opt/${repo}/Xsession /opt/${repo}/keys.conf /opt/${repo}/lightdm-gtk-greeter.conf /opt/${repo}/lightdm.conf /opt/${repo}/users.conf ${mountpoint}/etc/lightdm/
if [ "${verschluesselung}" == "y" ] && [ -f /usr/bin/lightdm ] ; then
arch-chroot ${mountpoint} systemctl enable lightdm-plymouth.service arch-chroot ${mountpoint} systemctl enable lightdm-plymouth.service
else else
arch-chroot ${mountpoint} systemctl enable lightdm.service echo "lightdm nicht vorhanden!!!"
fi fi
fi fi