From: John P. Davis <zhen@gentoo.org>
Date: Tue, 18 May 2004 17:56:56 +0000 (+0000)
Subject: fixing small typos
X-Git-Tag: CATALYST_2_0_6_916~996
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=273061cec2a4589e5f99feccf27bea7969fdf559;p=catalyst.git

fixing small typos


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@377 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/livecd/files/x86-help.msg b/livecd/files/x86-help.msg
index c99f01b2..9e3267fc 100755
--- a/livecd/files/x86-help.msg
+++ b/livecd/files/x86-help.msg
@@ -8,7 +8,7 @@ to test local RAM for errors. To use memtest86, just type 'memtest86'.
 
 Options available to pass to your kernel of choice.
 - agpgart       loads agpgart (use if you have graphic problems,lockups)
-- acpi=on		loads support for ACPI firmware
+- acpi=on       loads support for ACPI firmware
 - ide=nodma     Force disabling of dma for malfunctioning ide devices
                 to umount /mnt/cdrom to mount another cdrom.
 - doscsi        scan for scsi devices (breaks some ethernet cards)
diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index 63b0f133..2bb283b9 100755
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.3 2004/05/18 02:09:57 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.4 2004/05/18 17:56:56 zhen Exp $
 
 die() {
 	echo "$1"
@@ -48,10 +48,6 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
-echo "GENKERNEL ARGS"
-echo "MAINARGS: ${clst_livecd_gk_mainargs}"
-echo "KERNARGS: ${clst_livecd_gk_kernargs}"
-
 genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
 	
 #now we merge any kernel-dependent packages