diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-07-18 17:30:17 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-07-18 17:30:17 +0200 |
| commit | 7aa2e795e8bfb6fecb7e659617c98c5e7db845a5 (patch) | |
| tree | 11e02201e3da0a4d4840f16bae98324840d64e07 | |
| parent | gen_determineargs.sh: determine_real_args(): Bail out when --no-busybox is se... (diff) | |
| download | genkernel-7aa2e795e8bfb6fecb7e659617c98c5e7db845a5.tar.gz genkernel-7aa2e795e8bfb6fecb7e659617c98c5e7db845a5.tar.bz2 genkernel-7aa2e795e8bfb6fecb7e659617c98c5e7db845a5.zip | |
gen_funcs.sh: restore_boot_mount_state(): Delete .bootdir.no_boot_partition only when present
Fixes 8458d98a ("Rework --mountboot handling")
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rwxr-xr-x | gen_funcs.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gen_funcs.sh b/gen_funcs.sh index c453962..31e4a6c 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -1410,14 +1410,14 @@ restore_boot_mount_state() { if [ -f "${TEMP}/.bootdir.no_boot_partition" ] then msg="mount: >> '${BOOTDIR}' is not a mountpoint; Nothing to restore ..." + + rm "${TEMP}/.bootdir.no_boot_partition" \ + || gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!" fi print_info 5 '' 1 0 print_info 5 "${msg}" - rm "${TEMP}/.bootdir.no_boot_partition" \ - || gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!" - return fi } |