From e419d582cfd0ea873b393b2773c1b0670d16afe0 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 12 Feb 2014 19:03:05 +0000 Subject: deploy: Finish off the Btrfs system layout implementation The shared state directories defined in writeexts.py (/var, /home etc.) are now separate Btrfs subvolumes that are mounted in place using fstab. There are some warnings on mounting /var and /srv about the mountpoint not being empty. Not yet investigated. If a configure extension has already added / to the fstab, use the device it chose rather than assuming /dev/sda. This is required for the vdaboot.configure extension that we use for OpenStack deployments. Similarly, if a configure extension has added an entry for a state directory in /etc/fstab already, we don't replace it with a /state/xxx directory. That's only done as a default behaviour. --- rawdisk.write | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rawdisk.write') diff --git a/rawdisk.write b/rawdisk.write index 8723ac0c..1b4d58c0 100755 --- a/rawdisk.write +++ b/rawdisk.write @@ -56,6 +56,8 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): raise def upgrade_local_system(self, raw_disk, temp_root): + self.complete_fstab_for_btrfs_layout(temp_root) + mp = self.mount(raw_disk) version_label = self.get_version_label(mp) -- cgit v1.2.1