diff options
| author | Kroy <kroy@kroy.io> | 2018-11-06 10:29:42 -0600 |
|---|---|---|
| committer | Kroy <kroy@kroy.io> | 2018-11-06 10:29:42 -0600 |
| commit | 13ef90fa2b51baedf9efa4299eb4d2c128b6f191 (patch) | |
| tree | 622690981d2b2373de0a6c12409bf27aaed3e1ba /scripts/install/install-image | |
| parent | a7731785aeb928ace93a176a9c574267a00836e4 (diff) | |
| download | vyatta-cfg-system-13ef90fa2b51baedf9efa4299eb4d2c128b6f191.tar.gz vyatta-cfg-system-13ef90fa2b51baedf9efa4299eb4d2c128b6f191.zip | |
T955: Integrating EFI into the installer
Diffstat (limited to 'scripts/install/install-image')
| -rwxr-xr-x | scripts/install/install-image | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image index f99d4ce8..dbdd5901 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -202,7 +202,6 @@ install_new () { local root_part=$1 local inst_drv=$2 - local efi_part=$3 if [ ! -e "/dev/$root_part" ] || [ ! -e "/dev/$inst_drv" ]; then fail_exit "Invalid drive/partition ($inst_drv and $root_part)." @@ -215,7 +214,7 @@ install_new () # postinst operations if ! /opt/vyatta/sbin/install-postinst-new \ - "$inst_drv" "$root_part" union "$efi_part"; then + "$inst_drv" "$root_part" union; then exit 1 fi } @@ -292,14 +291,13 @@ fi root_part_type='' root_part='' inst_drv='' -efi_part='' -eval "read root_part_type root_part inst_drv efi_part <$PART_FILE" >&/dev/null +eval "read root_part_type root_part inst_drv <$PART_FILE" >&/dev/null rm -f $PART_FILE >&/dev/null # handle different types case "$root_part_type" in new) - install_new "$root_part" "$inst_drv" "$efi_part" + install_new "$root_part" "$inst_drv" exit 0 ;; union|old) |