fixes

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

diff --git a/examples/livecd/runscript/x86-isolinux-loop-example.sh b/examples/livecd/runscript/x86-isolinux-loop-example.sh
index 2fd8368bbf0353bd9088fc9d48db4556a9bb2c8e..79e4dea915ed769b9b99a9c60fa32ff798402db6 100644 (file)
--- a/examples/livecd/runscript/x86-isolinux-loop-example.sh
+++ b/examples/livecd/runscript/x86-isolinux-loop-example.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/examples/livecd/runscript/Attic/x86-isolinux-loop-example.sh,v 1.6 2004/01/13 03:55:49 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/x86-isolinux-loop-example.sh,v 1.7 2004/01/13 05:59:51 brad_mssw Exp $
 
 die() {
        echo "$1"
@@ -60,6 +60,25 @@ EOF
        [ $? -ne 0 ] && exit 1
        count=$(( $count + 1 ))
        done
+
+# Setup all runtime filesystem stuff
+       $clst_CHROOT $clst_chroot_path /bin/bash << EOF
+env-update
+source /etc/profile
+rc-update del iptables default
+rc-update del netmount default
+rc-update add hotplug default
+rc-update add kudzu default
+rc-update del keymaps
+rc-update del consolefont
+rc-update add metalog default
+rm -rf /etc/localtime
+cp /usr/share/zoneinfo/GMT /etc/localtime
+echo "livecd" > /etc/hostname
+sed -i -e 's:^/dev/[RBS]*::' /etc/fstab
+sed -i -e '/dev-state/ s/^/#/' /etc/devfsd.conf
+EOF
+
        ;;
 preclean)
        #preclean runs with bind mounts active -- for running any commands inside chroot.
@@ -140,12 +159,6 @@ cdroot_setup)
        echo "cp -a $clst_chroot_path/* $clst_cdroot_path/loopmount"
        cp -a $clst_chroot_path/* $clst_cdroot_path/loopmount 
 
-       # Filesystem stuff
-       echo "Setting up filesystem files"
-       echo "livecd" > $clst_cdroot_path/loopmount/etc/hostname
-       sed -i -e 's:^/dev/[RBS]*::' $clst_cdroot_path/loopmount/etc/fstab
-       sed -i -e '/dev-state/ s/^/#/' $clst_cdroot_path/loopmount/etc/devfsd.conf
-
        [ $? -ne 0 ] && { umount $clst_cdroot_path/loopmount; die "Couldn't copy files to loopback ext2 filesystem"; }
        umount $clst_cdroot_path/loopmount || die "Couldn't unmount loopback ext2 filesystem"
        rm -rf $clst_cdroot_path/loopmount

diff --git a/examples/livecd/x86/x86-livecd-stage1-20040111.spec b/examples/livecd/x86/x86-livecd-stage1-20040111.spec
index 9eb0f672f2bae90b7baa4c1da596d6c3b048a0b9..ab1fa2de4a7064d5b6716d3f471e1fd2f754ea0b 100644 (file)
--- a/examples/livecd/x86/x86-livecd-stage1-20040111.spec
+++ b/examples/livecd/x86/x86-livecd-stage1-20040111.spec
@@ -10,5 +10,42 @@ livecd/use:
        -gtk
 livecd/packages:
        >=sys-apps/baselayout-1.8.6.12-r4
+       kudzu
+       hotplug
        irssi
        aumix
+       metalog
+       pciutils
+       parted
+       mt-st
+       links
+       star
+       strace
+       raidtools
+       nfs-utils
+       jfsutils
+       usbutils
+       speedtouch
+       xfsprogs
+       e2fsprogs
+       reiserfsprogs
+       hdparm
+       nano
+       less
+       openssh
+       dhcpcd
+       mingetty
+       pwgen
+       popt
+       dialog
+       rp-pppoe
+       gpm
+       screen
+       mirrorselect
+       iputils
+       hwdata-knoppix
+       hwsetup
+       bootsplash
+       device-mapper
+       lvm2
+       

diff --git a/examples/livecd/x86/x86-livecd-stage3-20040111.spec b/examples/livecd/x86/x86-livecd-stage3-20040111.spec
index dc59f2a4ebdc3f9ea1948b422df00cdf18899be6..29029474356a438640b89ea9df6a1f507bedc0ab 100644 (file)
--- a/examples/livecd/x86/x86-livecd-stage3-20040111.spec
+++ b/examples/livecd/x86/x86-livecd-stage3-20040111.spec
@@ -11,7 +11,7 @@ livecd/cdtar: examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2
 livecd/unmerge:
        autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages
        sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles ucl
-livecd/empty:
+livecd-stage3/empty:
        /var/tmp
        /var/cache
        /var/db