[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7e4a0896637b38cb37c3bdca6984f397fc9b16a7

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7e4a0896637b38cb37c3bdca6984f397fc9b16a7

[git]

[-- Attachment #1: Type: text/plain, Size: 2456 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7e4a0896637b38cb37c3bdca6984f397fc9b16a7 (commit)
      from  7f88a71f90f733c2004bcaeeb9633fc51d2b049a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e4a0896637b38cb37c3bdca6984f397fc9b16a7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Apr 6 15:09:57 2013 +0200

    initrd: fix net and hid modules at installer.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/installer/hid-modules     | 1 -
 config/rootfiles/installer/network-modules | 1 -
 lfs/initrd                                 | 6 ++++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 config/rootfiles/installer/hid-modules
 delete mode 100644 config/rootfiles/installer/network-modules

Difference in files:
diff --git a/config/rootfiles/installer/hid-modules b/config/rootfiles/installer/hid-modules
deleted file mode 100644
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
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 7403644..56e1967 100644
--- 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


hooks/post-receive
--
IPFire 2.x development tree