aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeer <himbeerserverde@gmail.com>2024-03-24 12:09:45 +0100
committerHimbeer <himbeerserverde@gmail.com>2024-03-24 12:09:45 +0100
commit5b5fec24795f1780e53f0c927b5c22a11eb02d19 (patch)
tree85d9f22d84b388ec28d0a83b5dd3d5282b2ed7b6
parent4ef2b3494829aed1052427fe03b7184b2ae3132d (diff)
make mkinitcpio encrypt hook activation more forwards-compatible
-rwxr-xr-xmkcryptartix2
-rwxr-xr-xmkcryptuefi2
2 files changed, 2 insertions, 2 deletions
diff --git a/mkcryptartix b/mkcryptartix
index 6c0adb1..226e78e 100755
--- a/mkcryptartix
+++ b/mkcryptartix
@@ -32,7 +32,7 @@ EOT
sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
-sed -i "s/HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck)/HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block encrypt filesystems fsck)/" /etc/mkinitcpio.conf
+sed -i 's/^HOOKS=(\(.*\)block filesystems\(.*\))/HOOKS=(\1block encrypt filesystems\2)/g' /etc/mkinitcpio.conf
pacman -S --needed --noconfirm btrfs-progs grub os-prober device-mapper-openrc cryptsetup-openrc
diff --git a/mkcryptuefi b/mkcryptuefi
index 1f6087c..5ca5656 100755
--- a/mkcryptuefi
+++ b/mkcryptuefi
@@ -32,7 +32,7 @@ EOT
sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
echo "KEYMAP=${KEYMAP}" > /etc/vconsole.conf
-sed -i "s/HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck)/HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block encrypt filesystems fsck)/" /etc/mkinitcpio.conf
+sed -i 's/^HOOKS=(\(.*\)block filesystems\(.*\))/HOOKS=(\1block encrypt filesystems\2)/g' /etc/mkinitcpio.conf
pacman -S --needed --noconfirm btrfs-progs efibootmgr device-mapper-openrc cryptsetup-openrc