Skip to content

Commit

Permalink
Respect request to not unmount EFI boot partition
Browse files Browse the repository at this point in the history
(when running in interactive mode)
Bump version to 1.0.33
  • Loading branch information
sakaki- committed Oct 14, 2018
1 parent c5af580 commit d15ae23
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions buildkernel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ shopt -s nullglob
# ********************** variables *********************
PROGNAME="$(basename "${0}")"
CONFFILE="/etc/${PROGNAME}.conf"
VERSION="1.0.32"
VERSION="1.0.33"
ETCPROFILE="/etc/profile"
DEFAULTEFIBOOTFILE="bootx64.efi"
EFIBOOTFILE="${DEFAULTEFIBOOTFILE}"
Expand Down Expand Up @@ -174,6 +174,7 @@ declare -i EFIVARFSREMOUNTEDRW=0
declare -i USINGMODULES=1

declare -i MOUNTEDONENTRY=0
declare -i DOUNMOUNT=1
# program arguments (booleans in this case)
declare -i ARG_ASK=0 ARG_CLEAN=0 ARG_COPYFROMSTAGING=0 ARG_HELP=0
declare -i ARG_STAGEONLY=0 ARG_UNMOUNTATEND=0 ARG_VERBOSE=0 ARG_VERSION=0
Expand Down Expand Up @@ -356,8 +357,10 @@ umount_and_forget() {
umount_all_remembered_mountpoints() {
local M ALLREMEMBEREDMOUNTS="${!ALLMOUNTS[@]}"
for M in ${ALLREMEMBEREDMOUNTS}; do
warning "Unmounting '${M}'"
umount_and_forget "${M}"
if (( DOUNMOUNT == 1 )) || [[ "${M}" != "${EFIROOTDIR}" ]]; then
warning "Unmounting '${M}'"
umount_and_forget "${M}"
fi
done
}
ensure_efivarfs_rw_if_present() {
Expand Down Expand Up @@ -2013,7 +2016,7 @@ finalize_efi_partition_and_unmount_if_desired() {
show "Syncing filesystem..."
sync
echo
declare -i DOUNMOUNT=0
DOUNMOUNT=0

if ((ARG_UNMOUNTATEND==1)); then
# this trumps everything else
Expand Down
2 changes: 1 addition & 1 deletion buildkernel.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH BUILDKERNEL 8 "Version 1.0.32: October 2018"
.TH BUILDKERNEL 8 "Version 1.0.33: October 2018"
.SH NAME
buildkernel \- build secure boot kernel, save to EFI system partition
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion buildkernel.conf.5
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH BUILDKERNEL 5 "Version 1.0.32: October 2018"
.TH BUILDKERNEL 5 "Version 1.0.33: October 2018"
.SH NAME
buildkernel.conf \- a configuration file for \fBbuildkernel\fR(8)
.SH SYNOPSIS
Expand Down

0 comments on commit d15ae23

Please sign in to comment.