From 22b1fb4c6be298a2df707247d316b7b897010bc6 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:22:28 -0300 Subject: [releng] bye zd1211-firmware --- configs/releng/packages.x86_64 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 9417e57..bae8238 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -62,4 +62,3 @@ wireless_tools wpa_actiond wvdial xl2tpd -zd1211-firmware -- cgit v1.2.3-70-g09d2 From 7e6b7157e697f88b70f38889e2641f5c22cc980c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:24:11 -0300 Subject: [releng] bye pcmcia initcpio --- configs/releng/mkinitcpio.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index 7f39b2c..c04f1dc 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) COMPRESSION="xz" -- cgit v1.2.3-70-g09d2 From b5ad2305db3606f0f222fd1cc5f9776e23e694c3 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:26:06 -0300 Subject: prepare release Signed-off-by: Gerardo Exequiel Pozzi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1baa8b9..e850910 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=35 +V=36 INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -- cgit v1.2.3-70-g09d2 From 02164ac244edd5e73039a8b1700ad4339a0dd405 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 23 Jun 2018 22:38:34 -0300 Subject: [releng] support for -P iso_publisher and -A iso_application in build.sh Implement FS#54126 --- configs/releng/build.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 6f4825b..595bfa2 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=archlinux iso_label="ARCH_$(date +%Y%m)" +iso_publisher="Arch Linux " +iso_application="Arch Linux Live/Rescue CD" iso_version=$(date +%Y.%m.%d) install_dir=arch work_dir=work @@ -26,6 +28,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -209,7 +215,7 @@ make_prepare() { # Build ISO make_iso() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso" + mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -217,11 +223,13 @@ if [[ ${EUID} -ne 0 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; -- cgit v1.2.3-70-g09d2 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(-) 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(-) 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 8f0ed7a69c8640eb74cd4db923c306f252a12ffe Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 28 Jun 2018 00:03:18 -0300 Subject: [releng] upgrade custom pacman.conf --- configs/releng/pacman.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 45fe03d..c678d01 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u @@ -84,9 +85,17 @@ Include = /etc/pacman.d/mirrorlist [community] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs - -- cgit v1.2.3-70-g09d2 From fd228a9a440eae5692a99fa289c654f68a056be0 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 28 Jun 2018 00:40:13 -0300 Subject: [releng] Copy custom pacman.conf to airootfs --- configs/releng/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 595bfa2..180fa94 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -97,6 +97,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/x86_64 + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/x86_64/airootfs/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt -- 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(+) 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