Merge remote-tracking branch 'upstream/master' into dual-bootdual-v36

2 files changed, 5 insertions, 1 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
 }
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5f9e887..cc66df4 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -266,7 +266,7 @@ command_pkglist () {
     _show_config pkglist
 
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Sl -r "${work_dir}/airootfs" --config "${pacman_conf}" | \
+    pacman -Sl --sysroot "${work_dir}/airootfs" | \
         awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \
         "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"