summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-05 16:17:08 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-05 16:17:08 +0000
commit67afd098cd297b769b1341a460d160a2902ba4e4 (patch)
tree8b8b19209c4faee0e5a273ba6f25d7d115173512
parentecbaee8967cdf307fafe996c85025af96c1a70d6 (diff)
parenta3c7fea2e1a7e10460d58d9fcbf8b395c0b17893 (diff)
downloadmorph-67afd098cd297b769b1341a460d160a2902ba4e4.tar.gz
Merge branch 'baserock/pedroalvarez/upgrades-to-default'
Reviewed-by: - Sam Thursfield - Emmet Hikory - Paul Sherwood
-rwxr-xr-xmorphlib/exts/rawdisk.write2
-rwxr-xr-xmorphlib/exts/ssh-rsync.write4
2 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write
index 1c2c5a84..12db4398 100755
--- a/morphlib/exts/rawdisk.write
+++ b/morphlib/exts/rawdisk.write
@@ -68,7 +68,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', 'factory', 'orig')
+ old_orig = os.path.join(mp, 'systems', 'default', 'orig')
new_orig = os.path.join(version_root, 'orig')
cliapp.runcmd(
['btrfs', 'subvolume', 'snapshot', old_orig, new_orig])
diff --git a/morphlib/exts/ssh-rsync.write b/morphlib/exts/ssh-rsync.write
index 0ce89c7f..2d7258ba 100755
--- a/morphlib/exts/ssh-rsync.write
+++ b/morphlib/exts/ssh-rsync.write
@@ -92,8 +92,8 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension):
def get_old_orig(self, location, remote_mnt):
'''Identify which subvolume to snapshot from'''
- # rawdisk upgrades use 'factory'
- return os.path.join(remote_mnt, 'systems', 'factory', 'orig')
+ # rawdisk upgrades use 'default'
+ return os.path.join(remote_mnt, 'systems', 'default', 'orig')
@contextlib.contextmanager
def _created_orig_subvolume(self, location, remote_mnt, version_root):