Fix /etc/hosts aliases for catalyst-livecd and work on help menu for grub bootloading

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

diff --git a/ChangeLog b/ChangeLog
index 29f017288d062d271b663df0d0386b66bbaab24b..112c2b0326a866f623d655604754a5ef2959dd48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.250 2005/04/29 13:51:39 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.251 2005/04/29 14:40:25 rocket Exp $
+
+  29 Apr 2005; Eric Edgar <rocket@gentoo.org>
+  targets/support/bootloader-setup.sh, targets/support/livecdfs-update.sh:
+  Fix /etc/hosts aliases for catalyst-livecd and work on help menu for grub
+  bootloading
 
   29 Apr 2005; Eric Edgar <rocket@gentoo.org>
   modules/livecd_stage2_target.py:

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 68ad427f74f3168bb3ed5c21ab73978d8d158328..94e065a01d0889ffaeb1a401b0a585ff3e5f1905 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.3 2005/04/29 13:32:51 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.4 2005/04/29 14:40:25 rocket Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -142,12 +142,19 @@ case ${clst_mainarch} in
                if [ -e $1/boot/grub/stage2_eltorito ]
                then
                        icfg=$1/boot/grub/grub.conf
-                       hmsg=$1/boot/grub/help.msg
                        echo "default 1" > ${icfg}
                        echo "timeout 150" >> ${icfg}
+                       
+                       
+                       # Setup help message    
+                       hmsg=${clst_sharedir}/livecd/files/x86-help.msg
+                       hmsg_txt=$(cat ${hmsg})
+                       
                        echo >> ${icfg}
                        echo "title help" >> ${icfg}
-                       echo "cat /boot/grub/help.msg" >> ${icfg}
+                       echo "pause ${hmsg_txt}" >> ${icfg}
+                       
+                       
                        for x in ${clst_boot_kernel}
                        do
                                eval custom_kopts=\$${x}_kernelopts

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 800aef65dec94386308bc145cab772e8843ee45d..dfe1cde244f366eb78e98db69d4580d4450b58ea 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.11 2005/04/21 14:23:12 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.12 2005/04/29 14:40:25 rocket Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -55,7 +55,7 @@ case ${clst_livecd_type} in
        *)
                echo "catalyst-livecd" > /etc/hostname
                echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 catalyst-livecd.gentoo livecd localhost" > /etc/hosts
+               echo "127.0.0.1 catalyst-livecd catalyst-livecd.gentoo livecd localhost" > /etc/hosts
                ;;
 esac