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 14:47:37 +01:00
parent 26f0eca05d
commit ffbfda7e02
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Simon-OS/arch-install
View file

@ -210,8 +210,12 @@ if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}encrypt " parameter="${parameter}encrypt "
fi fi
parameter="${parameter}block filesystems keyboard " parameter="${parameter}block filesystems keyboard "
if [ "${dateisystem}" == "btrfs" ]; then if [ "${verschluesselung}" == "y" ]; then
parameter="${parameter}btrfs " echo "btrfs-hook wird übersprungen!"
else
if [ "${dateisystem}" == "btrfs" ]; then
parameter="${parameter}btrfs "
fi
fi fi
if [ "${usbsecret}" == "y" ]; then if [ "${usbsecret}" == "y" ]; then
parameter="${parameter}usbsecret " parameter="${parameter}usbsecret "
@ -509,7 +513,7 @@ swappartitionpart=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
# zurücksetzen der parameter # zurücksetzen der parameter
parameter="" parameter=""
if [ "${swap}" == "y" ]; then if [ "${swap}" != "n" ]; then
parameter="${parameter}resume=PARTUUID=${swappartitionpart} " parameter="${parameter}resume=PARTUUID=${swappartitionpart} "
fi fi
if [ "${verschluesselung}" == "y" ]; then if [ "${verschluesselung}" == "y" ]; then
@ -646,7 +650,9 @@ if [ "${update}" != "n" ]; then
fi fi
fi fi
read -p "Soll die Festplatte verschlüsselt werden? : [y/N] " verschluesselung if [ "${raid}" == "n" ]; then
read -p "Soll die Festplatte verschlüsselt werden? : [y/N] " verschluesselung
fi
# berechnungen # berechnungen