Anaconda-devel December 2011

anaconda-devel@lists.fedoraproject.org

22 participants
37 discussions

[PATCH] dracut has moved to /usr/bin
by Brian C. Lane 20 Dec '11

20 Dec '11

From: "Brian C. Lane" <bcl(a)redhat.com> --- src/pylorax/treebuilder.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 2dda313..8f4d239 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -172,7 +172,7 @@ class TreeBuilder(object): '''Rebuild all the initrds in the tree. If backup is specified, each initrd will be renamed with backup as a suffix before rebuilding. If backup is empty, the existing initrd files will be overwritten.''' - dracut = ["/sbin/dracut", "--noprefix", "--nomdadmconf", "--nolvmconf"] + add_args + dracut = ["dracut", "--noprefix", "--nomdadmconf", "--nolvmconf"] + add_args if not backup: dracut.append("--force") # Hush some dracut warnings. TODO: bind-mount proc in place? -- 1.7.6.4

3 2

[rhel5-branch] Don't add packages from @conflicts group as dependencies (#756707)
by Martin Gracik 20 Dec '11

20 Dec '11

If -@conflicts is used in the kicstart file, we need to make sure the packages are not only removed from the transaction, but that they are also not added back later, when resolving the dependencies. We also need to remove packages that depend on these conflicting packages. --- yuminstall.py | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 6d2b670..984366a 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -455,10 +455,34 @@ class YumSorter(yum.YumBase): dep = self.deps.get(req, None) if dep is None: dep = self._provideToPkg(req) - if dep is None: - log.warning("Unresolvable dependency %s in %s" - %(req[0], txmbr.name)) - continue + + if dep is None: + log.warning("Unresolvable dependency %s in %s" + %(req[0], txmbr.name)) + continue + + # XXX: ATTENTION the self.anaconda is in the AnacondaYum class, + # which subclasses this class and inherits this method and is actually used; + # very ugly, but I don't want to move the whole method... + if (self.anaconda.isKickstart and + 'conflicts' in map(str.lower, self.anaconda.id.ksdata.excludedGroupList)): + + # get the list of packages in @conflicts group for the first time, + # so we can check if the dependencies are there later + if not hasattr(self, '__conflicting_packages'): + self.__conflicting_packages = [] + conflicts = self.comps.return_groups('conflicts') + for group in conflicts: + for pkgname in group.packages: + self.__conflicting_packages.append(pkgname) + + # if the dependency is in the @conflicts group, don't add it + # to the transaction, and also remove the corresponding package + if dep.name in self.__conflicting_packages: + log.warning('Dependency %s for %s in conflicts group' % (dep.name, txmbr.name)) + self.__conflicting_packages.append(txmbr.name) + self.tsInfo.remove(txmbr.po.pkgtup) + break # Skip filebased requires on self, etc if txmbr.name == dep.name: @@ -696,6 +720,7 @@ class AnacondaYum(YumSorter): if id.getUpgrade(): self.ts.ts.setProbFilter(~rpm.RPMPROB_FILTER_DISKSPACE) self.setColor() + if not self.method.splitmethod: self.populateTs(keepold=0) self.ts.check() -- 1.7.5.4

1 0

[rhel5-branch] Don't add packages from @conflicts group as dependencies (#756707)
by Martin Gracik 20 Dec '11

20 Dec '11

If -@conflicts is used in the kicstart file, we need to make sure the packages are not only removed from the transaction, but that they are also not added back later, when resolving the dependencies. We also need to remove packages that depend on these conflicting packages. --- yuminstall.py | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 6d2b670..833d186 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -455,10 +455,34 @@ class YumSorter(yum.YumBase): dep = self.deps.get(req, None) if dep is None: dep = self._provideToPkg(req) - if dep is None: - log.warning("Unresolvable dependency %s in %s" - %(req[0], txmbr.name)) - continue + + if dep is None: + log.warning("Unresolvable dependency %s in %s" + %(req[0], txmbr.name)) + continue + + # XXX: ATTENTION the self.anaconda is in the AnacondaYum class, + # which subclasses this class and inherits this method and is actually used; + # very ugly, but I don't want to move the whole method... + if (self.anaconda.isKickstart and + 'conflicts' in self.anaconda.id.ksdata.excludedGroupList): + + # get the list of packages in @conflicts group for the first time, + # so we can check if the dependencies are there later + if not hasattr(self, '__conflicting_packages'): + self.__conflicting_packages = [] + conflicts = self.comps.return_groups('conflicts') + for group in conflicts: + for pkgname in group.packages: + self.__conflicting_packages.append(pkgname) + + # if the dependency is in the @conflicts group, don't add it + # to the transaction, and also remove the corresponding package + if dep.name in self.__conflicting_packages: + log.warning('Dependency %s for %s in conflicts group' % (dep.name, txmbr.name)) + self.__conflicting_packages.append(txmbr.name) + self.tsInfo.remove(txmbr.po.pkgtup) + break # Skip filebased requires on self, etc if txmbr.name == dep.name: @@ -696,6 +720,7 @@ class AnacondaYum(YumSorter): if id.getUpgrade(): self.ts.ts.setProbFilter(~rpm.RPMPROB_FILTER_DISKSPACE) self.setColor() + if not self.method.splitmethod: self.populateTs(keepold=0) self.ts.check() -- 1.7.5.4

2 1

[rhel5-branch] do not take actions when 'Esc' is hit in dialogs (resolves #768082)
by Vratislav Podzimek 19 Dec '11

19 Dec '11

Two simple patches preventing non expected behaviour when 'Esc' is hit in stage 2. -- Vratislav Podzimek

2 3

[PATCH 0/2] anaconda script mode
by Brian C. Lane 16 Dec '11

16 Dec '11

From: "Brian C. Lane" <bcl(a)redhat.com> In order to be able to run anaconda from the cmdline w/o needing the gui I have extended the cmdline mode to add a script mode that will exit on error instead of falling into an infinite loop. This is needed for the no-virt mode of livemedia-creator Brian C. Lane (2): Add a script mode that exits instead of looping report more detail about yum failure anaconda | 14 +++++++-- pyanaconda/__init__.py | 3 ++ pyanaconda/cmdline.py | 75 +++++++++++++++++++--------------------------- pyanaconda/script.py | 52 ++++++++++++++++++++++++++++++++ pyanaconda/yuminstall.py | 10 +++++- 5 files changed, 105 insertions(+), 49 deletions(-) create mode 100644 pyanaconda/script.py -- 1.7.6.4

2 4

[rhel5-branch] do not create partition when 'Esc' is hit
by Vratislav Podzimek 16 Dec '11

16 Dec '11

This simple patch prevents creating new partition when 'Esc' is hit in partition dialog. -- Vratislav Podzimek

2 2

some thinking about partitioning
by Máirín Duffy 15 Dec '11

15 Dec '11

I put together a blog post with a bit of a writeup of the current status of the partitioning UI design: http://blog.linuxgrrl.com/2011/12/14/whats-your-partitioning-persona-and-th… So far I've gotten around 15 responses to the 'quiz' of partitioning personas and most people seem to be in #3 or the '/home preserver' camp. ~m

2 1

[PATCH] Add Storage.autoPartType to indicate lvm/btrfs/neither.
by David Lehman 14 Dec '11

14 Dec '11

This accompanies a kickstart option to autopart, type: autopart --type=lvm|btrfs|plain --- pyanaconda/iw/autopart_type.py | 6 +++--- pyanaconda/kickstart.py | 6 +++--- pyanaconda/storage/__init__.py | 3 +-- pyanaconda/storage/partitioning.py | 16 ++++++++-------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py index 6dca7e1..5ea243d 100644 --- a/pyanaconda/iw/autopart_type.py +++ b/pyanaconda/iw/autopart_type.py @@ -191,9 +191,9 @@ class PartitionTypeWindow(InstallWindow): self.dispatch.request_steps_gently("cleardiskssel") if self.lvmButton.get_active(): - self.storage.lvmAutoPart = True + self.storage.autoPartType = AUTOPART_TYPE_LVM else: - self.storage.lvmAutoPart = False + self.storage.autoPartType = AUTOPART_TYPE_PLAIN if self.encryptButton.get_active(): self.storage.encryptedAutoPart = True @@ -263,7 +263,7 @@ class PartitionTypeWindow(InstallWindow): self.reviewButton.set_active( step_data.get("review_checked", self.dispatch.step_enabled("partition"))) self.encryptButton.set_active(self.storage.encryptedAutoPart) - self.lvmButton.set_active(self.storage.lvmAutoPart) + self.lvmButton.set_active(self.storage.autoPartType == AUTOPART_TYPE_LVM) self.buttonGroup = pixmapRadioButtonGroup() self.buttonGroup.addEntry("all", _("Use _All Space"), diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index cdb3d36..27cf6d1 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -231,7 +231,7 @@ class Authconfig(commands.authconfig.FC3_Authconfig): def execute(self): self.anaconda.security.auth = self.authconfig -class AutoPart(commands.autopart.F16_AutoPart): +class AutoPart(commands.autopart.F17_AutoPart): def execute(self): # sets up default autopartitioning. use clearpart separately # if you want it @@ -246,8 +246,8 @@ class AutoPart(commands.autopart.F16_AutoPart): self.anaconda.storage.autoPartAddBackupPassphrase = \ self.backuppassphrase - if not self.lvm: - self.anaconda.storage.lvmAutoPart = False + if self.type is not None: + self.anaconda.storage.autoPartType = self.type self.anaconda.dispatch.skip_steps("partition", "parttype") diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 487afe2..f52d7b7 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -340,8 +340,7 @@ class Storage(object): self.doAutoPart = False self.clearPartChoice = None self.encryptedAutoPart = False - self.lvmAutoPart = False - self.btrfsAutoPart = True + self.autoPartType = AUTOPART_TYPE_LVM self.encryptionPassphrase = None self.escrowCertificates = {} self.autoPartEscrowCert = None diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py index 8669c82..b00d5a4 100644 --- a/pyanaconda/storage/partitioning.py +++ b/pyanaconda/storage/partitioning.py @@ -68,7 +68,7 @@ def _scheduleImplicitPartitions(storage, disks): devs = [] # only schedule the partitions if either lvm or btrfs autopart was chosen - if not storage.lvmAutoPart and not storage.btrfsAutoPart: + if storage.autoPartType not in (AUTOPART_TYPE_LVM, AUTOPART_TYPE_BTRFS): return devs for disk in disks: @@ -77,7 +77,7 @@ def _scheduleImplicitPartitions(storage, disks): fmt_args = {"escrow_cert": storage.autoPartEscrowCert, "add_backup_passphrase": storage.autoPartAddBackupPassphrase} else: - if storage.lvmAutoPart: + if storage.autoPartType == AUTOPART_TYPE_LVM: fmt_type = "lvmpv" else: fmt_type = "btrfs" @@ -111,8 +111,8 @@ def _schedulePartitions(storage, disks): # First pass is for partitions only. We'll do LVs later. # for request in storage.autoPartitionRequests: - if (request.lv and storage.lvmAutoPart) or \ - (request.btr and storage.btrfsAutoPart): + if (request.lv and storage.autoPartType == AUTOPART_TYPE_LVM) or \ + (request.btr and storage.autoPartType == AUTOPART_TYPE_BTRFS): continue if request.requiredSpace and request.requiredSpace > free: @@ -181,7 +181,7 @@ def _scheduleVolumes(storage, devs): if not devs: return - if storage.lvmAutoPart: + if storage.autoPartType == AUTOPART_TYPE_LVM: new_container = storage.newVG new_volume = storage.newLV format_name = "lvmpv" @@ -214,8 +214,8 @@ def _scheduleVolumes(storage, devs): # # Second pass, for LVs only. for request in storage.autoPartitionRequests: - btr = storage.btrfsAutoPart and request.btr - lv = storage.lvmAutoPart and request.lv + btr = storage.autoPartType == AUTOPART_TYPE_BTRFS and request.btr + lv = storage.autoPartType == AUTOPART_TYPE_LVM and request.lv if not btr and not lv: continue @@ -275,7 +275,7 @@ def doAutoPartition(anaconda): log.debug("doAutoPartition(%s)" % anaconda) log.debug("doAutoPart: %s" % anaconda.storage.doAutoPart) log.debug("encryptedAutoPart: %s" % anaconda.storage.encryptedAutoPart) - log.debug("lvmAutoPart: %s" % anaconda.storage.lvmAutoPart) + log.debug("autoPartType: %s" % anaconda.storage.autoPartType) log.debug("clearPartType: %s" % anaconda.storage.config.clearPartType) log.debug("clearPartDisks: %s" % anaconda.storage.config.clearPartDisks) log.debug("autoPartitionRequests:\n%s" % "".join([str(p) for p in anaconda.storage.autoPartitionRequests])) -- 1.7.3.4

2 1

BTRFS support
by David Lehman 14 Dec '11

14 Dec '11

Patches 1-3 are cleanups I needed to get work done. The rest are to add support for creating and using btrfs volumes and subvolumes. There is no support in this patch set (nor planned for the current UI) for interactive editing/creating of btrfs volumes or subvolumes, nor is there any way to enable btrfs autopart. The accompanying kickstart patch to add the btrfs command provides fairly complete btrfs functionality and I am still working on a new option to the autopart kickstart command to allow users to specify one of three autopart flavors: plain, lvm, or btrfs. The btrfs autopart is similar to the lvm autopart: separate partitions for swap and /boot, btrfs partition on each disk combined into a single volume with subvolumes for root and, if there's enough space, /home. The main volume does not get mounted at all. This provides a setup something like having separate LVs for root and home. It currently has /boot as ext4, but I'd be happy to switch that to btrfs if people want me to. Lots of additions here, but this is a filesystem that acts like both a filesystem and a device type without actually providing a device node for the device-like behaviors. So much for layering. I've been working on these for way too long now. They are still only only tested with some basic kickstart configurations and non-kickstart autopart, but are looking good in my testing.

2 16

[pykickstart][PATCH] Add btrfs command.
by David Lehman 14 Dec '11

14 Dec '11

part btrfs.01 ... btrfs <mountpoint> [--data=<level>] \ [--metadata=<level>] \ [--subvol] \ [--label=<label>] \ [--noformat] \ [--useexisting] \ <device>+ --- pykickstart/commands/__init__.py | 2 +- pykickstart/commands/btrfs.py | 161 ++++++++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 2 + tests/commands/btrfs.py | 87 ++++++++++++++++++++ 4 files changed, 251 insertions(+), 1 deletions(-) create mode 100644 pykickstart/commands/btrfs.py create mode 100644 tests/commands/btrfs.py diff --git a/pykickstart/commands/__init__.py b/pykickstart/commands/__init__.py index da48ff5..3c76794 100644 --- a/pykickstart/commands/__init__.py +++ b/pykickstart/commands/__init__.py @@ -17,7 +17,7 @@ # subject to the GNU General Public License and may only be used or replicated # with the express permission of Red Hat, Inc. # -import authconfig, autopart, autostep, bootloader, clearpart, device +import authconfig, autopart, autostep, bootloader, btrfs, clearpart, device import deviceprobe, displaymode, dmraid, driverdisk, fcoe, firewall, firstboot import group, ignoredisk, interactive, iscsi, iscsiname, key, keyboard, lang import langsupport, lilocheck, logging, logvol, mediacheck, method, monitor diff --git a/pykickstart/commands/btrfs.py b/pykickstart/commands/btrfs.py new file mode 100644 index 0000000..5f0c388 --- /dev/null +++ b/pykickstart/commands/btrfs.py @@ -0,0 +1,161 @@ +# +# Chris Lumens <clumens(a)redhat.com> +# David Lehman <dlehman(a)redhat.com> +# +# Copyright 2005, 2006, 2007, 2011 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +from pykickstart.base import * +from pykickstart.errors import * +from pykickstart.options import * + +import gettext +import warnings +_ = lambda x: gettext.ldgettext("pykickstart", x) + +class F17_BTRFSData(BaseData): + removedKeywords = BaseData.removedKeywords + removedAttrs = BaseData.removedAttrs + + def __init__(self, *args, **kwargs): + BaseData.__init__(self, *args, **kwargs) + self.format = kwargs.get("format", True) + self.preexist = kwargs.get("preexist", False) + self.label = kwargs.get("label", "") + self.mountpoint = kwargs.get("mountpoint", "") + self.devices = kwargs.get("devices", []) + self.dataLevel = kwargs.get("data", None) + self.metaDataLevel = kwargs.get("metadata", None) + + # subvolume-specific + self.subvol = kwargs.get("subvol", False) + self.name = kwargs.get("name", None) # required + + def __eq__(self, y): + return self.mountpoint == y.mountpoint + + def _getArgsAsStr(self): + retval = "" + if not self.format: + retval += " --noformat" + if self.preexist: + retval += " --useexisting" + if self.label: + retval += " --label=%s" % self.label + if self.dataLevel: + retval += " --data=%s" % self.dataLevel + if self.metaDataLevel: + retval += " --metadata=%s" % self.metaDataLevel + if self.subvol: + retval += " --subvol --name=%s" % self.name + + return retval + + def __str__(self): + retval = BaseData.__str__(self) + retval += "btrfs %s" % self.mountpoint + retval += self._getArgsAsStr() + return retval + " " + " ".join(self.devices) + "\n" + +class F17_BTRFS(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords + removedAttrs = KickstartCommand.removedAttrs + + def __init__(self, writePriority=132, *args, **kwargs): + KickstartCommand.__init__(self, writePriority, *args, **kwargs) + self.op = self._getParser() + + # A dict of all the RAID levels we support. This means that if we + # support more levels in the future, subclasses don't have to + # duplicate too much. + self.levelMap = { "RAID0": "RAID0", "0": "RAID0", + "RAID1": "RAID1", "1": "RAID1", + "RAID10": "RAID10", "10": "RAID10", + "single": "single" } + + self.btrfsList = kwargs.get("btrfsList", []) + + def __str__(self): + retval = "" + for btr in self.btrfsList: + retval += btr.__str__() + + return retval + + def _getParser(self): + # Have to be a little more complicated to set two values. + def btrfs_cb (option, opt_str, value, parser): + parser.values.format = False + parser.values.preexist = True + + def level_cb (option, opt_str, value, parser): + if self.levelMap.has_key(value): + parser.values.ensure_value(option.dest, self.levelMap[value]) + + op = KSOptionParser() + op.add_option("--noformat", action="callback", callback=btrfs_cb, + dest="format", default=True, nargs=0) + op.add_option("--useexisting", action="callback", callback=btrfs_cb, + dest="preexist", default=False, nargs=0) + + # label, data, metadata + op.add_option("--label", dest="label", default="") + op.add_option("--data", dest="dataLevel", action="callback", + callback=level_cb, type="string", nargs=1) + op.add_option("--metadata", dest="metaDataLevel", action="callback", + callback=level_cb, type="string", nargs=1) + + # + # subvolumes + # + op.add_option("--subvol", dest="subvol", action="store_true", + default=False) + + # parent must be a device spec (LABEL, UUID, &c) + op.add_option("--parent", dest="parent", default="") + op.add_option("--name", dest="name", default="") + #op.add_option("--default", dest="store_true", default=False) + + return op + + def parse(self, args): + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + data = self.handler.BTRFSData() + self._setToObj(self.op, opts, data) + data.lineno = self.lineno + + if len(extra) == 0: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("btrfs must be given a mountpoint")) + + if len(extra) == 1 and not data.subvol: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("btrfs must be given a list of partitions")) + elif len(extra) == 1: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("btrfs subvol requires specification of parent volume")) + + if data.subvol and not data.name: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("btrfs subvolume requires a name")) + + data.mountpoint = extra[0] + data.devices = extra[1:] + + # Check for duplicates in the data list. + if data in self.dataList(): + warnings.warn(_("A btrfs volume with the mountpoint %s has already been defined.") % data.label) + + return data + + def dataList(self): + return self.btrfsList diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index bc9cc27..4a6ee8b 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -830,6 +830,7 @@ commandMap = { "autopart": autopart.F16_AutoPart, "autostep": autostep.FC3_AutoStep, "bootloader": bootloader.F17_Bootloader, + "btrfs": btrfs.F17_BTRFS, "cdrom": method.F14_Method, "clearpart": clearpart.FC3_ClearPart, "cmdline": displaymode.FC3_DisplayMode, @@ -1315,6 +1316,7 @@ dataMap = { "ZFCPData": zfcp.F14_ZFCPData, }, F17: { + "BTRFSData": btrfs.F17_BTRFSData, "DriverDiskData": driverdisk.F14_DriverDiskData, "DeviceData": device.F8_DeviceData, "DmRaidData": dmraid.FC6_DmRaidData, diff --git a/tests/commands/btrfs.py b/tests/commands/btrfs.py new file mode 100644 index 0000000..26dfc28 --- /dev/null +++ b/tests/commands/btrfs.py @@ -0,0 +1,87 @@ +# +# David Lehman <dlehman(a)redhat.com> +# +# Copyright 2011 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# + +import unittest +from tests.baseclass import * + +from pykickstart.errors import * +from pykickstart.commands.dmraid import * + +class F17_TestCase(CommandTest): + command = "btrfs" + + def __init__(self, *kargs, **kwargs): + CommandTest.__init__(self, *kargs, **kwargs) + self.validLevels = ["raid0", "raid1", "raid10", "single"] + + def runTest(self): + # valid levels + pre = "btrfs /" + post = "btrfs.01" + for data in self.validLevels: + self.assert_parse("%s --data=%s %s" % (pre, data, post)) + for meta in self.validLevels: + self.assert_parse("%s --data=%s --metadata=%s %s" % (pre, data, + meta, post)) + self.assert_parse("%s --metadata=%s %s" % (pre, meta, post)) + + # no mountpoint or options ... just partitions + self.assert_parse("btrfs none part.01 part.01") + + # useexisting + self.assert_parse("btrfs /foo --data=1 --useexisting LABEL=foo") + self.assert_parse("btrfs /foo --data=RAID1 --useexisting LABEL=foo") + + # noformat + self.assert_parse("btrfs /foo --data=1 --noformat --useexisting LABEL=foo") + self.assert_parse("btrfs /foo --data=RAID1 --noformat --useexisting LABEL=foo") + + # fail + # no mountpoint or options + self.assert_parse_error("btrfs", KickstartValueError) + + # no options + self.assert_parse_error("btrfs /", KickstartValueError) + + # No members + self.assert_parse_error("btrfs / --data=0 --label=root", KickstartValueError) + + # subvol with no name + self.assert_parse_error("btrfs / --subvol LABEL=test", KickstartValueError) + + # subvol with no parent + self.assert_parse_error("btrfs / --subvol --name=root", KickstartValueError) + + self.assert_parse("btrfs / --subvol --name=root LABEL=test") + self.assert_parse("btrfs / --subvol --name=root test") + + # preexisting + self.assert_parse("btrfs / --useexisting btrfs.01 btrfs.02") + self.assert_parse("btrfs / --useexisting LABEL=test") + + # preexisting subvol with parent specified by label + self.assert_parse("btrfs /home --subvol --name=home --useexisting LABEL=test") + + # pass + self.assert_parse("btrfs / --label=ROOT --data=1 part.01 part.02") + self.assert_parse("btrfs / --data=RAID1 --label=ROOT part.01 part.02") + +if __name__ == "__main__": + unittest.main() -- 1.7.3.4

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel December 2011