From e85ec1c8807c12f15cde617b63290ab656a71e8f Mon Sep 17 00:00:00 2001 From: Xavi Leon Date: Tue, 13 Dec 2011 10:14:09 -0500 Subject: [PATCH] Minor bug fixes. --- source/steps/ChainBootNode.py | 2 +- source/steps/InstallBootstrapFS.py | 2 +- source/steps/InstallPartitionDisks.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 848cb3d..119593c 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -189,7 +189,7 @@ def Run( vars, log ): utils.sysexec_noerr( "killall dhclient", log ) - utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log ) + utils.sysexec_noerr( "umount -a -r -t ext2,ext3,btrfs", log ) utils.sysexec_noerr( "modprobe -r lvm-mod", log ) # modules that should not get unloaded diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index bc46450..7acef61 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -82,7 +82,7 @@ def Run( vars, log ): log.write( "mounting vserver partition in root file system\n" ) utils.makedirs( SYSIMG_PATH + "/vservers" ) - utils.sysexec( "mount -t ext3 %s %s/vservers" % (PARTITIONS["vservers"], + utils.sysexec( "mount -t btrfs %s %s/vservers" % (PARTITIONS["vservers"], SYSIMG_PATH), log ) vars['ROOT_MOUNTED']= 1 diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py index 3db5466..2362758 100644 --- a/source/steps/InstallPartitionDisks.py +++ b/source/steps/InstallPartitionDisks.py @@ -174,7 +174,7 @@ def Run( vars, log ): utils.sysexec( "mkfs.btrfs %s" % (devname), log ) # disable time/count based filesystems checks - for filesystem in ("root"): + for filesystem in ["root"]: utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log) # save the list of block devices in the log -- 2.43.0