Handle pre-mounted efi partitions

lonkamikaze · Mar 22, 2021 · a9433d2 · a9433d2
1 parent cbb99b0
commit a9433d2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/loaderupdate.sh b/src/loaderupdate.sh
@@ -197,7 +197,7 @@ bsda:obj:createClass loaderupdate:Mount \
 #	Failed to create mountpoint or failed to mount
 #
 loaderupdate:Mount.init() {
-	local device mountpoint
+	local device mountpoint nullfs
 	device="${1}"
 	shift
 	mountpoint="${1}"
@@ -209,6 +209,12 @@ loaderupdate:Mount.init() {
 		return 1
 	fi
 	setvar ${this}mountpoint "${mountpoint}"
+	nullfs="$(/sbin/mount -p | /usr/bin/awk -vDEV="${device}" '$1 == DEV && $0=$2')"
+	if [ -n "${nullfs}" ]; then
+		# fall back to a nullfs mount if the device is already mounted
+		device="${nullfs%%$'\n'*}"
+		set -- -t nullfs
+	fi
 	if ! /sbin/mount "$@" "${device}" "${mountpoint}"; then
 		bsda:err:raise E_LOADERUPDATE_MOUNT \
 		               "ERROR: Failed to mount device: ${device}"