simono41/shell-scripte-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2017-11-11 01:55:39 +01:00
parent 0dcc286422
commit ae3bd2630b
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Simon-OS/arch-install
View file

@ -36,6 +36,7 @@ function secureumount() {
do do
umount ${mountpoint}${wort} umount ${mountpoint}${wort}
done done
umount ${mountpoint}
umount /mnt/btrfs-root umount /mnt/btrfs-root
#umount -R /mnt #umount -R /mnt
fi fi
@ -737,10 +738,10 @@ then
echo "Partioniere in GPT" echo "Partioniere in GPT"
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
echo "Erstelle zustzliche swap-partition" echo "Erstelle zustzliche swap-partition"
partionierenmitswap partionierenmitswap
else else
partionierenohneswap partionierenohneswap
fi fi
echo "installation" echo "installation"
installation installation
@ -753,22 +754,22 @@ EOT
echo "" echo ""
if [ "${boot}" == "grub" ] if [ "${boot}" == "grub" ]
then then
arch-chroot ${mountpoint} /bin/bash <<EOT arch-chroot ${mountpoint} /bin/bash <<EOT
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${name}"s-os --recheck grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${name}"s-os --recheck
grub-mkconfig -o /boot/grub/grub.cfg grub-mkconfig -o /boot/grub/grub.cfg
EOT EOT
else else
systemdboot systemdboot
fi fi
removeinstaller removeinstaller
echo "Fertig" echo "Fertig"
elif [ "${Partition}" == "mbr" ]; then elif [ "${Partition}" == "mbr" ]; then
echo "Partioniere in MBR" echo "Partioniere in MBR"
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
echo "Erstelle zustzliche swap-partition" echo "Erstelle zustzliche swap-partition"
partionierenmitswap partionierenmitswap
else else
partionierenohneswap partionierenohneswap
fi fi
echo "installation" echo "installation"
installation installation
@ -786,7 +787,6 @@ else
echo "Eingabe Ungueltig" echo "Eingabe Ungueltig"
exit 1 exit 1
fi fi
fi
if [ "${name}" == "debug" ] if [ "${name}" == "debug" ]
then then
@ -797,8 +797,8 @@ echo "Welcher befehl soll ausgefuert werden? "
befehl=blablabla befehl=blablabla
while [ "$befehl" != "" ] while [ "$befehl" != "" ]
do do
read -p "" befehl read -p "" befehl
$befehl $befehl
done done
fi fi
@ -807,7 +807,7 @@ if [ "${update}" != "n" ] && [ "spectre-os" != "$(cat /etc/hostname)" ]; then
read -p "Soll die erweiterte Installation durchgeführt werden? [Y/n] " graphical read -p "Soll die erweiterte Installation durchgeführt werden? [Y/n] " graphical
if [ "$graphical" != "n" ] if [ "$graphical" != "n" ]
then then
update https://raw.githubusercontent.com/simono41/Simon-OS/master/arch-graphical-install ${mountpoint}/root/arch-graphical-install "n" "arch-chroot ${mountpoint}" /root/arch-graphical-install update https://raw.githubusercontent.com/simono41/Simon-OS/master/arch-graphical-install ${mountpoint}/root/arch-graphical-install "n" "arch-chroot ${mountpoint}" /root/arch-graphical-install
fi fi
fi fi
echo "df!!!" echo "df!!!"