Updated livecdfs-update.sh to modify inittab to use bashlogin. Updated targets/stage...

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

diff --git a/ChangeLog b/ChangeLog
index b8893174735a7bd53f1832a96a6376c583d28dbc..3607e6e682c1be8eb94db899ee3701c44d0844d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.138 2005/01/05 00:17:37 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.139 2005/01/05 20:18:05 wolf31o2 Exp $
+
+  05 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh, targets/stage1/stage1.sh:
+  Updated livecdfs-update.sh to modify inittab to use bashlogin. Updated
+  targets/stage1/stage1.sh to no longer clean /var/db/pkg, which should fix
+  the brokenness of a stage1 tarball.
 
   04 Jan 2005; John Davis <zhen@gentoo.org> catalyst:
   patch for pvdabeel@gentoo.org. -f and -C can now be used together on the

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 1a57ef6c199ff16d309d606da4b7dd84568455f8..67b53bba45604a632f721ee93c3c3433a489893c 100755 (executable)
--- a/livecd/runscript-support/livecdfs-update.sh
+++ b/livecd/runscript-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/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.25 2004/12/29 15:51:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.26 2005/01/05 20:18:05 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -34,7 +34,17 @@ rc-update add pwgen default
 [ -e /etc/init.d/alsasound ] && rc-update add alsasound default
 [ -e /etc/init.d/hdparm ] && rc-update add hdparm default
 
-[ -e /etc/startx ] && rc-update add mkxf86config default
+# This was mistakenly added, but only works on x86 currently
+#[ -e /etc/startx ] && rc-update add mkxf86config default
+
+# Comment out current getty settings
+sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
+
+# Add our own getty settings
+for x in 1 2 3 4 5 6
+do
+       echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+done
 
 # perform any rcadd then any rcdel
 if [ -n "${clst_livecd_rcadd}" ] || [ -n "${clst_livecd_rcdel}" ]

diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh
index 7b5ac687a2dbe62e5831b60841ae848955dbf0a9..53336de8dad4531fcbf95524ec9ea3fc63116634 100755 (executable)
--- a/targets/stage1/stage1.sh
+++ b/targets/stage1/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/stage1/Attic/stage1.sh,v 1.16 2004/10/15 02:46:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.17 2005/01/05 20:18:05 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -39,21 +39,21 @@ case $1 in
        
        clean)
                #clean runs after preclean with bind mounts unmounted
-               keepers="virtual/os-headers sys-devel/binutils sys-devel/gcc sys-apps/baselayout virtual/libc virtual/kernel"
+               #keepers="virtual/os-headers sys-devel/binutils sys-devel/gcc sys-apps/baselayout virtual/libc virtual/kernel"
                # set everything to uid 999 (nouser)
-               cd ${clst_chroot_path}/tmp/stage1root
-               install -d var/db/pkg2 
+               #cd ${clst_chroot_path}/tmp/stage1root
+               #install -d var/db/pkg2 
                
-               for x in $keepers
-               do
-                       category=${x%%/*}
-                       package=${x##*/}
-                       [ "`ls var/db/pkg/${x}* 2>/dev/null`" = "" ] && continue
-                       install -d var/db/pkg2/${category}
-                       mv var/db/pkg/${category}/${package}* var/db/pkg2/${category}
-               done
-               rm -rf var/db/pkg
-               mv var/db/pkg2 var/db/pkg
+               #for x in $keepers
+               #do
+               #       category=${x%%/*}
+               #       package=${x##*/}
+               #       [ "`ls var/db/pkg/${x}* 2>/dev/null`" = "" ] && continue
+               #       install -d var/db/pkg2/${category}
+               #       mv var/db/pkg/${category}/${package}* var/db/pkg2/${category}
+               #done
+               #rm -rf var/db/pkg
+               #mv var/db/pkg2 var/db/pkg
 
                # clean out man, info and doc files
                rm -rf usr/share/{man,doc,info}/*