From 76b0593f47641c254516b0bc35104f53e820df2a Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 30 Oct 2007 19:37:45 +0000 Subject: [PATCH] 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 --- ChangeLog | 18 +++++++++++------- gen_initramfs.sh | 2 +- generic/initrd.scripts | 12 ------------ generic/linuxrc | 5 ++--- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 184aba3..e4f3c2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,21 +2,25 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Oct 2007; Chris Gianelloni gen_initramfs.sh, + generic/initrd.scripts, generic/linuxrc: + Made a few minor cleanups here and there. + 12 Oct 2007; Andrew Gaffney 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 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 gen_initramfs.sh: - cd out of directory to be deleted for bug 194695. Thanks to Asmund - Grammeltvedt for pointing this out + We need to cd out of directory to be deleted for bug #194695. Thanks to Asmund + Grammeltvedt for pointing this out. 18 Sep 2007; Andrew Gaffney 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 gen_cmdline.sh, gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, gen_initrd.sh, @@ -25,7 +29,7 @@ 17 Sep 2007; Chris Gianelloni 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 diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f90cf6c..4c41aad 100644 --- 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 3b1881e..8948f2c 100644 --- 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 77d4bd7..b3e955a 100644 --- 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' ] -- 2.26.2