From 5a57d8396457aa7360529948a4f2a43fe9f400fd Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 24 Jun 2018 12:48:52 -0300 Subject: [archiso] Use --sysroot when list installed packages. Signed-off-by: Gerardo Exequiel Pozzi --- archiso/mkarchiso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archiso') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5f9e887..c8bec0a 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" --config "${pacman_conf}" | \ awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \ "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" _msg_info "Done!" -- cgit v1.2.3-70-g09d2 From 4b7c87fe7663df06214a67d81f293517818b9130 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 25 Jun 2018 13:28:51 -0300 Subject: [archiso] Drop --config when using --sysroot https://lists.archlinux.org/pipermail/arch-releng/2018-June/003834.html Signed-off-by: Gerardo Exequiel Pozzi --- archiso/mkarchiso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archiso') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index c8bec0a..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 --sysroot "${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.3-70-g09d2 From a00ba0f49921fb19ac1fb77b50d0ed74e04ac062 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 29 Jun 2018 11:16:19 +0200 Subject: Remove cow file early for non-persistent systems 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 --- archiso/initcpio/hooks/archiso | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'archiso') 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 } -- cgit v1.2.3-70-g09d2