Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-06-29 11:16:19 +0200
committerGerardo Exequiel Pozzi <vmlinuz386@gmail.com>2018-06-29 13:08:24 -0300
commita00ba0f49921fb19ac1fb77b50d0ed74e04ac062 (patch)
tree45647a9b5115f7f68969a891922a72f4c32f9844
parentfd228a9a440eae5692a99fa289c654f68a056be0 (diff)
Remove cow file early for non-persistent systemsv36
The kernel has an open file handle after setting up the mapping. We can remove it early to make sure it is gone on shutdown. This helps to keep the cow_device clean for non-persistent systems where cow_directory contains a version specific string. Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--archiso/initcpio/hooks/archiso4
1 files changed, 4 insertions, 0 deletions
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index 753e3da..5c56561 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/hooks/archiso
@@ -33,6 +33,10 @@ _mnt_dmsnapshot() {
dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
+ if [[ "${cow_persistent}" != "P" ]]; then
+ rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
+ fi
+
_mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults"
echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices
}