From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 28 Jul 2008 23:20:50 +0000 (-0700)
Subject: Added a couple more places where I needed to switch INITRD with RAMDISK.
X-Git-Tag: v3.4.10.902~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d37ba965e6a40ee7c8795075413cc787f5168f6d;p=genkernel.git

Added a couple more places where I needed to switch INITRD with RAMDISK.
---

diff --git a/ChangeLog b/ChangeLog
index 9ee8cea..5772414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel,
+  genkernel.8:
+  Added a couple more places where I needed to switch INITRD with RAMDISK.
+
   28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> TODO,
   arch/alpha/modules_load, arch/ia64/modules_load, arch/mips/modules_load,
   arch/parisc/modules_load, arch/parisc64/modules_load,
diff --git a/genkernel b/genkernel
index bd5d3c6..a94dec6 100755
--- a/genkernel
+++ b/genkernel
@@ -73,7 +73,7 @@ cleanup(){
 
 trap trap_cleanup SIGHUP SIGQUIT SIGINT SIGTERM SIGKILL
 BUILD_KERNEL=0
-BUILD_INITRD=0
+BUILD_RAMDISK=0
 BUILD_MODULES=0
 
 # Parse all command line options...
@@ -85,7 +85,7 @@ do
 done
 
 # Check if no action is specified...
-if [ "${BUILD_KERNEL}" -eq '0' -a "${BUILD_INITRD}" -eq '0' ]
+if [ "${BUILD_KERNEL}" -eq '0' -a "${BUILD_RAMDISK}" -eq '0' ]
 then
 	usage
 	exit 1
@@ -129,7 +129,7 @@ dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 
-if [ "${BUILD_INITRD}" -ne '0' ]
+if [ "${BUILD_RAMDISK}" -ne '0' ]
 then
 	if ! has_loop
 	then
@@ -296,7 +296,7 @@ then
 	print_info 1 "" 1 0
 fi
 
-if [ "${BUILD_INITRD}" -eq '1' ]
+if [ "${BUILD_RAMDISK}" -eq '1' ]
 then
 	[ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs
 
@@ -332,7 +332,7 @@ then
 	print_info 1 "Kernel compiled successfully!"
 	print_info 1 ''
 	print_info 1 'Required Kernel Parameters:'
-	if [ "${BUILD_INITRD}" -eq '0' ]
+	if [ "${BUILD_RAMDISK}" -eq '0' ]
 	then
 		print_info 1 '    root=/dev/$ROOT'
 		print_info 1 '    [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
@@ -352,7 +352,7 @@ then
 	fi
 fi
 
-if [ "${BUILD_INITRD}" -eq '1' ]
+if [ "${BUILD_RAMDISK}" -eq '1' ]
 then
 	echo
 	print_info 1 'WARNING... WARNING... WARNING...'
diff --git a/genkernel.8 b/genkernel.8
index 12582fc..02d68b7 100644
--- a/genkernel.8
+++ b/genkernel.8
@@ -245,9 +245,9 @@ against a kernel source tree.
 \fB\-\-initramfs\-overlay=\fR<dir>
 Directory structure to include in the initramfs,
 only available on 2.6 kernels
-.SH INITRD OPTIONS
+.SH RAMDISK OPTIONS
 The following options can be passed as kernel parameters from the
-bootloader, which the initrd scripts would recognize.
+bootloader, which the ramdisk scripts would recognize.
 .TP
 \fBreal_root=\fR<...>
 Specifies the device node of the root filesystem to mount.