summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-09-10 20:24:21 +0200
committerDirk von Suchodoletz2009-09-10 20:24:21 +0200
commitf1a40757c077ce9e13e8709891f7c88b1b80e823 (patch)
treeba5d7ef6f84c5c3eaacb81de34f17d84654c1179
parentAllowing subdirectories as automount target. (diff)
downloadcore-f1a40757c077ce9e13e8709891f7c88b1b80e823.tar.gz
core-f1a40757c077ce9e13e8709891f7c88b1b80e823.tar.xz
core-f1a40757c077ce9e13e8709891f7c88b1b80e823.zip
Small fixes for Scientific Linux 5.3 ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3152 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initramfs/distro-specs/scilin/functions-5.315
-rw-r--r--installer/OpenSLX/OSSetup/Distro/Base.pm3
2 files changed, 5 insertions, 13 deletions
diff --git a/initramfs/distro-specs/scilin/functions-5.3 b/initramfs/distro-specs/scilin/functions-5.3
index 6d4c9a40..2952163c 100644
--- a/initramfs/distro-specs/scilin/functions-5.3
+++ b/initramfs/distro-specs/scilin/functions-5.3
@@ -17,18 +17,9 @@ initial_boot () {
sed -e "6i# Script modified by $0 during stage3 bootup." \
-e "/relabel_se/,/^}/d" \
-e "/# Start up swap/,/# Set up bin/d" \
- -e "/# Remount/,/-o remount/d" -e "/^# Clean out/,/in_sysinit/d" \
+ -e "/^remount_needed/,/^fi$/d" -e "/^# Clean out/,/in_sysinit/d" \
-e "/# Mount all o/,/# Start the g/d" \
- -e "/# Boot time/,/# let's/d" \
- -e "s,/sbin/start_udev$,/etc/init.d/udevd," -i /mnt/etc/rc.d/rc.sysinit
-# write a custom udev script (to be checked!!)
-echo -e "#!/bin/sh\n# Simple udev starter script created as a replacement \
-during OpenSLX stage3\n# bootup." >/mnt/etc/init.d/udevd
-echo -e ". /etc/init.d/functions\nSTRING=\$\"Starting udev: \" \
-\necho -n \"\$STRING \"\n/sbin/udevstart </dev/null >/dev/null 2>&1 \
-\n[ \$? -eq 0 ] && success \$\"\$STRING\" || failure \$\"\$STRING\" \
-\nexit 0" >>/mnt/etc/init.d/udevd
-chmod u+x /mnt/etc/init.d/udevd
+ -e "/# Boot time/,/# let's/d" -i /mnt/etc/rc.d/rc.sysinit
# delete all classical disk base rootfs stuff from halt
sed -e "7i# Modified by $0 during stage3 bootup." \
-e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
@@ -45,4 +36,4 @@ ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
ln -s ../init.d/killall /mnt/etc/rc.d/rc6.d/S00killall
ln -s ../init.d/halt /mnt/etc/rc.d/rc6.d/S01reboot
-} \ No newline at end of file
+}
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index 6db86dd6..99bae53f 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -102,13 +102,14 @@ sub initialize
- /home/*
+ /home
- /etc/vmware/installer.sh
+ - /etc/grub*
- /etc/shadow*
- /etc/samba/secrets.tdb
- /etc/resolv.conf.*
- /etc/opt/openslx
- /etc/exports*
- /etc/X11/xorg.c*
- - /etc/X11/XF86*
+ - /etc/X11/XF86*
+ /etc
- /dev/*
+ /dev