archiso/initcpio/hooks/archiso: remove redundant /sfs/ from airootfs mount point

Remove /run/archiso/bootmnt directory if nothing is mounted there. An empty directory is just confusing.
This commit is contained in:
nl6720 2020-10-05 13:20:23 +03:00
parent 652ad4deed
commit 711ab4cd1e
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369

View File

@ -221,15 +221,16 @@ archiso_mount_handler() {
mkdir -p "/run/archiso/cowspace/${cow_directory}" mkdir -p "/run/archiso/cowspace/${cow_directory}"
chmod 0700 "/run/archiso/cowspace/${cow_directory}" chmod 0700 "/run/archiso/cowspace/${cow_directory}"
_mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs" _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/airootfs"
if [ -f "/run/archiso/sfs/airootfs/airootfs.img" ]; then if [ -f "/run/archiso/airootfs/airootfs.img" ]; then
_mnt_dmsnapshot "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/" _mnt_dmsnapshot "/run/archiso/airootfs/airootfs.img" "${newroot}" "/"
else else
_mnt_overlayfs "/run/archiso/sfs/airootfs" "${newroot}" "/" _mnt_overlayfs "/run/archiso/airootfs" "${newroot}" "/"
fi fi
if [ "${copytoram}" = "y" ]; then if [ "${copytoram}" = "y" ]; then
umount -d /run/archiso/bootmnt umount -d /run/archiso/bootmnt
rmdir /run/archiso/bootmnt
fi fi
} }