diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-04-25 07:34:44 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-04-25 07:34:44 +0200 |
| commit | 97004aa82d44c0fc90c1b0b49a796cc9b1927032 (patch) | |
| tree | 13e8bb955ffc77fe8a6aad69a96e1a2c27a17a5a | |
| parent | ea20a441f8fecc9fa84e0e1f12c4b71bf436f872 (diff) | |
| download | mkinitcpio-97004aa82d44c0fc90c1b0b49a796cc9b1927032.tar.gz mkinitcpio-97004aa82d44c0fc90c1b0b49a796cc9b1927032.tar.xz | |
Bug fixes - I broke some things with syntax errors
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@9 880c04e9-e011-0410-abf7-b926e227c9cd
| -rw-r--r-- | install/base | 8 | ||||
| -rw-r--r-- | install/ide | 2 | ||||
| -rw-r--r-- | mkinitcpio | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/install/base b/install/base index 9cd2030..27edf15 100644 --- a/install/base +++ b/install/base @@ -6,11 +6,11 @@ install () add_dir "/sys" add_dir "/dev" - add_nod "/dev/null" 644 c 1 3 - add_nod "/dev/zero" 644 c 1 5 - add_nod "/dev/console" 644 c 5 1 + add_device "/dev/null" c 1 3 + add_device "/dev/zero" c 1 5 + add_device "/dev/console" c 5 1 - for f in /lib -name klibc-*.so; do + for f in $(find /lib -name klibc-*.so); do add_file $f done diff --git a/install/ide b/install/ide index 1afedd9..cd9625a 100644 --- a/install/ide +++ b/install/ide @@ -3,7 +3,7 @@ install () { MODULES="" - for m in $(all_modules | grep "/ide/"); + for m in $(all_modules "/ide/"); do MODULES="$MODULES $(basename $m)" done @@ -17,6 +17,7 @@ # Settings BASEDIR="" KERNELVERSION="$(uname -r)" +FUNCTIONS="functions" #/lib/initramfs/functions CONFIG="mkinitcpio.conf" HOOKDIR="hooks" INSTDIR="install" @@ -90,6 +91,7 @@ else touch "${FILELIST}" fi +source "${FUNCTIONS}" #parse 'global' hook, as defined in ${CONFIG} parse_hook @@ -118,7 +120,7 @@ fi if [ "x$GENIMG" != "x" ]; then if ! gen_init_cpio ${FILELIST} | gzip -9 > "${GENIMG}"; then - err "Failed to create '${GENIMG}' image" >2 + err "Failed to create '${GENIMG}' image" fi if [ "x${SAVELIST}" == "x" ]; then |