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-05-06 01:29:06 +02:00
parent b188082038
commit 819fc35dc7
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
arch-install
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
} }
@ -301,11 +301,11 @@ function installation {
fi fi
if [ "${offline}" != "n" ]; then if [ "${offline}" != "n" ]; then
if [ "${verschluesselung}" == "y" ]; then if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}plymouth-encrypt " parameter="${parameter}plymouth-encrypt "
else else
parameter="${parameter}plymouth " parameter="${parameter}plymouth "
fi fi
fi fi
echo "" echo ""
@ -658,16 +658,16 @@ function systemdboot() {
#rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}') #rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}')
if [ "${version}" == "manjaro" ]; then if [ "${version}" == "manjaro" ]; then
kernel1="$(find /boot/ -name "initramfs*$(uname -m).img")" kernel1="$(find /boot/ -name "initramfs*$(uname -m).img")"
linuz1="$(find /boot/ -name "vmlinuz*$(uname -m)")" linuz1="$(find /boot/ -name "vmlinuz*$(uname -m)")"
kernel="${kernel1#/*/}" kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}" linuz="${linuz1#/*/}"
kernelback1="$(find /boot/ -name "initramfs*$(uname -m)-fallback.img")" kernelback1="$(find /boot/ -name "initramfs*$(uname -m)-fallback.img")"
kernelback="${kernelback1#/*/}" kernelback="${kernelback1#/*/}"
else else
kernel="initramfs-linux.img" kernel="initramfs-linux.img"
linuz="vmlinuz-linux" linuz="vmlinuz-linux"
kernelback="initramfs-linux-fallback.img" kernelback="initramfs-linux-fallback.img"
fi fi
mkdir -p ${mountpoint}/boot/EFI/systemd/ mkdir -p ${mountpoint}/boot/EFI/systemd/
@ -813,17 +813,17 @@ 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
install="offline" install="offline"
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
mkdir -p ${mountpoint}/etc/lightdm/ if [ -f /usr/bin/lightdm ]; then
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/ mkdir -p ${mountpoint}/etc/lightdm/
if [ "${verschluesselung}" == "y" ] && [ -f /usr/bin/lightdm ] ; then 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/
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