diff --git a/homelab.sh b/homelab.sh index 1295197..43fe4df 100755 --- a/homelab.sh +++ b/homelab.sh @@ -924,10 +924,11 @@ mkdir -p /mnt/etc/{zfs/zfs-list.cache,pacman.d/hooks,nginx/sites-{available,enab /mnt/srv/{repo,sftp}/ # Configure zfs for mkinitcpio -sed -e '/^HOOKS/ s/filesystems/netconf tinyssh zfsencryptssh zfs &/' \ - -e '/^HOOKS/ s/ fsck//' \ - -e '/^HOOKS/ s/systemd/udev/' \ - /mnt/etc/mkinitcpio.conf >/mnt/etc/mkinitcpio.conf.d/zz-hooks.conf +grep "^HOOKS" /mnt/etc/mkinitcpio.conf |\ + sed -e 's/filesystems/netconf tinyssh zfsencryptssh zfs &/' \ + -e 's/systemd/udev/' \ + -e 's/sd-vconsole/consolefont/' \ + -e 's/ fsck//' >/mnt/etc/mkinitcpio.conf.d/zz-hooks.conf cat >/mnt/etc/mkinitcpio.conf.d/zz-binaries.conf <<- 'binaries' BINARIES+=(/usr/bin/zfs) binaries @@ -1843,10 +1844,11 @@ preset install /dev/stdin /opt/local/hooks/mkinitcpio.conf <<- 'hook' #!/usr/bin/env bash # Hooks -sed -e '/^HOOKS/ s/filesystems/netconf tinyssh zfsencryptssh zfs &/' \ - -e '/^HOOKS/ s/ fsck//' \ - -e '/^HOOKS/ s/systemd/udev/' \ - /etc/mkinitcpio.conf >/etc/mkinitcpio.conf.d/zz-hooks.conf +grep "^HOOKS" /etc/mkinitcpio.conf |\ + sed -e 's/filesystems/netconf tinyssh zfsencryptssh zfs &/' \ + -e 's/systemd/udev/' \ + -e 's/sd-vconsole/consolefont/' \ + -e 's/ fsck//' >/etc/mkinitcpio.conf.d/zz-hooks.conf # Linux preset sed -e "s|%PKGBASE%|linux|g" \