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
commit7c848e43fae1416578372f7a9bdf6e5c38770894 (patch)
tree498f1a5809a09d685f4eda9ce5633efec20898f1
parent9ca78c5d39878350cbf7ff81cc43ac5c9a9fdf36 (diff)
downloadmorph-7c848e43fae1416578372f7a9bdf6e5c38770894.tar.gz
Use the name factory for the first system version.
-rwxr-xr-xmorphlib/exts/nfsboot.write2
-rwxr-xr-xmorphlib/exts/rawdisk.write2
-rwxr-xr-xmorphlib/writeexts.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/exts/nfsboot.write b/morphlib/exts/nfsboot.write
index e2ce7db2..cf71301b 100755
--- a/morphlib/exts/nfsboot.write
+++ b/morphlib/exts/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/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 76438a5e..a43a9cce 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/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])
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index 10b17e76..9e98747c 100755
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -62,7 +62,7 @@ class WriteExtension(cliapp.Application):
os.remove(raw_disk)
raise
try:
- version_label = 'version1'
+ version_label = 'factory'
version_root = os.path.join(mp, 'systems', version_label)
os.makedirs(version_root)
self.create_state(mp)