Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-10-05 13:20:23 +0300
committernl6720 <nl6720@gmail.com>2021-03-09 16:25:45 +0200
commit711ab4cd1ed8a38eaed4dadcc8d1fed5d4002008 (patch)
treed033d9fcd5a8820deebb2d48da123cd2a7e5c224 /archiso
parent652ad4deed924c14b1ba7bee30754a7bd35cf53b (diff)
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.
Diffstat (limited to 'archiso')
-rw-r--r--archiso/initcpio/hooks/archiso9
1 files changed, 5 insertions, 4 deletions
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index 716c69e..bf98332 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/hooks/archiso
@@ -221,15 +221,16 @@ archiso_mount_handler() {
mkdir -p "/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"
- if [ -f "/run/archiso/sfs/airootfs/airootfs.img" ]; then
- _mnt_dmsnapshot "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
+ _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/airootfs"
+ if [ -f "/run/archiso/airootfs/airootfs.img" ]; then
+ _mnt_dmsnapshot "/run/archiso/airootfs/airootfs.img" "${newroot}" "/"
else
- _mnt_overlayfs "/run/archiso/sfs/airootfs" "${newroot}" "/"
+ _mnt_overlayfs "/run/archiso/airootfs" "${newroot}" "/"
fi
if [ "${copytoram}" = "y" ]; then
umount -d /run/archiso/bootmnt
+ rmdir /run/archiso/bootmnt
fi
}