git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
same as on branch.
[bootmanager.git]
/
source
/
steps
/
InstallWriteConfig.py
diff --git
a/source/steps/InstallWriteConfig.py
b/source/steps/InstallWriteConfig.py
index
88b89ab
..
e272fdb
100644
(file)
--- a/
source/steps/InstallWriteConfig.py
+++ b/
source/steps/InstallWriteConfig.py
@@
-34,8
+34,6
@@
def Run( vars, log ):
PLCONF_DIR The directory to store the configuration file in
INTERFACE_SETTINGS A dictionary of the values from the network
configuration file
PLCONF_DIR The directory to store the configuration file in
INTERFACE_SETTINGS A dictionary of the values from the network
configuration file
- BOOT_CD_VERSION A tuple of the current bootcd version
-
Sets the following variables:
None
Sets the following variables:
None
@@
-65,10
+63,6
@@
def Run( vars, log ):
if INTERFACE_SETTINGS == "":
raise ValueError, "INTERFACE_SETTINGS"
if INTERFACE_SETTINGS == "":
raise ValueError, "INTERFACE_SETTINGS"
- BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
- if BOOT_CD_VERSION == "":
- raise ValueError, "BOOT_CD_VERSION"
-
except KeyError, var:
raise BootManagerException, "Missing variable in vars: %s\n" % var
except ValueError, var:
except KeyError, var:
raise BootManagerException, "Missing variable in vars: %s\n" % var
except ValueError, var:
@@
-90,9
+84,9
@@
def Run( vars, log ):
fstab= file( "%s/etc/fstab" % SYSIMG_PATH, "w" )
fstab.write( "%s none swap sw 0 0\n" % \
PARTITIONS["mapper-swap"] )
fstab= file( "%s/etc/fstab" % SYSIMG_PATH, "w" )
fstab.write( "%s none swap sw 0 0\n" % \
PARTITIONS["mapper-swap"] )
- fstab.write( "%s / ext3 defaults
0 0
\n" % \
+ fstab.write( "%s / ext3 defaults
1 1
\n" % \
PARTITIONS["mapper-root"] )
PARTITIONS["mapper-root"] )
- fstab.write( "%s /vservers ext3 tagxid,defaults
0 0
\n" % \
+ fstab.write( "%s /vservers ext3 tagxid,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" )
PARTITIONS["mapper-vservers"] )
fstab.write( "none /proc proc defaults 0 0\n" )
fstab.write( "none /dev/shm tmpfs defaults 0 0\n" )