Updated hostname/domainname creation for new baselayout.

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

diff --git a/ChangeLog b/ChangeLog
index da257f6990ebfab35046c280def8a9d6a23550b3..786cba7a0afd9f01ced69e7e192c8f470cb2faa7 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.273 2005/06/16 13:40:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.274 2005/06/22 13:29:13 wolf31o2 Exp $
+
+  22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Updated hostname/domainname creation for new baselayout.
 
   16 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh, targets/support/create-iso.sh:

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 6418238596dbe086f7eebadf5ec4bc8181f27f04..eb3dc5f1dc438687de66ddb85d60772ad835ee0c 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.15 2005/06/10 14:41:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.16 2005/06/22 13:29:13 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -28,28 +28,16 @@ rm -rf /etc/localtime
 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
-               ;;
-       gentoo-gamecd)
-               echo "gamecd" > /etc/hostname
-               echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts
-               ;;
-       gentoo-*)
-               echo "gentoo-livecd" > /etc/hostname
-               echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 gentoo-livecd.gentoo gentoo-livecd localhost" > /etc/hosts
-               ;;
-       *)
-               echo "livecd" > /etc/hostname
-               echo "gentoo" > /etc/dnsdomainname
-               echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
-               ;;
-esac
+if [ "${clst_livecd_type}" == "gentoo-gamecd" ]
+then
+       echo 'HOSTNAME="gamecd"' > /etc/conf.d/hostname
+       echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts
+else
+       echo 'HOSTNAME="livecd"' > /etc/conf.d/hostname
+       echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
+fi
+echo 'OVERRIDE=0' > /etc/conf.d/domainname
+echo 'DNSDOMAIN="gentoo"' >> /etc/conf.d/domainname
 
 # Add any users
 if [ -n "${clst_livecd_users}" ]