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
cleanup-cruft
Chris Gianelloni 17 years ago
parent b536430a15
commit 76b0593f47

@ -2,21 +2,25 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $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: 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, 05 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
gen_initrd.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: 04 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
cd out of directory to be deleted for bug 194695. Thanks to Asmund 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 Grammeltvedt <asmundg@big-oil.org> for pointing this out.
18 Sep 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh, 18 Sep 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
gen_initrd.sh: gen_initrd.sh:
we don't ever want devfs in an initramfs We don't ever want devfs in an initramfs, so check KERN_24 instead of DEVFS
check KERN_24 instead of DEVFS for 2.4 initrd generation for 2.4 initrd generation
17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh, 17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
gen_compile.sh, gen_determineargs.sh, gen_funcs.sh, gen_initrd.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, 17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
gen_configkernel.sh, genkernel: 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. than /etc/genkernel.conf to add flexibility.
17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> 17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>

@ -406,7 +406,7 @@ append_data() {
local name=$1 var=$2 local name=$1 var=$2
local func="append_${name}" local func="append_${name}"
if [ $# -eq '1' ] || [ "${var}" -eq '1' ] if [ $# -eq 1 ] || [ ${var} -eq 1 ]
then then
print_info 1 " >> Appending ${name} cpio data..." print_info 1 " >> Appending ${name} cpio data..."
${func} ${func}

@ -847,18 +847,6 @@ setup_unionfs() {
fi fi
} }
#suspend_resume() {
# [ -x /sbin/resume ] || return 0
# /sbin/resume
# local ret=$?
# if [ "${ret}" -eq 0 ]; then
# exit 0
# fi
# return 0
#}
suspend2_resume() { suspend2_resume() {
if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then
local splash_theme local splash_theme

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

Loading…
Cancel
Save