From 3cb2f96bb185feb0804ee2920b7331f21d35e97e Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 14 Aug 2021 19:59:43 -0400 Subject: move non-archiso configs to parabolaiso-configs.git other changes: * mkparabolaiso: set image_name_$arch variables at the beginning of _build_buildmode_bootstrap() 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 ------------------ 3 files changed, 43 deletions(-) delete mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook delete mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook delete mode 100644 configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook (limited to 'configs/releng-openrc/airootfs/etc/pacman.d') 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 deleted file mode 100644 index 82dd199..0000000 --- a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/40-locale-gen.hook +++ /dev/null @@ -1,13 +0,0 @@ -# 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 deleted file mode 100644 index ad0b5ba..0000000 --- a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index 8dfb943..0000000 --- a/configs/releng-openrc/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook +++ /dev/null @@ -1,18 +0,0 @@ -# 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/)" -- cgit v1.2.2