summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/initramfs/distro-specs/fedora/functions-default19
-rw-r--r--src/installer/OpenSLX/OSExport/Distro/Fedora.pm3
-rw-r--r--src/installer/OpenSLX/OSSetup/Distro/Fedora.pm8
3 files changed, 20 insertions, 10 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/installer/OpenSLX/OSExport/Distro/Fedora.pm b/src/installer/OpenSLX/OSExport/Distro/Fedora.pm
index 4c196bd1..80a45854 100644
--- a/src/installer/OpenSLX/OSExport/Distro/Fedora.pm
+++ b/src/installer/OpenSLX/OSExport/Distro/Fedora.pm
@@ -53,6 +53,7 @@ sub initDistroInfo
- /proc/*
- /mnt/*
- /media/*
+ - /run/*
- /lib/klibc/events/*
- /boot/initrd*
- /boot/grub
@@ -62,4 +63,4 @@ sub initDistroInfo
return;
}
-1; \ No newline at end of file
+1;
diff --git a/src/installer/OpenSLX/OSSetup/Distro/Fedora.pm b/src/installer/OpenSLX/OSSetup/Distro/Fedora.pm
index 80480340..c1d54b7b 100644
--- a/src/installer/OpenSLX/OSSetup/Distro/Fedora.pm
+++ b/src/installer/OpenSLX/OSSetup/Distro/Fedora.pm
@@ -42,7 +42,13 @@ sub initialize
'/etc/fstab',
'/etc/mtab',
];
+ $self->{'clone-filter'} = "
+ - /run/*
+ + /run
+ - /selinux/*
+ + /selinux $self->{'clone-filter'}";
+
return;
}
-1; \ No newline at end of file
+1;