Merge branch 'master' of git.openslx.org:openslx/core

3 files changed, 12 insertions, 9 deletions

diff --git a/src/initramfs/distro-specs/fedora/functions-default b/src/initramfs/distro-specs/fedora/functions-default
index f9bb0f0e..3a4dc722 100644
--- a/src/initramfs/distro-specs/fedora/functions-default
+++ b/src/initramfs/distro-specs/fedora/functions-default
@@ -21,7 +21,7 @@
 # TempFS usage
 # D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
-D_BINDMPTS="tmp root media home"
+D_BINDMPTS="tmp root media home run"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp"
 D_RODIRSINRW="/etc/bootsplash /etc/gconf /var/adm /var/lib/texmf /var/lib/rpm \
 /var/cache/fontconfig"
@@ -56,10 +56,10 @@ config_distro () {
 # initial (boot time) runlevel scripts
 initial_boot () {
 # delete all classical disk base rootfs stuff from rc.sysinit
-sed -e "6i# Script modified by $0 during stage3 bootup." \
-    -e "/# Initialize ha/,/success/d" -e "/^ROOTFSTYPE/,/Remounting root/d" \
-    -e "/# Check f/,/Mounting l/d" -e "/^# Configure mach/,/-f \/fastboot/d" \
-    -e "s,/sbin/start_udev$,/etc/init.d/udevd," -i /mnt/etc/rc.d/rc.sysinit
+#sed -e "6i# Script modified by $0 during stage3 bootup." \
+#    -e "/# Initialize ha/,/success/d" -e "/^ROOTFSTYPE/,/Remounting root/d" \
+#    -e "/# Check f/,/Mounting l/d" -e "/^# Configure mach/,/-f \/fastboot/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
@@ -69,9 +69,9 @@ echo -e ". /etc/init.d/functions\nSTRING=\$\"Starting udev: \" \
 \nexit 0" >>/mnt/etc/init.d/udevd
 chmod u+x /mnt/etc/init.d/udevd
 # 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" \
-    -i /mnt/etc/init.d/halt
+#sed -e "7i#                Modified by $0 during stage3 bootup." \
+#    -e "/# Save mixer/,/Saving random/d" -e "/quotaoff/,/^# Now halt/d" \
+#    -i /mnt/etc/init.d/halt
 # boot.slx is a special runlevel script generated within initialramfs which
 # should be executed before the normal runlevel scripts.
 echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
@@ -84,6 +84,9 @@ 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
+
+mount -t selinuxfs selinuxfs /mnt/selinux
+
 }
 
 # linking runlevel scripts
diff --git a/src/initramfs/rootfs/bin/busybox b/src/initramfs/rootfs/bin/busybox
index b7e8a82b..6f9dfe60 100755
--- a/src/initramfs/rootfs/bin/busybox
+++ b/src/initramfs/rootfs/bin/busybox
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index 80732f1a..d1bdebbc 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -733,7 +733,7 @@ if [ ${aufs} -eq 1 ]; then
   fi
 fi
 
-if [ -z ${union_type} -a ${unionfs} -eq 1 ]; then
+if [ -z ${union_type} ] && [ ${unionfs} -eq 1 ]; then
   unionfs_in_kernel=$(grep -c unionfs /proc/filesystems)
   if [ ${unionfs_in_kernel} -eq 0 ]; then
     modprobe ${MODPRV} unionfs 2>/dev/null