Will bump version as appropriate.
mulhern (1): Adapt to changes in blivet.udev interface.
pyanaconda/kickstart.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signed-off-by: mulhern amulhern@redhat.com --- pyanaconda/kickstart.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 97f0ab9..59e2484 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -176,9 +176,9 @@ def deviceMatches(spec): full_spec = os.path.normpath("/dev/" + full_spec)
# the regular case - matches = udev.udev_resolve_glob(full_spec) - dev = udev.udev_resolve_devspec(full_spec) - # udev_resolve_devspec returns None if there's no match, but we don't + matches = udev.resolve_glob(full_spec) + dev = udev.resolve_devspec(full_spec) + # udev.resolve_devspec returns None if there's no match, but we don't # want that ending up in the list. if dev and dev not in matches: matches.append(dev) @@ -1838,7 +1838,7 @@ def parseKickstart(f): ksparser = AnacondaKSParser(handler)
# We need this so all the /dev/disk/* stuff is set up before parsing. - udev.udev_trigger(subsystem="block", action="change") + udev.trigger(subsystem="block", action="change") # So that drives onlined by these can be used in the ks file blivet.iscsi.iscsi().startup() blivet.fcoe.fcoe().startup()
On Mon, 2014-07-07 at 18:23 -0400, mulhern wrote:
Signed-off-by: mulhern amulhern@redhat.com
pyanaconda/kickstart.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 97f0ab9..59e2484 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -176,9 +176,9 @@ def deviceMatches(spec): full_spec = os.path.normpath("/dev/" + full_spec)
# the regular case
- matches = udev.udev_resolve_glob(full_spec)
- dev = udev.udev_resolve_devspec(full_spec)
- # udev_resolve_devspec returns None if there's no match, but we don't
- matches = udev.resolve_glob(full_spec)
- dev = udev.resolve_devspec(full_spec)
- # udev.resolve_devspec returns None if there's no match, but we don't # want that ending up in the list. if dev and dev not in matches: matches.append(dev)
@@ -1838,7 +1838,7 @@ def parseKickstart(f): ksparser = AnacondaKSParser(handler)
# We need this so all the /dev/disk/* stuff is set up before parsing.
- udev.udev_trigger(subsystem="block", action="change")
- udev.trigger(subsystem="block", action="change") # So that drives onlined by these can be used in the ks file blivet.iscsi.iscsi().startup() blivet.fcoe.fcoe().startup()
This one also looks good, thanks!
anaconda-patches@lists.fedorahosted.org