summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Powalowski <tpowa@archlinux.org>2006-05-04 10:43:48 +0200
committerTobias Powalowski <tpowa@archlinux.org>2006-05-04 10:43:48 +0200
commit830a2f97e258de184197737fef050dc13578b0dc (patch)
treeb3a6a1e5e95722163074bfcab1c04667afd86e33
parentcb07072558843db27776a4fa81012c7040d986db (diff)
downloadmkinitcpio-830a2f97e258de184197737fef050dc13578b0dc.tar.gz
mkinitcpio-830a2f97e258de184197737fef050dc13578b0dc.tar.xz
'added net and usbinput'
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@59 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--install/autodetect3
-rw-r--r--install/net19
-rw-r--r--install/usbinput23
-rw-r--r--mkinitcpio-0.1-1.pkg.tar.gzbin14830 -> 15098 bytes
-rw-r--r--mkinitcpio.tar.bz2bin28166 -> 29480 bytes
5 files changed, 44 insertions, 1 deletions
diff --git a/install/autodetect b/install/autodetect
index d9214ed..abcfafe 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -6,7 +6,8 @@ install ()
MODULE_FILE="$(mktemp /tmp/initcpio_modules.XXXXXX)"
#blegh, we'll let /tmp clean itself up
AUTODETECT="$(auto_modules -e "/scsi/" -e "/block" -e "/fusion/" \
- -e "/usb/" -e "/ide/" -e "/ieee1394/" -e "/cdrom")
+ -e "/usb/" -e "/ide/" -e "/ieee1394/" -e "/cdrom"\
+ -e "/net/")
$(cat /proc/filesystems | grep -v nodev) "
for m in $AUTODETECT; do
diff --git a/install/net b/install/net
new file mode 100644
index 0000000..69aa25f
--- /dev/null
+++ b/install/net
@@ -0,0 +1,19 @@
+# vim: set ft=sh:
+
+install ()
+{
+ MODULES=" $(checked_modules "/net/") "
+
+ BINARIES=""
+ FILES=""
+ SCRIPT=""
+}
+
+help ()
+{
+cat<<HELPEOF
+ This hook loads the necessary modules for an network device.
+ Detection will take place at runtime. To minimize the modules
+ in the image, add the autodetect hook too.
+HELPEOF
+}
diff --git a/install/usbinput b/install/usbinput
new file mode 100644
index 0000000..3a7196b
--- /dev/null
+++ b/install/usbinput
@@ -0,0 +1,23 @@
+# vim: set ft=sh:
+
+install ()
+{
+ MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd") "
+
+ MODULES=$(echo ${MODULES}) #trim whitespace
+ if [ "x${MODULES}" != "x" ]; then
+ MODULES="${MODULES} usbhid"
+ fi
+ BINARIES=""
+ FILES=""
+ SCRIPT=""
+}
+
+help ()
+{
+cat<<HELPEOF
+ This hook loads the necessary modules for an usb input device.
+ Detection will take place at runtime. To minimize the modules
+ in the image, add the autodetect hook too.
+HELPEOF
+}
diff --git a/mkinitcpio-0.1-1.pkg.tar.gz b/mkinitcpio-0.1-1.pkg.tar.gz
index 1419c41..b5533ee 100644
--- a/mkinitcpio-0.1-1.pkg.tar.gz
+++ b/mkinitcpio-0.1-1.pkg.tar.gz
Binary files differ
diff --git a/mkinitcpio.tar.bz2 b/mkinitcpio.tar.bz2
index 4b89e7b..dc8bc83 100644
--- a/mkinitcpio.tar.bz2
+++ b/mkinitcpio.tar.bz2
Binary files differ