From ac1045f095f0e5343cf3c0559af4e39f693c034e Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Wed, 8 Dec 2004 10:45:13 +0000
Subject: [PATCH] fake: 	livecd updates: remove oss from kernel config, 	mount
 /sys, add pcmcia-cs and rockplug

[2004120506105923584] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5071 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 target/livecd/build_stage1.sh | 2 +-
 target/livecd/build_stage2.sh | 2 --
 target/livecd/config.in       | 2 ++
 target/livecd/kernel.conf     | 4 ++++
 target/livecd/linuxrc.c       | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/target/livecd/build_stage1.sh b/target/livecd/build_stage1.sh
index 813e9ae50..8ea10f195 100644
--- a/target/livecd/build_stage1.sh
+++ b/target/livecd/build_stage1.sh
@@ -1,7 +1,7 @@
 
 echo_header "Creating initrd data:"
 rm -rf $disksdir/initrd
-mkdir -p $disksdir/initrd/{dev,proc,tmp,bin-static,mnt/{cdrom,floppy,stick},ramdisk,etc,ROCK}
+mkdir -p $disksdir/initrd/{dev,sys,proc,tmp,bin-static,mnt/{cdrom,floppy,stick},ramdisk,etc,ROCK}
 cd $disksdir/initrd; ln -s bin-static sbin-static; ln -s . usr
 #
 if [ -x ../../../usr/bin/diet ] ; then
diff --git a/target/livecd/build_stage2.sh b/target/livecd/build_stage2.sh
index b94a1493c..ee68728c7 100644
--- a/target/livecd/build_stage2.sh
+++ b/target/livecd/build_stage2.sh
@@ -19,8 +19,6 @@ rm -rf ../boot ; mkdir ../boot
 mv boot/* ../boot/
 #
 echo_status "Remove the stuff we do not need ..."
-#rm -rf home usr/{doc,man,info}
-#rm -rf var/adm/* var/adm var/mail 
 rm -rf usr/src
 #
 # TODO finish-package!!
diff --git a/target/livecd/config.in b/target/livecd/config.in
index 2fc28a3be..690bde147 100644
--- a/target/livecd/config.in
+++ b/target/livecd/config.in
@@ -66,3 +66,5 @@ pkgenable squashfs-tools
 pkgenable pseudonative-daemon
 pkgenable tcp_wrappers
 pkgenable portmap
+pkgenable pcmcia-cs
+pkgenable rockplug
diff --git a/target/livecd/kernel.conf b/target/livecd/kernel.conf
index 2a25dc9de..c6a7b7dd5 100644
--- a/target/livecd/kernel.conf
+++ b/target/livecd/kernel.conf
@@ -89,3 +89,7 @@ CONFIG_SCSI_PROC_FS=y
 
 # no MD
 CONFIG_MD=n
+
+# no oss!
+CONFIG_SOUND_PRIME=n
+CONFIG_DMASOUND_PMAC=n
diff --git a/target/livecd/linuxrc.c b/target/livecd/linuxrc.c
index eaed0adbf..295ac4c53 100644
--- a/target/livecd/linuxrc.c
+++ b/target/livecd/linuxrc.c
@@ -609,6 +609,9 @@ int main(int argc, char** argv)
 	if ( mount("none", "/dev", "devfs", 0, NULL) && errno != EBUSY )
 		perror("Can't mount /dev");
 
+	if ( mount("none", "/sys", "sysfs", 0, NULL) && errno != EBUSY )
+		perror("Can't mount /sys (not fatal)");
+
 	if ( mount("none", "/proc", "proc", 0, NULL) && errno != EBUSY )
 		perror("Can't mount /proc");