From f2549f61159f4d0a8deed374d2b176cc81290edf Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Mon, 26 Apr 2004 15:18:55 +0000 Subject: [PATCH] commit for 1.0.7 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@359 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- catalyst | 4 ++-- livecd/runscript/default-runscript.sh | 8 +++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index df3298f3..b995dc11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # 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.43 2004/04/16 18:56:08 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.44 2004/04/26 15:18:54 zhen Exp $ + + 26 Apr 2004; John Davis catalyst, + livecd/runscript/default-runscript.sh: + fixed the /etc/issue /O macro issue, and changed the version in catalyst to + 1.0.7. we are ready for release 16 Apr 2004; John Davis targets/stage1/stage1-chroot.sh: fix for the problem that gustavoz found wrt the /dev creation stuff not diff --git a/catalyst b/catalyst index cdc48f69..2e6a5d28 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.32 2004/04/01 15:49:38 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.33 2004/04/26 15:18:54 zhen Exp $ import os,sys,imp,string @@ -17,7 +17,7 @@ def vers(): print "Copyright 2003-2004 Gentoo Technologies, Inc." print "Distributed under the GNU General Public License version 2" -version="1.0.5" +version="1.0.7" if len(sys.argv)==1 or sys.argv[1] in ["-h","--help"]: usage() diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh index 6a6d299a..ed9199a6 100644 --- a/livecd/runscript/default-runscript.sh +++ b/livecd/runscript/default-runscript.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/default-runscript.sh,v 1.7 2004/04/02 04:40:11 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.8 2004/04/26 15:18:55 zhen Exp $ #return codes to be used by archscript @@ -187,7 +187,7 @@ EOF #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.7 2004/04/02 04:40:11 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.8 2004/04/26 15:18:55 zhen Exp $ depend() { after * @@ -215,7 +215,9 @@ EOF sed -e "s/^#PermitRootLogin\ yes/PermitRootLogin\ yes/" /etc/ssh/sshd_config > /etc/ssh/sshd_config1 mv /etc/ssh/sshd_config1 /etc/ssh/sshd_config fi - + # fix /etc/issue for mingetty and friends + echo "This is \n.gentoo (\s \m \r) \t" > /etc/issue + rc-update del iptables default rc-update del netmount default # rc-update add hotplug default -- 2.26.2