Change default hostnames for livecds
authorEric Edgar <rocket@gentoo.org>
Fri, 29 Apr 2005 14:43:18 +0000 (14:43 +0000)
committerEric Edgar <rocket@gentoo.org>
Fri, 29 Apr 2005 14:43:18 +0000 (14:43 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@639 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
targets/support/livecdfs-update.sh

index 112c2b0326a866f623d655604754a5ef2959dd48..92904906c620b96f1b6ca8b42789defd73466130 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.251 2005/04/29 14:40:25 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.252 2005/04/29 14:43:18 rocket Exp $
+
+  29 Apr 2005; Eric Edgar <rocket@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Change default hostnames for livecds
 
   29 Apr 2005; Eric Edgar <rocket@gentoo.org>
   targets/support/bootloader-setup.sh, targets/support/livecdfs-update.sh:
index dfe1cde244f366eb78e98db69d4580d4450b58ea..2905c08e0069ea1905dc3c9a0f8346191b5ecc8f 100755 (executable)
@@ -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.12 2005/04/29 14:40:25 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.13 2005/04/29 14:43:18 rocket Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -39,6 +39,7 @@ cp /usr/share/zoneinfo/UTC /etc/localtime
 # setup the hostname
 case ${clst_livecd_type} in
        gnap)
+               echo "livecd" > /etc/hostname
                echo "gentoo" > /etc/dnsdomainname
                echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
                ;;
@@ -48,14 +49,14 @@ case ${clst_livecd_type} in
                echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts
                ;;
        gentoo-*)
-               echo "livecd" > /etc/hostname
+               echo "gentoo-livecd" > /etc/hostname
                echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
+               echo "127.0.0.1 gentoo-livecd.gentoo gentoo-livecd localhost" > /etc/hosts
                ;;
        *)
-               echo "catalyst-livecd" > /etc/hostname
+               echo "livecd" > /etc/hostname
                echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 catalyst-livecd catalyst-livecd.gentoo livecd localhost" > /etc/hosts
+               echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
                ;;
 esac