summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-23 15:20:52 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-23 15:20:52 +0000
commit2672ffe119deff9faafc7382842574297d30e497 (patch)
tree2dfcb6128f95e8fa1fbcb479554529845e57029e
parent1706b1074fbf01d1cd2bbd13bbb58eb5c28f4718 (diff)
downloaddefinitions-2672ffe119deff9faafc7382842574297d30e497.tar.gz
Use the name factory for the first system version.
-rwxr-xr-xnfsboot.write2
-rwxr-xr-xrawdisk.write2
2 files changed, 2 insertions, 2 deletions
diff --git a/nfsboot.write b/nfsboot.write
index e2ce7db2..cf71301b 100755
--- a/nfsboot.write
+++ b/nfsboot.write
@@ -66,7 +66,7 @@ class NFSBootWriteExtension(morphlib.writeexts.WriteExtension):
'with hostname "baserock"')
self.test_good_server(location)
- version = 'version1'
+ version = 'factory'
versioned_root = os.path.join(self._nfsboot_root, hostname, 'systems',
version)
self.copy_rootfs(temp_root, location, versioned_root, hostname)
diff --git a/rawdisk.write b/rawdisk.write
index 76438a5e..a43a9cce 100755
--- a/rawdisk.write
+++ b/rawdisk.write
@@ -59,7 +59,7 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
version_root = os.path.join(mp, 'systems', version_label)
os.mkdir(version_root)
- old_orig = os.path.join(mp, 'systems', 'version1', 'orig')
+ old_orig = os.path.join(mp, 'systems', 'factory', 'orig')
new_orig = os.path.join(version_root, 'orig')
cliapp.runcmd(
['btrfs', 'subvolume', 'snapshot', old_orig, new_orig])