diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-04-08 15:32:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-04-14 12:19:06 +0200 |
| commit | 59c2b9fe379e1514f022b94f92a46267c45a647a (patch) | |
| tree | cee602157b15bd5119761dee7b33ccfe068e6e89 | |
| parent | b2d9c647a36e389d49178359a8ded10f6173e6fa (diff) | |
| download | debian-edu-fai+itzks-59c2b9fe379e1514f022b94f92a46267c45a647a.tar.gz debian-edu-fai+itzks-59c2b9fe379e1514f022b94f92a46267c45a647a.tar.bz2 debian-edu-fai+itzks-59c2b9fe379e1514f022b94f92a46267c45a647a.zip | |
fai/config/scripts/GRUB_EFI/10-setup: Use <tab> for indentations.
| -rwxr-xr-x | fai/config/scripts/GRUB_EFI/10-setup | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/fai/config/scripts/GRUB_EFI/10-setup b/fai/config/scripts/GRUB_EFI/10-setup index f586ba1..7a98b83 100755 --- a/fai/config/scripts/GRUB_EFI/10-setup +++ b/fai/config/scripts/GRUB_EFI/10-setup @@ -15,13 +15,13 @@ set -a # do not set up grub during dirinstall if [ "$FAI_ACTION" = "dirinstall" ] ; then - exit 0 + exit 0 fi # during softupdate use this file [ -r $LOGDIR/disk_var.sh ] && . $LOGDIR/disk_var.sh if [ -z "$BOOT_DEVICE" ]; then - exit 189 + exit 189 fi # disable os-prober because of #788062 @@ -29,8 +29,8 @@ ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true' # skip the rest, if not an initial installation if [ $FAI_ACTION != "install" ]; then - $ROOTCMD update-grub - exit $error + $ROOTCMD update-grub + exit $error fi GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE) @@ -38,30 +38,30 @@ GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE) # handle /boot in lvm-on-md _bdev=$(readlink -f $BOOT_DEVICE) if [ "${_bdev%%-*}" = "/dev/dm" ]; then - BOOT_DEVICE=$( lvs --noheadings -o devices $BOOT_DEVICE | sed -e 's/^*\([^(]*\)(.*$/\1/' ) + BOOT_DEVICE=$( lvs --noheadings -o devices $BOOT_DEVICE | sed -e 's/^*\([^(]*\)(.*$/\1/' ) fi # Check if RAID is used for the boot device if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then - raiddev=${BOOT_DEVICE#/dev/} - # install grub on all members of RAID - for device in `LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat`; do - echo Install grub on /dev/$device - $ROOTCMD grub-install --no-floppy --force-extra-removable "/dev/$device" - done + raiddev=${BOOT_DEVICE#/dev/} + # install grub on all members of RAID + for device in `LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat`; do + echo Install grub on /dev/$device + $ROOTCMD grub-install --no-floppy --force-extra-removable "/dev/$device" + done elif [[ $BOOT_DEVICE =~ '/dev/loop' ]]; then - # do not update vmram when using a loop device - $ROOTCMD grub-install --no-floppy --force-extra-removable --modules=part_gpt --no-nvram $BOOT_DEVICE - if [ $? -eq 0 ]; then - echo "Grub installed on hostdisk $BOOT_DEVICE" - fi + # do not update vmram when using a loop device + $ROOTCMD grub-install --no-floppy --force-extra-removable --modules=part_gpt --no-nvram $BOOT_DEVICE + if [ $? -eq 0 ]; then + echo "Grub installed on hostdisk $BOOT_DEVICE" + fi else - $ROOTCMD grub-install --no-floppy --modules=part_gpt "$GROOT" - if [ $? -eq 0 ]; then - echo "Grub installed on $BOOT_DEVICE = $GROOT" - fi + $ROOTCMD grub-install --no-floppy --modules=part_gpt "$GROOT" + if [ $? -eq 0 ]; then + echo "Grub installed on $BOOT_DEVICE = $GROOT" + fi fi $ROOTCMD update-grub |