summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-07-02 09:37:46 +0200
committerErich Eckner <git@eckner.net>2018-07-02 09:37:46 +0200
commita0567e82282840ab19f528e4d62b2801f772aeaf (patch)
treea93367405cd21eacd03be0e976ed626e666e2ea6 /archiso
parent40fe26078021b19391a41ac99537bc794e12d1fc (diff)
parenta00ba0f49921fb19ac1fb77b50d0ed74e04ac062 (diff)
downloadarchiso32-a0567e82282840ab19f528e4d62b2801f772aeaf.tar.xz
Merge remote-tracking branch 'upstream/master' into dual-bootdual-v36
Diffstat (limited to 'archiso')
-rw-r--r--archiso/initcpio/hooks/archiso4
-rwxr-xr-xarchiso/mkarchiso2
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!"