diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-06-26 13:02:36 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-06-26 13:02:36 +0300 |
| commit | 0d8d92d0a3a3726a7895ebaf44ceb7cc5b5ddd37 (patch) | |
| tree | 57d425a8c21c4e69b1ccc297ff8e12a3bea5f316 | |
| parent | 00213d01da907d27d1b66d6c9481f1bd0b48582b (diff) | |
| download | setup-efi-ivi-0d8d92d0a3a3726a7895ebaf44ceb7cc5b5ddd37.tar.gz setup-efi-ivi-0d8d92d0a3a3726a7895ebaf44ceb7cc5b5ddd37.tar.bz2 setup-efi-ivi-0d8d92d0a3a3726a7895ebaf44ceb7cc5b5ddd37.zip | |
setup-efi-ivi: do not assume that boot partition in in /boot
Do not assume that the boot partition is currently mounted under /boot. In
pc-installer environment it can be mounted under a different directory.
Instead, use the INSTALLERFW_MOUNT_PREFIX variable to find the path to the boot
partition. This should let pc-installer use this script as well.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| -rwxr-xr-x | setup-efi-ivi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/setup-efi-ivi b/setup-efi-ivi index 1520adf..ad5adf8 100755 --- a/setup-efi-ivi +++ b/setup-efi-ivi @@ -13,8 +13,6 @@ fatal() exit 1 } -boot_mountpoint="/boot" - # Make sure the installer framework variables are defined [ "x$INSTALLERFW_INSTALLER_NAME" != "x" ] || fatal "installer framework environment variables not found" @@ -32,7 +30,8 @@ while [ "$pnum" -lt "$INSTALLERFW_PART_COUNT" ]; do if [ "$mountpoint" == "/" ]; then root_partuuid=INSTALLERFW_PART${pnum}_PARTUUID root_partuuid="$(eval printf "%s" '$'$root_partuuid)" - elif [ "$mountpoint" == "$boot_mountpoint" ]; then + # The boot parition has to be at "/boot" + elif [ "$mountpoint" == "/boot" ]; then boot_fstype=INSTALLERFW_PART${pnum}_FSTYPE boot_fstype="$(eval printf "%s" '$'$boot_fstype)" fi @@ -44,6 +43,9 @@ done [ "$boot_fstype" == "vfat" ] || \ fatal "boot partition has to have type \"vfat\"" +# Find the current path to the boot partition +boot_mountpoint="$INSTALLERFW_MOUNT_PREFIX/boot" + # Make sure gummiboot is installed in the system if ! ([ -f /usr/lib/gummiboot/gummibootia32.efi ] || \ [ -f /usr/lib/gummiboot/gummibootx64.efi ]); then |