summaryrefslogtreecommitdiff
path: root/parabolaiso
diff options
context:
space:
mode:
Diffstat (limited to 'parabolaiso')
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso4
-rwxr-xr-xparabolaiso/mkparabolaiso2
2 files changed, 5 insertions, 1 deletions
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!"