diff options
| author | Kroy <kroy@kroy.io> | 2018-12-01 17:36:42 -0600 |
|---|---|---|
| committer | Kroy <kroy@kroy.io> | 2018-12-01 17:36:42 -0600 |
| commit | a4e55e633137e558ce02da48b4ad16acffbcf1a7 (patch) | |
| tree | 57432b2404294969e2fd9b6d3f5b2b41dd946e06 /scripts/install/install-postinst-new | |
| parent | 0ebc3def62c13a19bcfb8d25ae479235ed376268 (diff) | |
| download | vyatta-cfg-system-a4e55e633137e558ce02da48b4ad16acffbcf1a7.tar.gz vyatta-cfg-system-a4e55e633137e558ce02da48b4ad16acffbcf1a7.zip | |
EFI Cleanup. Adding removable option to grub-install
Diffstat (limited to 'scripts/install/install-postinst-new')
| -rwxr-xr-x | scripts/install/install-postinst-new | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index 0ed6441d..4e387c0d 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -20,8 +20,6 @@ INSTALL_DRIVE=$1 ROOT_PARTITION=$2 # install type: "union" or "old" INSTALL_TYPE=$3 -# For passing into vyatta-grub-setup -EFI_PARTITION=0 # Default user DEFAULT_USER=vyos @@ -130,7 +128,6 @@ install_grub () { dpkg -r grub-pc grub2 >&/dev/null # Install grub-efi packages dpkg -i /usr/share/vyos/packages/grub-efi*.deb >&/dev/null - EFI_PARTITION=1 mkdir -p $grub_root/boot/efi readarray parts < /tmp/efiparts.tmp part_length=${#parts[@]} @@ -145,7 +142,7 @@ install_grub () { fi mkdosfs -F 32 -n EFI /dev/$part >&/dev/null mount /dev/$part $grub_root/boot/efi - output=$(grub-install --no-floppy --recheck --target=x86_64-efi --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" 2>&1) + output=$(grub-install --no-floppy --recheck --target=x86_64-efi --force-extra-removable --root-directory=$grub_root --efi-directory=$grub_root/boot/efi --bootloader-id="$bootloader_name" 2>&1) umount $grub_root/boot/efi ##TODO DO we need these to be in fstab?? # @@ -174,7 +171,7 @@ install_grub () { progress_indicator stop output=$(/opt/vyatta/sbin/vyatta-grub-setup $grub_setup_args \ - "$ROOT_PARTITION" '' $grub_root "$EFI_PARTITION" 2>&1) + "$ROOT_PARTITION" '' $grub_root 2>&1) ret=$? lecho "$output" if [ $ret == 0 ]; then |