PR#11: add basic support for btrfs subvolumes - appliance-tools

appliance-tools

#11 add basic support for btrfs subvolumes

Merged 3 years ago by ngompa. Opened 3 years ago by dcavalca.

dcavalca/appliance-tools btrfs2 into master

add basic support for btrfs subvolumes

Davide Cavalca • 3 years ago

0a39a93

appcreate/appliance.py

file modified

+11

		`@@ -122,6 +122,7 @@`

		`#list of partitions from kickstart file`
		`parts = kickstart.get_partitions(self.ks)`
		`+`
		`# need to eliminate duplicate partitions`
		`# this is a bit of a hack but we assume the last partition for a given mount point is the one we want`
		`mountpoints = []`
		`@@ -225,11 +226,21 @@`
		`else:`
		`self.__instloop.add_partition(int(p.size), "sda", p.mountpoint, p.fstype)`

		`+ # FIXME: this only works if there's just one btrfs partition`
		`+ for p in parts:`
		`+ if p.fstype == 'btrfs':`
		`+ for s in self.ks.handler.btrfs.btrfsList:`
		`+ if s.subvol:`
		`+ self.__instloop.add_subvolume(p.mountpoint, s.mountpoint, s.name)`
		`+`
		`try:`
		`self.__instloop.mount()`
		`except MountError as e:`
		`raise CreatorError("Failed mount disks : %s" % e)`

		`+ if self.ks.handler.btrfs.btrfsList:`
		`+ self.__instloop.setup_subvolumes()`
		`+`
		`self._create_mkinitrd_config()`

		`def _kernel_cmdline_append(self):`

appcreate/partitionedfs.py

file modified

+37

		`@@ -47,6 +47,7 @@`
		`'offset': 0 } # Offset of next partition`

		`self.partitions = []`
		`+ self.subvolumes = []`
		`self.mapped = False`
		`self.mountOrder = []`
		`self.unmountOrder = []`
		`@@ -64,6 +65,9 @@`
		`'UUID': None, # UUID for partition`
		`'num': None}) # Partition number`

		`+ def add_subvolume(self, parent, mountpoint, name):`
		`+ self.subvolumes.append({'parent': parent, 'mountpoint': mountpoint, 'name': name})`
		`+`
		`def __format_disks(self):`
		`logging.debug("Formatting disks")`
		`for dev in list(self.disks.keys()):`
		`@@ -240,6 +244,20 @@`
		`pass`

		`def unmount(self):`
		`+ if self.subvolumes:`
		`+ ordered = []`
		`+ others = []`
		`+ for s in self.subvolumes:`
		`+ if s['mountpoint'] == '/':`
		`+ others.append(s)`
		`+ else:`
		`+ ordered.append(s)`
		`+`
		`+ ordered += others`
		`+`
		`+ for s in ordered:`
		`+ subprocess.call(['umount', s['mountpoint']])`
		`+`
		`for mp in self.unmountOrder:`
		`if mp == 'swap':`
		`continue`
		`@@ -256,6 +274,25 @@`
		`pass`
		`p['mount'] = None`

		`+ def setup_subvolumes(self):`
		`+ others = []`
		`+ ordered = []`
		`+ for s in self.subvolumes:`
		`+ if s['mountpoint'] == '/':`
		`+ ordered.append(s)`
		`+ else:`
		`+ others.append(s)`
		`+`
		`+ ordered += others`
		`+ for s in ordered:`
		`+ base = "%s%s" % (self.mountdir, s['parent'])`
		`+ path = "%s/%s" % (base, s['name'])`
		`+ mountpath = "%s%s" % (self.mountdir, s['mountpoint'])`
		`+ subprocess.call(['btrfs', 'subvol', 'create', path])`
		`+ subprocess.call(['mkdir', '-p', mountpath])`
		`+ device = subprocess.Popen(["findmnt", "-n", "-o", "SOURCE", base], stdout=subprocess.PIPE).communicate()[0].decode("utf-8").strip()`
		`+ subprocess.call(['mount', '-t', 'btrfs', '-o', 'subvol=%s' % s['name'], device, mountpath])`
		`+`
		`def mount(self):`
		`for dev in list(self.disks.keys()):`
		`d = self.disks[dev]`