summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Powalowski <tpowa@archlinux.org>2006-05-04 12:16:11 +0200
committerTobias Powalowski <tpowa@archlinux.org>2006-05-04 12:16:11 +0200
commit7f3e83c8323e358f7da4788dd18f05f5546b021e (patch)
tree159c02b3cbe2b195939e84ef7243e6fd51b76762
parent9fc4bd73bce1d2b107238933aea57945ee992b36 (diff)
downloadmkinitcpio-7f3e83c8323e358f7da4788dd18f05f5546b021e.tar.gz
mkinitcpio-7f3e83c8323e358f7da4788dd18f05f5546b021e.tar.xz
'added pcmcia and net'
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@63 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--install/autodetect2
-rw-r--r--install/net5
-rw-r--r--install/pcmcia25
-rw-r--r--mkinitcpio-0.1-1.pkg.tar.gzbin15098 -> 15418 bytes
-rw-r--r--mkinitcpio.tar.bz2bin29480 -> 30087 bytes
5 files changed, 29 insertions, 3 deletions
diff --git a/install/autodetect b/install/autodetect
index 7375296..6cf252c 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -6,7 +6,7 @@ install ()
#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 "/net/")
+ -e "/net/" -e "/pcmcia")
$(cat /proc/filesystems | grep -v nodev) "
for m in $AUTODETECT; do
diff --git a/install/net b/install/net
index 69aa25f..268865b 100644
--- a/install/net
+++ b/install/net
@@ -2,7 +2,7 @@
install ()
{
- MODULES=" $(checked_modules "/net/") "
+ MODULES=" $(checked_modules "/drivers/net/") "
BINARIES=""
FILES=""
@@ -12,8 +12,9 @@ install ()
help ()
{
cat<<HELPEOF
- This hook loads the necessary modules for an network device.
+ This hook loads the necessary modules for a network device.
Detection will take place at runtime. To minimize the modules
in the image, add the autodetect hook too.
+ For pcmcia net devices please use pcmcia hook.
HELPEOF
}
diff --git a/install/pcmcia b/install/pcmcia
new file mode 100644
index 0000000..4e419c0
--- /dev/null
+++ b/install/pcmcia
@@ -0,0 +1,25 @@
+# vim: set ft=sh:
+
+install ()
+{
+ MODULES=" $(checked_modules "/pcmcia/" | grep -ve "sound" -e "net") $(checked_modules "/ide/legacy")"
+ MODULES=$(echo ${MODULES}) #trim whitespace
+ if [ "x${MODULES}" != "x" ]; then
+ MODULES="${MODULES} sd_mod\nsr_mod\nide-disk\nide-cd"
+ fi
+ BINARIES=""
+ FILES=""
+ SCRIPT=""
+ add_file "/sbin/pcmcia-socket-startup.static" "/sbin/pcmcia-socket-startup"
+ add_file "/sbin/pcmcia-check-broken-cis.static" "/sbin/pcmcia-check-broken-cis"
+ add_file "/etc/pcmcia/config.opts"
+}
+
+help ()
+{
+cat<<HELPEOF
+ This hook loads the necessary modules for a pcmcia root 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 b5533ee..454a6d1 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 dc8bc83..2316768 100644
--- a/mkinitcpio.tar.bz2
+++ b/mkinitcpio.tar.bz2
Binary files differ