Made a few minor cleanups here and there.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@548 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 184aba326a5b6ab03c70105d30c467836d267824..e4f3c2ee5102a7cd2fbb005ae5c54a190a9c95f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,21 +2,25 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  generic/initrd.scripts, generic/linuxrc:
+  Made a few minor cleanups here and there.
+
   12 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> genkernel.8:
-  update description for --initramfs-overlay in man page to match --help
+  Update description for --initramfs-overlay in man page to match --help.
 
   05 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
   gen_initrd.sh:
-  remove generic/modprobe and all supporting code, since busybox has modprobe
+  Remove generic/modprobe and all supporting code, since busybox has it now.
 
   04 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  cd out of directory to be deleted for bug 194695. Thanks to Asmund
-  Grammeltvedt <asmundg@big-oil.org> for pointing this out
+  We need to cd out of directory to be deleted for bug #194695. Thanks to Asmund
+  Grammeltvedt <asmundg@big-oil.org> for pointing this out.
 
   18 Sep 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
   gen_initrd.sh:
-  we don't ever want devfs in an initramfs
-  check KERN_24 instead of DEVFS for 2.4 initrd generation
+  We don't ever want devfs in an initramfs, so check KERN_24 instead of DEVFS
+  for 2.4 initrd generation
 
   17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
   gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, gen_initrd.sh,
@@ -25,7 +29,7 @@
 
   17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
   gen_configkernel.sh, genkernel:
-  Some more generalcleanup and adding support for using a config file other
+  Some more general cleanup and adding support for using a config file other
   than /etc/genkernel.conf to add flexibility.
 
   17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f90cf6c90b1d7936761ef1222700e59aff59a715..4c41aad9ccc0d5d9ba100a0d43ae04c1bb0f7b91 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -406,7 +406,7 @@ append_data() {
        local name=$1 var=$2
        local func="append_${name}"
 
-       if [ $# -eq '1' ] || [ "${var}" -eq '1' ]
+       if [ $# -eq 1 ] || [ ${var} -eq 1 ]
        then
            print_info 1 "        >> Appending ${name} cpio data..."
            ${func}

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 3b1881eaf791a5e57b5945a4769b7a1528fb277a..8948f2cba794600290b96a534c32cca236ca8452 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -847,18 +847,6 @@ setup_unionfs() {
        fi
 }
 
-#suspend_resume() {
-#      [ -x /sbin/resume ] || return 0
-#      /sbin/resume
-#      local ret=$?
-
-#      if [ "${ret}" -eq 0 ]; then
-#              exit 0
-#      fi
-
-#      return 0
-#}
-
 suspend2_resume() {
        if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then
                local splash_theme

diff --git a/generic/linuxrc b/generic/linuxrc
index 77d4bd7ba181cb8a0e5d8bfa8cf6ba26333d63af..b3e955ae86c33cb591f91de4ba97b5e3441a09e8 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -132,14 +132,14 @@ do
                # Module no-loads
                doload\=*)
                        MDOLIST=`parse_opt "${x}"`
-                       MDOLIST="`echo ${MDOLIST} | sed -e \"s/,/ /g\"`"
+                       MDOLIST="`echo ${MDOLIST} | sed -e 's/,/ /g'`"
                ;;
                nodetect)
                        NODETECT=1
                ;;
                noload\=*)
                        MLIST=`parse_opt "${x}"`
-                       MLIST="`echo ${MLIST} | sed -e \"s/,/ /g\"`"
+                       MLIST="`echo ${MLIST} | sed -e 's/,/ /g'`"
                        export MLIST
                ;;
                # Redirect output to a specific tty
@@ -245,7 +245,6 @@ fi
 # Run debug shell if requested
 rundebugshell
 
-#suspend_resume
 suspend2_resume
 
 if [ "${CDROOT}" -eq '1' ]