[Fai-commit] r5453 - in trunk: debian examples/simple/disk_config

[Thomas Lange]

Author: lange
Date: 2009-07-19 17:47:33 +0000 (Sun, 19 Jul 2009)
New Revision: 5453

Modified:
   trunk/debian/changelog
   trunk/examples/simple/disk_config/FAIBASE
   trunk/examples/simple/disk_config/FAISERVER
   trunk/examples/simple/disk_config/RAID_XEN_VIRTUAL
Log:
disk_config/*: add nosuid and nodev to some partitions

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 17:34:36 UTC (rev 5452)
+++ trunk/debian/changelog	2009-07-19 17:47:33 UTC (rev 5453)
@@ -26,6 +26,7 @@
     warning if FAI_CONFIGDIR is still in the wrong place
   * fai-quickstart.prerm: source make-fai-nfsroot.conf instead of fai.conf
   * fai, fai.8: add option -s/--cspace to specify the config space URL
+  * disk_config/*: add nosuid and nodev to some partitions
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if

Modified: trunk/examples/simple/disk_config/FAIBASE
===================================================================
--- trunk/examples/simple/disk_config/FAIBASE	2009-07-19 17:34:36 UTC (rev 5452)
+++ trunk/examples/simple/disk_config/FAIBASE	2009-07-19 17:47:33 UTC (rev 5453)
@@ -7,6 +7,6 @@
 primary  /             250	  ext3   rw,errors=remount-ro
 logical  swap          200-1000   swap   rw                   
 logical  /var          600-1300   ext3   rw         createopts="-m 5" tuneopts="-c 0 -i 0"
-logical  /tmp          100-1G     ext3   rw         createopts="-m 0" tuneopts="-c 0 -i 0"
-logical  /usr          1G-8G      ext3   rw
-logical  /home         100-50%    ext3   rw,nosuid  createopts="-m 1" tuneopts="-c 0 -i 0"
+logical  /tmp          100-1G     ext3   rw,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0"
+logical  /usr          1G-8G      ext3   rw,nodev
+logical  /home         100-50%    ext3   rw,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"

Modified: trunk/examples/simple/disk_config/FAISERVER
===================================================================
--- trunk/examples/simple/disk_config/FAISERVER	2009-07-19 17:34:36 UTC (rev 5452)
+++ trunk/examples/simple/disk_config/FAISERVER	2009-07-19 17:47:33 UTC (rev 5453)
@@ -6,8 +6,8 @@
 
 primary  /             300	  ext3   rw,errors=remount-ro
 logical  swap          200-1000   swap   rw                   
-logical  /var          600-1300   ext3   rw         createopts="-m15" tuneopts="-c 0 -i 0"
-logical  /tmp          100-1000   ext3   rw         createopts="-m 0" tuneopts="-c 0 -i 0"
+logical  /var          600-1300   ext3   rw,nosuid,nodev  createopts="-m15" tuneopts="-c 0 -i 0"
+logical  /tmp          100-1000   ext3   rw,nosuid,nodev  createopts="-m 0" tuneopts="-c 0 -i 0"
 logical  /usr          1G-6G      ext3   rw
-logical  /home         100-       ext3   rw,nosuid  createopts="-m 1" tuneopts="-c 0 -i 0"
-logical  /srv          1G-50%     ext3   rw,nosuid  createopts="-m 1" tuneopts="-c 0 -i 0"
+logical  /home         100-       ext3   rw,nosuid,nodev  createopts="-m 1" tuneopts="-c 0 -i 0"
+logical  /srv          1G-50%     ext3   rw,nosuid,nodev  createopts="-m 1" tuneopts="-c 0 -i 0"

Modified: trunk/examples/simple/disk_config/RAID_XEN_VIRTUAL
===================================================================
--- trunk/examples/simple/disk_config/RAID_XEN_VIRTUAL	2009-07-19 17:34:36 UTC (rev 5452)
+++ trunk/examples/simple/disk_config/RAID_XEN_VIRTUAL	2009-07-19 17:47:33 UTC (rev 5453)
@@ -14,7 +14,7 @@
 
 disk_config raid
 raid1 /           hda1,sda1     ext3    rw
-raid1 swap        hda2,sda2      swap    sw
-raid1 /tmp        hda3,sda3      ext3    rw,nosuid
+raid1 swap        hda2,sda2     swap    sw
+raid1 /tmp        hda3,sda3     ext3    rw,nosuid,nodev
 raid1 /usr        hda4,sda4     ext3    rw
 raid1 /var        hda5,sda5     ext3    rw