From a242d8f29a1b3a6c24f6e2dffbd9f78571bb1a69 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 17 Jul 2018 13:42:47 -0400 Subject: Release parabolaiso-v36 Signed-off-by: David P --- parabolaiso/initcpio/hooks/parabolaiso | 4 ++++ parabolaiso/mkparabolaiso | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'parabolaiso') diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso index ef79b2b..6499310 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso +++ b/parabolaiso/initcpio/hooks/parabolaiso @@ -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/parabolaiso/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/parabolaiso/used_block_devices } diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 4475244..ab81a67 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -273,7 +273,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!" -- cgit v1.2.2