X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallWriteConfig.py;h=65b4a15c415a5cd64f8126dfff4b937f413808a4;hb=cc502a8c1f96ee36cbd891e56eb2573aa2e3cada;hp=1f9d882c58e3e730a7d9b7d63154d7acb1803362;hpb=1136f7d3b68de92034e188e30863a565d738ea52;p=bootmanager.git

diff --git a/source/steps/InstallWriteConfig.py b/source/steps/InstallWriteConfig.py
index 1f9d882..65b4a15 100644
--- a/source/steps/InstallWriteConfig.py
+++ b/source/steps/InstallWriteConfig.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -14,7 +11,6 @@ import os, string
 
 from Exceptions import *
 import utils
-import systeminfo
 import BootAPI
 import ModelOptions
 
@@ -75,9 +71,6 @@ def Run( vars, log ):
     utils.sysexec_chroot( SYSIMG_PATH,
         "ln -sf /usr/share/zoneinfo/UTC /etc/localtime", log )
 
-    log.write( "Enabling ntp at boot\n" )
-    utils.sysexec_chroot( SYSIMG_PATH, "chkconfig ntpd on", log )
-
     log.write( "Creating system directory %s\n" % PLCONF_DIR )
     if not utils.makedirs( "%s/%s" % (SYSIMG_PATH,PLCONF_DIR) ):
         log.write( "Unable to create directory\n" )
@@ -89,8 +82,13 @@ def Run( vars, log ):
                  PARTITIONS["mapper-swap"] )
     fstab.write( "%s           /           ext3      defaults  1 1\n" % \
                  PARTITIONS["mapper-root"] )
-    fstab.write( "%s           /vservers   ext3      tagxid,defaults  1 2\n" % \
-                 PARTITIONS["mapper-vservers"] )
+    if (vars['ONE_PARTITION']!='1'):
+        if vars['virt'] == 'vs':
+            fstab.write( "%s           /vservers   ext3      tagxid,defaults  1 2\n" % \
+                             PARTITIONS["mapper-vservers"] )
+        else:
+            fstab.write( "%s           /vservers   btrfs     defaults  1 2\n" % \
+                             PARTITIONS["mapper-vservers"] )
     fstab.write( "none         /proc       proc      defaults  0 0\n" )
     fstab.write( "none         /dev/shm    tmpfs     defaults  0 0\n" )
     fstab.write( "none         /dev/pts    devpts    defaults  0 0\n" )