TEST-81-GENERATORS: Clean /proc/cmdline of unusual mounts

This commit is contained in:
Richard Maw 2024-02-24 18:13:59 +00:00
parent 90eee2cf0f
commit 337d246faf

View file

@ -13,6 +13,7 @@ OUT_DIR="$(mktemp -d /tmp/fstab-generator.XXX)"
FSTAB="$(mktemp)"
at_exit() {
mountpoint -q /proc/cmdline && umount /proc/cmdline
rm -fr "${OUT_DIR:?}" "${FSTAB:?}"
}
@ -294,6 +295,12 @@ check_fstab_mount_units() {
done
}
# Drop usrhash on the command-line so fstab-generator doesn't add a /dev/mapper
# mount for /usr, add a root= to emulate a more typical environment,
# and remove any systemd.mount-extra=
sed -r -e 's/usrhash=[^[:space:]+]/root=\/dev\/sda2/' -e 's/systemd.mount-extra=[^[:space:]+]//g' /proc/cmdline >/tmp/cmdline.tmp
mount --bind /tmp/cmdline.tmp /proc/cmdline
: "fstab-generator: regular"
printf "%s\n" "${FSTAB_GENERAL_ROOT[@]}" >"$FSTAB"
cat "$FSTAB"