summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-04-27 02:24:33 +0200
committerAaron Griffin <aaron@archlinux.org>2006-04-27 02:24:33 +0200
commitcf89f5cd1ce31c1073fb4ffff915f01bb10d5c6c (patch)
treebeb103d003a535e7d52baf284db80ea370c4b62d
parent74b566e692a90cd6d39c108a09caf2a5b22823ab (diff)
downloadmkinitcpio-cf89f5cd1ce31c1073fb4ffff915f01bb10d5c6c.tar.gz
mkinitcpio-cf89f5cd1ce31c1073fb4ffff915f01bb10d5c6c.tar.xz
klibc upgrade - udev broken, working on patching
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@22 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--install/base2
-rw-r--r--mkinitcpio7
-rw-r--r--mkinitcpio.conf8
3 files changed, 12 insertions, 5 deletions
diff --git a/install/base b/install/base
index 2d594dd..170df1b 100644
--- a/install/base
+++ b/install/base
@@ -20,7 +20,7 @@ install ()
add_file "/lib/initramfs/init" "/init"
add_file "${CONFIG}" "/config"
- SCRIPT="base"
+ SCRIPT=""
}
help ()
diff --git a/mkinitcpio b/mkinitcpio
index 115e1b1..e1581d0 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -39,11 +39,12 @@ usage ()
echo " -g IMAGE Generate a cpio image as IMAGE. default: no"
echo " -a NAME Append to an existing filelist. default: no"
echo " -q Quiet output. Default: no"
+ echo " -H HOOKNAME Output help for hook 'HOOKNAME'."
echo " -h This message."
exit 1
}
-while getopts 'c:k:s:b:g:a:qh' arg; do
+while getopts 'c:k:s:b:g:a:qH:h' arg; do
case "$arg" in
c) CONFIG="$OPTARG" ;;
k) KERNELVERSION="$OPTARG" ;;
@@ -52,6 +53,10 @@ while getopts 'c:k:s:b:g:a:qh' arg; do
g) GENIMG="$OPTARG" ;;
a) APPEND="y" FILELIST="$OPTARG" ;;
q) QUIET="y" ;;
+ H) source "${INSTDIR}/${OPTARG}";
+ echo "Help for hook '${OPTARG}':"
+ help
+ exit 0 ;;
h|?) usage ;;
*) echo "invalid argument '$arg'"; usage ;;
esac
diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index 07e738b..b861c17 100644
--- a/mkinitcpio.conf
+++ b/mkinitcpio.conf
@@ -1,5 +1,7 @@
-MODULES="8139too snd_intel8x0"
-BINARIES="grep"
+# vim:set ft=sh
+#MODULES="piix ide_disk reiserfs"
+BINARIES=""
FILES=""
-HOOKS="base ide filesystems-auto"
+HOOKS="base pci ide filesystems"
+#HOOKS="base"