From f9a7b206a58a353eac2d26b464068cfe15f5e461 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 27 Jan 2021 11:31:02 +0200
Subject: configs/releng: move locale-gen from customize_airootfs.sh to a
 pacman hook

This finally removes customize_airootfs.sh from releng.

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/21 .
---
 .../releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook   | 13 +++++++++++++
 configs/releng/airootfs/root/customize_airootfs.sh          | 10 ----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
 delete mode 100755 configs/releng/airootfs/root/customize_airootfs.sh

(limited to 'configs')

diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
new file mode 100644
index 0000000..82dd199
--- /dev/null
+++ b/configs/releng/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/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh
deleted file mode 100755
index 5a39523..0000000
--- a/configs/releng/airootfs/root/customize_airootfs.sh
+++ /dev/null
@@ -1,10 +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 archiso version.
-
-sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
-locale-gen
-- 
cgit v1.2.3-70-g09d2