[Fai-commit] r3909 - in people/mugwump/lvmraid: . bin

[fai-commit at lists.alioth.debian.org]

Author: samv-guest
Date: 2006-09-11 04:31:37 +0000 (Mon, 11 Sep 2006)
New Revision: 3909

Modified:
   people/mugwump/lvmraid/
   people/mugwump/lvmraid/bin/setup_harddisks
Log:
 r12896 at wilber:  samv | 2006-09-11 16:30:57 +1200
 Don't write out a tmpfs mount if they specified a /tmp partition



Property changes on: people/mugwump/lvmraid
___________________________________________________________________
Name: svk:merge
   - d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/lvmraid:12806
   + d29f7b36-84ff-0310-85ce-ba787dbd31ca:/local/fai/people/mugwump/lvmraid:12896

Modified: people/mugwump/lvmraid/bin/setup_harddisks
===================================================================
--- people/mugwump/lvmraid/bin/setup_harddisks	2006-09-09 00:11:51 UTC (rev 3908)
+++ people/mugwump/lvmraid/bin/setup_harddisks	2006-09-11 04:31:37 UTC (rev 3909)
@@ -2026,10 +2026,12 @@
                            "none", "swap",
 			   $g_MPfstaboptions{$mountpoint}, 0, 0);
     }
-    # 2.5. /tmp
+    # 2.5. /tmp - set up tmpfs, unless they defined /tmp explicitly.
+    #      If you don't like that, tough!  :P
     $FileSystemTab .=
             BuildfstabLine("swap", "/tmp", "tmpfs",
-                           "defaults", 0, 0);
+                           "defaults", 0, 0)
+		unless $g_MountpointPart{'/tmp'};
 
     # 3. /proc
     $FileSystemTab .=