numerous fixes, see changelog

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

diff --git a/ChangeLog b/ChangeLog
index b995dc11e3483d581a677f379a496a587d935a13..01d16ddb9f32acef5eed5d166dbc47a0ddc2694d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.44 2004/04/26 15:18:54 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.45 2004/04/30 23:16:34 zhen Exp $
+
+  30 Apr 2004; John Davis <zhen@gentoo.org>
+  livecd/cdtar/isolinux-2.08-cdtar.tar.bz2,
+  livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2,
+  livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2,
+  livecd/files/x86-help.msg, livecd/runscript/x86-archscript.sh:
+  lots of changes
+  -fixed 2004.0 branding in the isolinux cdtar
+  -fixed up acpi stuff in the runscripts
+  -fixed up the x86 help message and corrected the numerous errors in it
 
   26 Apr 2004; John Davis <zhen@gentoo.org> catalyst,
   livecd/runscript/default-runscript.sh:

diff --git a/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 b/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2
index 551928d7f2e63d660ac7f6df5d0b1a02d19e1de6..d75fa270ac6f3728c13c4a5eb3f69b983ffa616d 100644 (file)
Binary files a/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 differ

diff --git a/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2 b/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
index 0c9292f180434b7a2c6677d6b2add4e88d3e37bd..f3c1f1209555adf8622f5fc32799c99364f6f57d 100644 (file)
Binary files a/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2 differ

diff --git a/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 b/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2
index 0bd0a6dfdaabbb9530054a2f313a8bdea60e8ed5..ae9e4e0c07b52fca015c2a682cd0ae13e8bd6c86 100644 (file)
Binary files a/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 differ

diff --git a/livecd/files/x86-help.msg b/livecd/files/x86-help.msg
index d991abee5d646b9031a51e1caf99672b81b7bcac..c99f01b255e601fb7d8ad4936f0d8c2a2455ad80 100755 (executable)
--- a/livecd/files/x86-help.msg
+++ b/livecd/files/x86-help.msg
@@ -1,4 +1,4 @@
-Gentoo Linux 2004.0 LiveCD boot options - [F1 to display available kernels]
+Gentoo Linux Installation LiveCD boot options - [F1 to display available kernels]
 
 Many kernel profiles exist on a livecd. Please hit F1
 to see the available kernels on this livecd.  Please note that
@@ -8,18 +8,19 @@ 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
+- 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)
-- nodetect      causes hwsetup/kudzu and hotplug not to run
+- doataraid     loads ide raid modules from initrd
+- dopcmcia      starts pcmcia service
+- doapm         disables apm module load
 - dofirewire    modprobes firewire modules in initrd (for firewire cdroms,etc)
+- dokeymap      enable keymap selection for non-us keyboard layouts
+- docache       Cache the entire runtime portion of cd in ram, allows you
+- nodetect      causes hwsetup/kudzu and hotplug not to run
 - nousb         disables usb module load from initrd, disables hotplug
 - nodhcp        dhcp does not automatically start if nic detected
-- doataraid     loads ide raid modules from initrd
-- dopcmcia      starts pcmcia service
-- noapm         disables apm module load
 - noraid        disables loading of evms modules
 - nohotplug     disables loading hotplug service
-- ide=nodma     Force disabling of dma for malfunctioning ide devices
-- cdcache       Cache the entire runtime portion of cd in ram, allows you
-                to umount /mnt/cdrom to mount another cdrom.
-- dokeymap      enable keymap selection for non-us keyboard layouts
 - noapic        disable apic (try if having hardware problems ,nics,scsi,etc)

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index 961a94bac8f9221817dc8ef0724ec1e17a982a11..8f1498bffa836967241d26dcd8bbceb3d620b243 100644 (file)
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-archscript.sh
@@ -1,6 +1,6 @@
 # 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/Attic/x86-archscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.4 2004/04/30 23:16:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -62,12 +62,12 @@ case $1 in
                        echo >> $icfg
                        echo "label $x" >> $icfg
                        echo "  kernel $x" >> $icfg
-                       echo "  append initrd=$x.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=0x317 splash=silent" >> $icfg
+                       echo "  append initrd=$x.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot vga=0x317 splash=silent" >> $icfg
                        echo >> $icfg
                        echo "   $x" >> $kmsg
                        echo "label $x-nofb" >> $icfg
                        echo "  kernel $x" >> $icfg
-                       echo "  append initrd=$x.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot" >> $icfg
+                       echo "  append initrd=$x.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot" >> $icfg
                        echo >> $icfg
                        echo "   ${x}-nofb" >> $kmsg
                done