On Tue, 2010-04-13 at 17:11 +0200, Hans de Goede wrote: > Write an "AUTO +imsm +1.x -all" line to mdadm.conf, and always > write mdadm.conf. This is necessary for proper activation of > Intel BIOS RAID sets when they are configured in the OROM > after installation. > > This patch is intended for f13-branch and rhel6-branch too. > --- > storage/__init__.py | 11 +++-------- > 1 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/storage/__init__.py b/storage/__init__.py > index ebbf9ed..b19dd18 100644 > --- a/storage/__init__.py > +++ b/storage/__init__.py > @@ -2135,7 +2135,6 @@ class FSSet(object): > > def mdadmConf(self): > """ Return the contents of mdadm.conf. """ > - retval = None > arrays = self.devicetree.getDevicesByType("mdarray") > arrays.extend(self.devicetree.getDevicesByType("mdbiosraidarray")) > arrays.extend(self.devicetree.getDevicesByType("mdcontainer")) > @@ -2148,19 +2147,15 @@ class FSSet(object): > > conf = "# mdadm.conf written out by anaconda\n" > conf += "MAILADDR root\n" > + conf += "AUTO +imsm +1.x -all\n" This makes me nervous. What else are we changing here besides firmware raid? Don't say nothing -- I won't believe you. Dave > devices = self.mountpoints.values() + self.swapDevices > for array in arrays: > - writeConf = False > for device in devices: > if device == array or device.dependsOn(array): > - writeConf = True > + conf += array.mdadmConfEntry > break > > - if writeConf: > - conf += array.mdadmConfEntry > - retval = conf > - > - return retval > + return conf > > def multipathConf(self): > """ Return the contents of multipath.conf. """ _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list