Skip to content
This repository was archived by the owner on Jan 18, 2026. It is now read-only.

Commit 8295f24

Browse files
committed
Fixes insertion of modules into mkinitcpio.conf
Changes all sed lines for MODULES= to change only the line where MODULES= is at the start of the line. Changes nvidia drm, f2fs, and nvme sed MODULES= line modification to behave like the recently modified xfs sed MODULES= line modification, such that it will append to whatever is already in the modules list.
1 parent 18362b8 commit 8295f24

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

lib/configure_system.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ configure_system() {
4040
fi
4141

4242
if "$drm" ; then
43-
sed -i 's/MODULES=""/MODULES="nvidia nvidia_modeset nvidia_uvm nvidia_drm"/' "$ARCH"/etc/mkinitcpio.conf
43+
sed -i '/^MODULES=/ s/.$/ nvidia nvidia_modeset nvidia_uvm nvidia_drm )/;s/" /"/'
4444
sed -i 's!FILES=""!FILES="/etc/modprobe.d/nvidia.conf"!' "$ARCH"/etc/mkinitcpio.conf
4545
echo "options nvidia_drm modeset=1" > "$ARCH"/etc/modprobe.d/nvidia.conf
4646

@@ -63,7 +63,7 @@ configure_system() {
6363
fi
6464

6565
if "$enable_f2fs" ; then
66-
sed -i '/MODULES=/ s/.$/ f2fs crc32 libcrc32c crc32c_generic crc32c-intel crc32-pclmul"/;s/" /"/' "$ARCH"/etc/mkinitcpio.conf
66+
sed -i '/^MODULES=/ s/.$/ f2fs crc32 libcrc32c crc32c_generic crc32c-intel crc32-pclmul )/;s/" /"/' "$ARCH"/etc/mkinitcpio.conf
6767
if ! "$crypted" ; then
6868
arch-chroot "$ARCH" mkinitcpio -p "$kernel" &>/dev/null &
6969
pid=$! pri=1 msg="\n$f2fs_config_load \n\n \Z1> \Z2mkinitcpio -p $kernel\Zn" load
@@ -72,7 +72,7 @@ configure_system() {
7272
fi
7373

7474
if "$enable_xfs" ; then
75-
sed -i '/MODULES=/ s/.$/ xfs )/;s/" /"/' "$ARCH"/etc/mkinitcpio.conf
75+
sed -i '/^MODULES=/ s/.$/ xfs )/;s/" /"/' "$ARCH"/etc/mkinitcpio.conf
7676
if ! "$crypted" ; then
7777
arch-chroot "$ARCH" mkinitcpio -p "$kernel" &>/dev/null &
7878
pid=$! pri=1 msg="\n$xfs_config_load \n\n \Z1> \Z2mkinitcpio -p $kernel\Zn" load
@@ -81,7 +81,7 @@ configure_system() {
8181
fi
8282

8383
if (<<<"$BOOT" egrep "nvme.*" &> /dev/null) then
84-
sed -i 's/MODULES="/MODULES="nvme /;s/ "/"/' "$ARCH"/etc/mkinitcpio.conf
84+
sed -i '/^MODULES=/ s/.$/ nvme )/;s/" /"/' "$ARCH"/etc/mkinitcpio.conf
8585
if ! "$crypted" ; then
8686
arch-chroot "$ARCH" mkinitcpio -p "$kernel" &>/dev/null &
8787
pid=$! pri=1 msg="\n$kernel_config_load \n\n \Z1> \Z2mkinitcpio -p $kernel\Zn" load

0 commit comments

Comments
 (0)