hooks: restructure a bit

Meulengracht · Feb 20, 2025 · e38e5ff · e38e5ff
1 parent 6af3cc9
commit e38e5ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/hooks/009-locale-archive.chroot b/hooks/009-locale-archive.chroot
@@ -24,12 +24,3 @@ for encoding in "${!found_encodings[@]}"; do
 done
 
 apt-get purge -y locales
-
-# restore configuration so the default locale can be found
-printf 'LANG=C.UTF-8\n' > /etc/writable/locale.conf
-ln -s ../writable/locale.conf /etc/default/locale
-ln -s writable/locale.conf /etc/locale.conf
-
-mv /etc/vconsole.conf /etc/writable/vconsole.conf
-ln -s ../writable/vconsole.conf /etc/default/keyboard
-ln -s writable/vconsole.conf /etc/vconsole.conf
diff --git a/hooks/010-locale-vconsole-symlinks.chroot b/hooks/010-locale-vconsole-symlinks.chroot
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -eu
+
+# setup default console configuration, make them symlinks
+# into writable so they can be changed
+printf 'LANG=C.UTF-8\n' > /etc/writable/locale.conf
+ln -s ../writable/locale.conf /etc/default/locale
+ln -s writable/locale.conf /etc/locale.conf
+
+# setup default vconsole/keyboard configuration, make it a
+# symlink as well so it can change
+mv /etc/vconsole.conf /etc/writable/vconsole.conf
+ln -s ../writable/vconsole.conf /etc/default/keyboard
+ln -s writable/vconsole.conf /etc/vconsole.conf