[rhel6-branch 1/1] Fixed IndexError in cleardisks_gui.py (#1224413)
by dashea
From: Jan Pokorny <japokorn(a)redhat.com>
Anaconda no longer raises IndexError in when user clicks 'No, keep my data' while
using uninitialized multipath devices.
Resolves: rhbz#1224413
---
storage/__init__.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/storage/__init__.py b/storage/__init__.py
index aeb162d..6083b1a 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -108,7 +108,8 @@ def storageInitialize(anaconda, examine_all=True):
else:
storage.reset(examine_all=examine_all)
- if not storage.disks:
+ # Check if not-hidden disks exist; also triggers when no disks are found
+ if all([x.format.hidden for x in storage.disks]):
custom_buttons=[_("_Try again"), _("_Exit installer")]
if anaconda.dispatch and anaconda.dispatch.canGoBack():
custom_buttons = [_("_Back"), _("_Exit installer")]
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/143b60d868184909e3c266bb32...
8 years, 4 months
[rhel7-branch 1/1] Add _netdev when mounting network devices during
installation
(#1290046)
by dashea
From: "Brian C. Lane" <bcl(a)redhat.com>
systemd needs to know that a filesystem depends on the network,
otherwise it will pull the plug before properly unmounting the device.
Resolves: rhbz#1290046
---
blivet/__init__.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index cc83ef8..54e748e 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -2599,6 +2599,8 @@ def mountFilesystems(self, rootPath="", readOnly=None, skipRoot=False):
devices.append(self.efivars)
devices.sort(key=lambda d: getattr(d.format, "mountpoint", None))
+ netdevs = self.devicetree.getDevicesByInstance(NetworkStorageDevice)
+
for device in devices:
if not device.format.mountable or not device.format.mountpoint:
continue
@@ -2639,6 +2641,11 @@ def mountFilesystems(self, rootPath="", readOnly=None, skipRoot=False):
if readOnly:
options = "%s,%s" % (options, readOnly)
+ for netdev in netdevs:
+ if device.dependsOn(netdev):
+ options = options + ",_netdev"
+ break
+
try:
device.format.setup(options=options,
chroot=rootPath)
--
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/e56ebb1971626943e37a148854bc...
8 years, 4 months