diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-07-12 21:59:56 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-07-14 11:29:08 +0200 |
| commit | 1c07e1a1d1a13994046be222b528b4706efc1b9b (patch) | |
| tree | 6c3443db719520a6a3aedaee9c3c4d8a815e6051 /gen_bootloader.sh | |
| parent | genkernel: Cannot use 'local' outside of a function (diff) | |
| download | genkernel-1c07e1a1d1a13994046be222b528b4706efc1b9b.tar.gz genkernel-1c07e1a1d1a13994046be222b528b4706efc1b9b.tar.bz2 genkernel-1c07e1a1d1a13994046be222b528b4706efc1b9b.zip | |
set_bootloader_grub(): Move creation of grub.map into set_bootloader_grub() function
Before this, set_bootloader_grub_read_device_map() wasn't even called.
But no need for a separate function.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'gen_bootloader.sh')
| -rwxr-xr-x | gen_bootloader.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 3e3ecb08..42641ef5 100755 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -29,13 +29,6 @@ set_bootloader_read_fstab() { echo "${ROOTFS} ${BOOTFS}" } -set_bootloader_grub_read_device_map() { - # Read GRUB device map - [ ! -d ${TEMP} ] && mkdir ${TEMP} - echo "quit" | grub --batch --device-map=${TEMP}/grub.map &>/dev/null - echo "${TEMP}/grub.map" -} - set_bootloader_grub2() { local GRUB_CONF for candidate in \ @@ -78,8 +71,10 @@ set_bootloader_grub() { fi # Get the GRUB mapping for our device + echo "quit" | grub --batch --device-map="${TEMP}/grub.map" &>/dev/null + local GRUB_BOOT_DISK1=$(echo ${GRUB_BOOTFS} | sed -e 's#\(/dev/.\+\)[[:digit:]]\+#\1#') - local GRUB_BOOT_DISK=$(awk '{if ($2 == "'${GRUB_BOOT_DISK1}'") {gsub(/(\(|\))/, "", $1); print $1;}}' ${TEMP}/grub.map) + local GRUB_BOOT_DISK=$(awk '{if ($2 == "'${GRUB_BOOT_DISK1}'") {gsub(/(\(|\))/, "", $1); print $1;}}' "${TEMP}/grub.map") local GRUB_BOOT_PARTITION=$(($(echo ${GRUB_BOOTFS} | sed -e 's#/dev/.\+\([[:digit:]]?*\)#\1#') - 1)) if [ -n "${GRUB_BOOT_DISK}" -a -n "${GRUB_BOOT_PARTITION}" ] |