summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2006-07-16 15:09:52 +0200
committerWilly Tarreau <willy@wtap.(none)>2006-07-26 12:03:42 +0200
commitd9ddc70f9d24816b583459ddab0a6b265a361eb2 (patch)
tree1a1ef178522af67b0c698311557068f565489aac
parent[RELEASE] init-scripts-0.3.17 (diff)
downloadinit-scripts-d9ddc70f9d24816b583459ddab0a6b265a361eb2.tar.gz
[RELEASE] init-scripts-0.3.18v0.3.18
-rwxr-xr-x.preinit10
-rw-r--r--ChangeLog3
-rwxr-xr-xsbin/rc.S4
3 files changed, 10 insertions, 7 deletions
diff --git a/.preinit b/.preinit
index 8936720..4522dd0 100755
--- a/.preinit
+++ b/.preinit
@@ -58,11 +58,11 @@ md /dev/fs 755
# The partitions may be referenced here, so that
# lilo.conf and fstab only use links.
-ln hda /dev/mbr
-ln hda1 /dev/boot
-ln hda2 /dev/swap
-ln hda3 /dev/root
-ln ../hda6 /dev/fs/var
+#ln hda /dev/mbr
+#ln hda1 /dev/boot
+#ln hda2 /dev/swap
+#ln hda3 /dev/root
+#ln ../hda6 /dev/fs/var
in /sbin/init-sysv
diff --git a/ChangeLog b/ChangeLog
index 832e011..0dde92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003/06/24
+- nosuid,nodev sur /tmp dans rc.S
+- release 0.3.18
2003/06/22
- ajout de dhcpd, inetd, lpd, sendmail
- suppression de crond
diff --git a/sbin/rc.S b/sbin/rc.S
index 4aa002d..a8bd6ee 100755
--- a/sbin/rc.S
+++ b/sbin/rc.S
@@ -107,7 +107,7 @@ if touch /tmp/.$BOOTID >/dev/null 2>&1; then
else
echo "Mounting /tmp as tmpfs"
umount /tmp >/dev/null 2>&1
- mount -o mode=1777 -t tmpfs /tmp /tmp
+ mount -o mode=1777,nosuid,nodev -t tmpfs /tmp /tmp
if [ $? != 0 ]; then
echo "WARNING: could not mount /tmp as tmpfs."
if [ -L /tmp ]; then
@@ -152,7 +152,7 @@ else
# either it was a directory, or it now is.
if [ -d /tmp ]; then
- mount -o mode=1777 -t tmpfs /tmp /tmp && echo " => Success !" || echo " => FAILED ! /tmp is a directory but is unmountable !!! The system may be unstable"
+ mount -o mode=1777,nosuid,nodev -t tmpfs /tmp /tmp && echo " => Success !" || echo " => FAILED ! /tmp is a directory but is unmountable !!! The system may be unstable"
fi
fi
fi