From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 16 Dec 2004 15:26:22 +0000 (+0000)
Subject: Added environmental.motd.txt for gentoo-release-environmental livecd/type.
X-Git-Tag: CATALYST_2_0_6_916~877
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ea9f026fa1f49abef5175f300c23e939c598ea2;p=catalyst.git

Added environmental.motd.txt for gentoo-release-environmental livecd/type.


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

diff --git a/ChangeLog b/ChangeLog
index aee29091..0523d388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.123 2004/12/16 03:49:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.124 2004/12/16 15:26:22 wolf31o2 Exp $
+
+  16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +livecd/files/environmental.motd.txt,
+  targets/livecd-stage1/livecd-stage1.sh:
+  Added environmental.motd.txt for gentoo-release-environmental livecd/type.
 
   15 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/default-runscript.sh,
diff --git a/livecd/files/environmental.motd.txt b/livecd/files/environmental.motd.txt
new file mode 100644
index 00000000..f0b01608
--- /dev/null
+++ b/livecd/files/environmental.motd.txt
@@ -0,0 +1,8 @@
+
+To (re)start X Windows, please type "startx" at the prompt below.
+
+Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
+detailed information about how to reproduce the bug you are reporting.
+
+Thank you for using Gentoo Linux!
+
diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index b8ab6cf8..0bdc588d 100755
--- a/targets/livecd-stage1/livecd-stage1.sh
+++ b/targets/livecd-stage1/livecd-stage1.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/livecd-stage1/Attic/livecd-stage1.sh,v 1.13 2004/10/15 02:46:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.14 2004/12/16 15:26:22 wolf31o2 Exp $
 
 case $1 in
 	enter)
@@ -9,26 +9,27 @@ case $1 in
 	;;
 	run)
 		shift
-	
+
 		cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-chroot.sh ${clst_chroot_path}/tmp
 		clst_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-chroot.sh || exit 1
 		rm -f ${clst_chroot_path}/tmp/livecd-stage1-chroot.sh
 	;;
 
 	preclean)
-        #cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
-        #${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
+		killall -9 gconfd-2
+		#cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
+		#${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
 		#rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh
 		exit 0
-    ;;
+	;;
 
-    clean)
-        exit 0
-    ;;
+	clean)
+		exit 0
+	;;
 
-    *)
-        exit 1
-    ;;
+	*)
+		exit 1
+	;;
 
 esac
 exit 0