initrd: fix net and hid modules at installer.

diff --git a/config/rootfiles/installer/hid-modules b/config/rootfiles/installer/hid-modules
deleted file mode 100644 (file)
index 3b180e9..0000000
--- a/config/rootfiles/installer/hid-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/hid

diff --git a/config/rootfiles/installer/network-modules b/config/rootfiles/installer/network-modules
deleted file mode 100644 (file)
index 6dabddf..0000000
--- a/config/rootfiles/installer/network-modules
+++ /dev/null
@@ -1 +0,0 @@
-lib/modules/KVER-ipfire/kernel/drivers/net

diff --git a/lfs/initrd b/lfs/initrd
index 740364438e1047af763a07bffb2473dea55b3655..56e19679bf802c30949407dc0590791053694c51 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -64,6 +64,12 @@ $(TARGET) :
 
        -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
 
+       # Copy hid and network modules
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+       cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
+               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
        rm -rf /install/initrd/usr/share/man