Modify append_data to die on 0 arguments and check arg 2 with isTrue(). Based on...

diff --git a/ChangeLog b/ChangeLog
index 7dfc4f4e1c9a65006b513e9b5e6597c9b8b6c0a4..b0c11f0a52e04be76f1bd336edf206bac79687a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  06 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
+  Modify append_data to die on 0 arguments and check arg 2 with isTrue().
+  Based on a patch from robbat2
+
   20 Feb 2009; Andrew Gaffney <agaffney@gentoo.org> arch/sparc64/config.sh,
   gen_compile.sh, gen_funcs.sh, gen_package.sh:
   Add support for multiple possible kernel binary paths for gentoo bug

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 40c66417b38c96ad4f7d4b5a25198303d7841331..95fa9714925899cf00b5c2ffeedf9784cda676f4 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -561,7 +561,8 @@ append_data() {
        local name=$1 var=$2
        local func="append_${name}"
 
-       if [ $# -eq 1 ] || [ ${var} -eq 1 ]
+       [ $# -eq 0 ] && gen_die "append_data() called with zero arguments"
+       if [ $# -eq 1 ] || isTrue ${var}
        then
            print_info 1 "        >> Appending ${name} cpio data..."
            ${func}