From 2f6f116d550a49d4239b0aecbaf4562ef922bab9 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 2 Feb 2021 00:59:26 -0300 Subject: sync with archiso Imported changes: f0ef2f3 (HEAD -> master, tag: v51, origin/master, origin/HEAD) Add changelog file b588c52 build-host.sh: Style and syntax fixes 428bf47 Add build stage for continuous integration 2a24429 Add continuous integration scripts to linting 0723949 Add scripts for continuous integration f9a7b20 configs/releng: move locale-gen from customize_airootfs.sh to a pacman hook a46c740 config/releng: remove pacman hooks specific to ISO build process from airootfs after they run 767c095 Update my email in AUTHORS dd51457 rm un-used set_image() dupe of check_image() in run_archiso.sh 23c5d52 add vorburger to AUTHORS.rst 0f20a11 Support setting more variables in profiledef.sh and rework the way overrides are applied e7306a3 add cloud-init to baseline 744b8f1 make baseline have working ethernet networking, like releng 94dd194 add SSH server to baseline 221a921 use same airootfs_image_tool_options in baseline as in releng 4f4047a configs/releng: move the mirror uncommenting sed command from customize_airootfs.sh to a pacman hook a2c8dd3 archiso_pxe_common: remove resolv.conf before copy b30d1ca mkarchiso: add version information Signed-off-by: David P --- .../airootfs/etc/pacman.d/hooks/40-locale-gen.hook | 13 +++++++++++++ .../airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook | 12 ++++++++++++ .../zzzz99-remove-custom-hooks-from-airootfs.hook | 18 ++++++++++++++++++ .../releng-openrc/airootfs/root/customize_airootfs.sh | 12 ------------ 4 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook create mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook create mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook delete mode 100755 configs/releng-openrc/airootfs/root/customize_airootfs.sh (limited to 'configs/releng-openrc') diff --git a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook new file mode 100644 index 0000000..82dd199 --- /dev/null +++ b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook @@ -0,0 +1,13 @@ +# remove from airootfs! +[Trigger] +Operation = Install +Type = Package +Target = glibc + +[Action] +Description = Uncommenting en_US.UTF-8 locale and running locale-gen... +When = PostTransaction +Depends = glibc +Depends = sed +Depends = sh +Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" diff --git a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook new file mode 100644 index 0000000..ad0b5ba --- /dev/null +++ b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook @@ -0,0 +1,12 @@ +[Trigger] +Operation = Install +Operation = Upgrade +Type = Package +Target = pacman-mirrorlist + +[Action] +Description = Uncommenting all mirrors in /etc/pacman.d/mirrorlist... +When = PostTransaction +Depends = pacman-mirrorlist +Depends = sed +Exec = /usr/bin/sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist diff --git a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook new file mode 100644 index 0000000..8dfb943 --- /dev/null +++ b/configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook @@ -0,0 +1,18 @@ +# remove from airootfs! +# As a workaround for https://bugs.archlinux.org/task/49347 , remove pacman hooks specific to the ISO build process. +# If not, they would be used when pacstrap is run in the live environment. + +[Trigger] +Operation = Install +Operation = Upgrade +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Work around FS#49347 by removing custom pacman hooks that are only required during ISO build... +When = PostTransaction +Depends = sh +Depends = coreutils +Depends = grep +Exec = /bin/sh -c "rm -- $(grep -Frl 'remove from airootfs' /etc/pacman.d/hooks/)" diff --git a/configs/releng-openrc/airootfs/root/customize_airootfs.sh b/configs/releng-openrc/airootfs/root/customize_airootfs.sh deleted file mode 100755 index 92e57de..0000000 --- a/configs/releng-openrc/airootfs/root/customize_airootfs.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e -u - -# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version. - -sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen -locale-gen - -sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -- cgit v1.2.2