Anaconda-devel September 2011

anaconda-devel@lists.fedoraproject.org

24 participants
81 discussions

[f16-branch] Write human readable timezone information to /etc/timezone.
by Ales Kozumplik 06 Sep '11

06 Sep '11

This is to unify this basic config file with other distros. systemd is made to maintain it in sync with /etc/localtime. Resolves: rhbz#734626 --- pyanaconda/timezone.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyanaconda/timezone.py b/pyanaconda/timezone.py index 405aa9b..8118090 100644 --- a/pyanaconda/timezone.py +++ b/pyanaconda/timezone.py @@ -33,8 +33,8 @@ class Timezone: f.write(" %s\n" % self.tz) def write(self, instPath): + # /etc/localtime fromFile = instPath + "/usr/share/zoneinfo/" + self.tz - if not os.access(fromFile, os.R_OK): log.error("Timezone to be copied (%s) doesn't exist" % fromFile) else: @@ -43,18 +43,22 @@ class Timezone: except EnvironmentError as e: log.error("Error copying timezone (from %s): %s" % (fromFile, e.strerror)) + # /etc/sysconfig/clock f = open(instPath + "/etc/sysconfig/clock", "w") - f.write('ZONE="%s"\n' % self.tz) f.close() + # /etc/timezone (human readable timezone name) + with open(instPath + "/etc/timezone", 'w') as f: + f.write(self.tz) + + # /etc/adjtime try: f = open(instPath + "/etc/adjtime", "r") lines = f.readlines() f.close() except: lines = [ "0.0 0 0.0\n", "0\n" ] - f = open(instPath + "/etc/adjtime", "w") f.write(lines[0]) f.write(lines[1]) -- 1.7.6

3 2

lorax-treebuilder and f16 images
by Will Woods 06 Sep '11

06 Sep '11

So! I made a Feature-styled wiki pagelet to keep track of the plans for the treebuilder branch of lorax: https://fedoraproject.org/wiki/Anaconda/Features/Lorax-TreeBuilder Build/test instructions will be updated soonish, but there's a link to my draft build instructions there. I'll also be writing documentation on the template language in the near future. The important thing is this: I'd like to get us using treebuilder to build rawhide images ASAP - that means merging treebuilder into master. Is everyone OK with this? And that leads to a second question: what do we do for F16? I don't feel like treebuilder is ready for F16 yet, but the squashfs/dracut-based implementation in lorax's f16-branch is.. immature, and very different from the treebuilder one. So, should we: a) rush treebuilder for F16, b) keep lorax/anaconda images as-is for F16, even though we'll be changing it again in F17, or c) revert the squashfs stuff in f16-branch and build f15-style images again for F16? -w (note: I'll be on PTO until the end of the week, and Monday is Labor Day in the US, so I might not respond to this thread until Tuesday the 6th..)

4 3

[master] isolate localeInfo and expandLangs() from langauges.py into a separate module.
by Ales Kozumplik 06 Sep '11

06 Sep '11

After 0c662ebeaf4043ff2e2a1f7d09b527f4bf243047, we can not build due to imports problem during build time (importing pyanaconda.constants tries to import pyanaconda.__init__ which tries to import isys etc.). This change separates the language.py bits and the bits needed during build time. Includes new unit tests. --- pyanaconda/gui.py | 1 - pyanaconda/iw/progress_gui.py | 4 +- pyanaconda/language.py | 54 ++------------------ pyanaconda/localeinfo.py | 81 ++++++++++++++++++++++++++++++ pyanaconda/text.py | 2 +- scripts/getlangnames.py | 12 ++-- tests/pyanaconda_test/language_test.py | 12 ++-- tests/pyanaconda_test/localeinfo_test.py | 35 +++++++++++++ 8 files changed, 135 insertions(+), 66 deletions(-) create mode 100644 pyanaconda/localeinfo.py create mode 100644 tests/pyanaconda_test/localeinfo_test.py diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index e306852..bd17653 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -35,7 +35,6 @@ import shutil import gtk import gtk.glade import gobject -from language import expandLangs from constants import * from product import * import network diff --git a/pyanaconda/iw/progress_gui.py b/pyanaconda/iw/progress_gui.py index 2967092..93d4970 100644 --- a/pyanaconda/iw/progress_gui.py +++ b/pyanaconda/iw/progress_gui.py @@ -28,7 +28,7 @@ from pyanaconda import gui from pyanaconda.flags import flags from iw_gui import * from pyanaconda.constants import * -from pyanaconda import language +from pyanaconda import localeinfo import logging log = logging.getLogger("anaconda") @@ -87,7 +87,7 @@ class InstallProgressWindow (InstallWindow): langs = [] pixmaps = [] if (os.environ.has_key('LANG')): - langs = language.expandLangs(os.environ['LANG']) + langs = localeinfo.expandLangs(os.environ['LANG']) langs.append('') pixmaps = [] diff --git a/pyanaconda/language.py b/pyanaconda/language.py index b5dd94f..8a0d7f6 100644 --- a/pyanaconda/language.py +++ b/pyanaconda/language.py @@ -27,6 +27,7 @@ import locale import gettext from pyanaconda.constants import ROOT_PATH +import localeinfo from simpleconfig import SimpleConfigFile import system_config_keyboard.keyboard as keyboard @@ -38,32 +39,6 @@ def langComponents(astring): m = pattern.match(astring) return m.groupdict() -# Converts a single language into a "language search path". For example, -# fr_FR.utf8@euro would become "fr_FR.utf8@euro fr_FR.utf8 fr_FR fr" -def expandLangs(astring): - langs = [astring] - charset = None - base = None - - # remove charset ... - if '.' in astring: - langs.append(string.split(astring, '.')[0]) - - if '@' in astring: - charset = string.split(astring, '@')[1] - - if '_' in astring: - base = string.split(astring, '_')[0] - - if charset: - langs.append("%s@%s" % (base, charset)) - - langs.append(base) - else: - langs.append(astring[:2]) - - return langs - class Language(object): def _setInstLang(self, value): # Always store in its full form so we know what we're comparing with. @@ -147,7 +122,6 @@ class Language(object): self._default = "en_US.UTF-8" self.displayMode = display_mode self.info = {} - self.localeInfo = {} self.nativeLangNames = {} # English name -> native name mapping @@ -163,27 +137,7 @@ class Language(object): f.close() break - # nick -> (name, short name, font, keyboard, timezone) mapping - search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table', - '/usr/share/anaconda/lang-table') - for path in search: - if os.access(path, os.R_OK): - f = open(path, "r") - for line in f.readlines(): - string.strip(line) - l = string.split(line, '\t') - - # throw out invalid lines - if len(l) < 6: - continue - - self.localeInfo[l[3]] = (l[0], l[1], l[2], l[4], string.strip(l[5])) - - f.close() - break - - # Hard code this to prevent errors in the build environment. - self.localeInfo['C'] = self.localeInfo[self._default] + self.localeInfo = localeinfo.get(self._default) # instLang must be set after localeInfo is populated, in case the # current setting is unsupported by anaconda.. @@ -199,7 +153,7 @@ class Language(object): fr_CA -> ValueError """ for key in self.localeInfo.keys(): - if lang in expandLangs(key): + if lang in localeinfo.expandLangs(key): return key raise ValueError @@ -229,7 +183,7 @@ class Language(object): return args def getCurrentLangSearchList(self): - return expandLangs(self.systemLang) + ['C'] + return localeinfo.expandLangs(self.systemLang) + ['C'] def getDefaultKeyboard(self): try: diff --git a/pyanaconda/localeinfo.py b/pyanaconda/localeinfo.py new file mode 100644 index 0000000..f036358 --- /dev/null +++ b/pyanaconda/localeinfo.py @@ -0,0 +1,81 @@ +# __init__.py +# Entry point for anaconda's storage configuration module. +# +# Copyright (C) 2009 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, or (at your option) any later version. +# 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. +# + + +""" Basic locale operations useful during both Anaconda build time and run time. + + This module can be imported without importing pyanaconda/__init__.py and it + is desirable to keep it that way. +""" + +import os +import string + +def get(default): + localeInfo = {} + # nick -> (name, short name, font, keyboard, timezone) mapping + search = ('lang-table', '/tmp/updates/lang-table', '/etc/lang-table', + '/usr/share/anaconda/lang-table') + for path in search: + if os.access(path, os.R_OK): + f = open(path, "r") + for line in f.readlines(): + string.strip(line) + l = string.split(line, '\t') + + # throw out invalid lines + if len(l) < 6: + continue + + localeInfo[l[3]] = (l[0], l[1], l[2], l[4], string.strip(l[5])) + + f.close() + break + + # Hard code this to prevent errors in the build environment. + localeInfo['C'] = localeInfo[default] + return localeInfo + +# Converts a single language into a "language search path". For example, +# fr_FR.utf8@euro would become "fr_FR.utf8@euro fr_FR.utf8 fr_FR fr" +def expandLangs(astring): + langs = [astring] + charset = None + base = None + + # remove charset ... + if '.' in astring: + langs.append(string.split(astring, '.')[0]) + + if '@' in astring: + charset = string.split(astring, '@')[1] + + if '_' in astring: + base = string.split(astring, '_')[0] + + if charset: + langs.append("%s@%s" % (base, charset)) + + langs.append(base) + else: + langs.append(astring[:2]) + + return langs + diff --git a/pyanaconda/text.py b/pyanaconda/text.py index 6396f25..cb85bb5 100644 --- a/pyanaconda/text.py +++ b/pyanaconda/text.py @@ -32,7 +32,7 @@ import signal import parted import product import string -from language import expandLangs +from localeinfo import expandLangs from flags import flags from textw.constants_text import * from constants import * diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py index bc3cced..2e579a4 100644 --- a/scripts/getlangnames.py +++ b/scripts/getlangnames.py @@ -19,26 +19,26 @@ import sys sys.path.append("..") -import language as language +import localeinfo import gettext -langs = language.Language() +localeInfo = localeinfo.get("en_US.UTF-8") names = {} -for k in langs.localeInfo.keys(): +for k in localeInfo.keys(): found = False - for l in language.expandLangs(k): + for l in localeinfo.expandLangs(k): try: f = open("../po/%s.gmo" %(l,)) except (OSError, IOError): continue cat = gettext.GNUTranslations(f) cat.set_output_charset("utf-8") - names[langs.localeInfo[k][0]] = cat.lgettext(langs.localeInfo[k][0]) + names[localeInfo[k][0]] = cat.lgettext(localeInfo[k][0]) found = True break if not found: - names[langs.localeInfo[k][0]] = langs.localeInfo[k][0] + names[localeInfo[k][0]] = localeInfo[k][0] nameList = names.keys() nameList.sort() diff --git a/tests/pyanaconda_test/language_test.py b/tests/pyanaconda_test/language_test.py index 3d4498a..daf500b 100644 --- a/tests/pyanaconda_test/language_test.py +++ b/tests/pyanaconda_test/language_test.py @@ -13,12 +13,7 @@ class LanguageTest(mock.TestCase): self.fs = mock.DiskIO() def fake_os_access(path, _): - return path == 'lang-table' or path == 'lang-names' - - self.fs.open('lang-table', 'w').write( - "Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague\n" - "English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York\n" - "Hebrew he none he_IL.UTF-8 us Asia/Jerusalem") + return path == 'lang-names' self.fs.open('lang-names', 'w').write( "Czech\tCestina\n" @@ -33,6 +28,11 @@ class LanguageTest(mock.TestCase): pyanaconda.language.os.access = fake_os_access pyanaconda.language.os.environ = {'LANG': ENVIRON_LANG} pyanaconda.language.locale = mock.Mock() + pyanaconda.language.localeinfo.get = mock.Mock(return_value={ + 'C': ('English', 'en', 'latarcyrheb-sun16', 'us', 'America/New_York'), + 'cs_CZ.UTF-8': ('Czech', 'cs', 'latarcyrheb-sun16', 'cz-lat2', 'Europe/Prague'), + 'en_US.UTF-8': ('English', 'en', 'latarcyrheb-sun16', 'us', 'America/New_York'), + 'he_IL.UTF-8': ('Hebrew', 'he', 'none', 'us', 'Asia/Jerusalem')}) def tearDown(self): self.tearDownModules() diff --git a/tests/pyanaconda_test/localeinfo_test.py b/tests/pyanaconda_test/localeinfo_test.py new file mode 100644 index 0000000..32f0916 --- /dev/null +++ b/tests/pyanaconda_test/localeinfo_test.py @@ -0,0 +1,35 @@ +import mock + +class LocaleinfoTest(mock.TestCase): + def setUp(self): + self.setupModules( + ['_isys', 'logging', 'pyanaconda.anaconda_log', 'block']) + + import pyanaconda + pyanaconda.anaconda_log = mock.Mock() + + def tearDown(self): + self.tearDownModules() + + def expandLangs_test(self): + from pyanaconda import localeinfo + exp = localeinfo.expandLangs("fr_FR.utf8@euro") + self.assertEqual(exp, ['fr_FR.utf8@euro', 'fr_FR', 'fr@euro', 'fr']) + + def get_test(self): + from pyanaconda import localeinfo + + fs = mock.DiskIO() + fs['/lang-table'] = """ +Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague\n +English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York\n +Hebrew he none he_IL.UTF-8 us Asia/Jerusalem""" + self.take_over_io(fs, localeinfo) + + info = localeinfo.get("en_US.UTF-8") + self.assertEqual( + info, + {'C': ('English', 'en', 'latarcyrheb-sun16', 'us', 'America/New_York'), + 'cs_CZ.UTF-8': ('Czech', 'cs', 'latarcyrheb-sun16', 'cz-lat2', 'Europe/Prague'), + 'en_US.UTF-8': ('English', 'en', 'latarcyrheb-sun16', 'us', 'America/New_York'), + 'he_IL.UTF-8': ('Hebrew', 'he', 'none', 'us', 'Asia/Jerusalem')}) -- 1.7.6

3 2

[PATCH 1/2] lorax: use own addrsize implementation
by Dan Horák 06 Sep '11

06 Sep '11

Anaconda doesn't built the addrsize tool used to create the file containing size and load address for initrd.img. So we implement its function directly in lorax. --- src/pylorax/images.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/pylorax/images.py b/src/pylorax/images.py index 75d38e0..5b9a351 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -641,16 +641,12 @@ class S390(object): logger.info("compressing the install tree") self.installtree.compress(initrd, kernel, self.ctype, self.cargs) - # run addrsize - addrsize = joinpaths(self.installtree.root, "usr/libexec", - "anaconda", "addrsize") - - cmd = [addrsize, INITRD_ADDRESS, initrd.fpath, - joinpaths(self.outputroot, IMAGESDIR, "initrd.addrsize")] - - p = subprocess.Popen(cmd, stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - p.wait() + # create initrd.addrsize + addrsize = open(joinpaths(self.outputroot, IMAGESDIR, "initrd.addrsize"), "wb") + import struct + addrsize_data = struct.pack('>iiii', 0, int(INITRD_ADDRESS, 16), 0, os.stat(initrd.fpath).st_size) + addrsize.write(addrsize_data) + addrsize.close() # add kernel and initrd to .treeinfo kernel_arch = kernel.version.split(".")[-1] -- 1.7.4.4

3 4

[firstboot] Add a firstboot-text wrapper (#734306)
by Martin Gracik 06 Sep '11

06 Sep '11

In text mode we are running /usr/bin/setup. We still need to check /etc/sysconfig/firstboot if it should run. --- firstboot.spec | 1 + progs/firstboot-text | 37 +++++++++++++++++++++++++++++++++++++ setup.py | 2 +- systemd/firstboot-text.service | 3 ++- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100755 progs/firstboot-text diff --git a/firstboot.spec b/firstboot.spec index 8510489..8172b22 100644 --- a/firstboot.spec +++ b/firstboot.spec @@ -94,6 +94,7 @@ fi %dir %{_datadir}/firstboot/themes/default %{python_sitelib}/* %{_sbindir}/firstboot +%{_sbindir}/firstboot-text %{_datadir}/firstboot/modules/create_user.py* %{_datadir}/firstboot/modules/date.py* %{_datadir}/firstboot/modules/eula.py* diff --git a/progs/firstboot-text b/progs/firstboot-text new file mode 100755 index 0000000..36ea718 --- /dev/null +++ b/progs/firstboot-text @@ -0,0 +1,37 @@ +#! /usr/bin/env python + +# +# firstboot-text +# +# Copyright (C) 2011 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty 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, see <http://www.gnu.org/licenses/>. +# +# Red Hat Author(s): Martin Gracik <mgracik(a)redhat.com> +# + +import os +import sys + +if __name__ == '__main__': + if os.path.isfile('/etc/sysconfig/firstboot'): + with open('/etc/sysconfig/firstboot') as fobj: + for line in fobj: + if line.strip() == 'RUN_FIRSTBOOT=NO': + os.system('systemctl stop firstboot-graphical.service > /dev/null 2>&1') + os.system('systemctl stop firstboot-text.service > /dev/null 2>&1') + sys.exit(0) + + # run setup + os.system('/usr/bin/setup') diff --git a/setup.py b/setup.py index f97000d..9bcb6a7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup from glob import * import os -data_files = [('/usr/sbin', ['progs/firstboot']), +data_files = [('/usr/sbin', ['progs/firstboot', 'progs/firstboot-text']), ('/usr/share/firstboot/themes/default', glob('themes/default/*.png')), ('/usr/share/firstboot/modules', glob('modules/*.py')), diff --git a/systemd/firstboot-text.service b/systemd/firstboot-text.service index 7bbd90c..843f44a 100644 --- a/systemd/firstboot-text.service +++ b/systemd/firstboot-text.service @@ -6,7 +6,8 @@ Conflicts=firstboot-graphical.service plymouth-quit.service [Service] Type=oneshot -ExecStart=/usr/bin/setup +ExecStartPre=-/bin/plymouth quit +ExecStart=/usr/sbin/firstboot-text ExecStartPost=/bin/systemctl disable firstboot-graphical.service firstboot-text.service TimeoutSec=0 RemainAfterExit=yes -- 1.7.3.2

2 1

[rhel6-branch] mpath: create /etc/multipath/bindings if we are using friendly names.
by Ales Kozumplik 06 Sep '11

06 Sep '11

It needs to be there after all, otherwise mpath doesn't know how to call the mpath devices during early boot. This results in /boot being mounted from /dev/mapper/<wwid>p1 instead from /dev/mapper/mpathap1 and causes concern with the storage QE. Resolves: rhbz#734374 --- storage/__init__.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/storage/__init__.py b/storage/__init__.py index d644b10..ae38dbc 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -2195,6 +2195,8 @@ class FSSet(object): else: log.info("not writing out mpath configuration") iutil.copy_to_sysimage("/etc/multipath/wwids", root_path=instPath) + if self.devicetree.mpathFriendlyNames: + iutil.copy_to_sysimage("/etc/multipath/bindings", root_path=instPath) def crypttab(self): # if we are upgrading, do we want to update crypttab? -- 1.7.6

2 1

[rhel5-branch] Suppress critical errors when guessing release notes names (#707143).
by Ales Kozumplik 05 Sep '11

05 Sep '11

--- iw/release_notes.py | 9 ++++++++- urlinstall.py | 12 +++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/iw/release_notes.py b/iw/release_notes.py index ca7d87c..38b5bbc 100644 --- a/iw/release_notes.py +++ b/iw/release_notes.py @@ -26,6 +26,9 @@ import gui from rhpl.translate import _, N_ +import logging +log = logging.getLogger("anaconda") + class ReleaseNotesViewer: def __init__(self, anaconda): self.currentURI = None @@ -62,7 +65,10 @@ class ReleaseNotesViewer: for suffix in suffixList: fn = "RELEASE-NOTES%s" % (suffix,) try: - tmpfile = os.path.abspath(self.anaconda.dispatch.method.getFilename(fn, destdir="/tmp", retry=0)) + tmpfile = os.path.abspath( + self.anaconda.dispatch.method.getFilename( + fn, destdir="/tmp", retry=0, + loglevel=logging.INFO)) if tmpfile is None: continue @@ -79,6 +85,7 @@ class ReleaseNotesViewer: except: continue + log.error("getReleaseNotes() failed.") return None def resize(self, w=None, h=None): diff --git a/urlinstall.py b/urlinstall.py index d0b1e00..4c0f6da 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -117,7 +117,8 @@ class UrlInstallMethod(InstallMethod): isys.makeDevInode("loop0", "/tmp/loop") isys.lochangefd("/tmp/loop", self.loopbackFile) - def getFilename(self, filename, callback=None, destdir=None, retry=1): + def getFilename(self, filename, callback=None, destdir=None, retry=1, + loglevel=logging.CRITICAL): if destdir is None: tmppath = self.getTempPath() @@ -125,7 +126,7 @@ class UrlInstallMethod(InstallMethod): tmppath = destdir base = self.pkgUrl - + fullPath = base + "/" + filename file = tmppath + "/" + os.path.basename(fullPath) @@ -135,12 +136,13 @@ class UrlInstallMethod(InstallMethod): try: rc=urlretrieve(fullPath, file, callback=callback) except IOError, (errnum, msg): - log.critical("IOError %s occurred getting %s: %s" - %(errnum, fullPath.replace("%", "%%"), str(msg))) + if loglevel: + log.log(loglevel, "Problem (%s) occurred getting %s: %s" + %(errnum, fullPath.replace("%", "%%"), str(msg))) if not retry: raise FileCopyException - + time.sleep(5) else: break -- 1.7.6

2 1

[PATCH] Determine existing md arrays' metadata version. (#731266)
by David Lehman 02 Sep '11

02 Sep '11

This is needed if we are to validate boot arrays' metadata version. (based on cherry pick of 9599b145793f3aa9e151f28c5cd2cda6f8dcd668) --- pyanaconda/storage/devices.py | 23 ++++++++++++++++------- pyanaconda/storage/devicetree.py | 5 ++++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index d3c3bda..cf68b57 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -2652,7 +2652,7 @@ class MDRaidArrayDevice(StorageDevice): def __init__(self, name, level=None, major=None, minor=None, size=None, memberDevices=None, totalDevices=None, - uuid=None, format=None, exists=None, + uuid=None, format=None, exists=None, metadataVersion=None, parents=None, sysfsPath=''): """ Create a MDRaidArrayDevice instance. @@ -2663,6 +2663,7 @@ class MDRaidArrayDevice(StorageDevice): Keyword Arguments: level -- the device's RAID level (a string, eg: '1' or 'raid1') + metadataVersion -- the version of the device's md metadata parents -- list of member devices (StorageDevice instances) size -- the device's size (units/format TBD) uuid -- the device's UUID @@ -2699,7 +2700,11 @@ class MDRaidArrayDevice(StorageDevice): self.chunkSize = 512.0 / 1024.0 # chunk size in MB self.superBlockSize = 2.0 # superblock size in MB - self.createMetadataVer = "default" + if not isinstance(metadataVersion, str): + self.metadataVersion = "default" + else: + self.metadataVersion = metadataVersion + # bitmaps are not meaningful on raid0 according to mdadm-3.0.3 self.createBitmap = self.level != 0 @@ -2784,9 +2789,12 @@ class MDRaidArrayDevice(StorageDevice): s = StorageDevice.__repr__(self) s += (" level = %(level)s spares = %(spares)s\n" " members = %(memberDevices)s\n" - " total devices = %(totalDevices)s" % + " total devices = %(totalDevices)s" + " metadata version = %(metadataVersion)s" % {"level": self.level, "spares": self.spares, - "memberDevices": self.memberDevices, "totalDevices": self.totalDevices}) + "memberDevices": self.memberDevices, + "totalDevices": self.totalDevices, + "metadataVersion": self.metadataVersion}) return s @property @@ -2794,7 +2802,8 @@ class MDRaidArrayDevice(StorageDevice): d = super(MDRaidArrayDevice, self).dict d.update({"level": self.level, "spares": self.spares, "memberDevices": self.memberDevices, - "totalDevices": self.totalDevices}) + "totalDevices": self.totalDevices, + "metadataVersion": self.metadataVersion}) return d def writeKS(self, f, preexisting=False, noformat=False, s=None): @@ -3037,7 +3046,7 @@ class MDRaidArrayDevice(StorageDevice): if getattr(self.format, "mountpoint", None) == bootmountpoint or \ getattr(self.format, "mountpoint", None) == "/boot/efi" or \ self.format.type == "prepboot": - self.createMetadataVer = "1.0" + self.metadataVersion = "1.0" # Bitmaps are not useful for swap and small partitions if self.size < 1000 or self.format.type == "swap": @@ -3062,7 +3071,7 @@ class MDRaidArrayDevice(StorageDevice): self.level, disks, spares, - metadataVer=self.createMetadataVer, + metadataVer=self.metadataVersion, bitmap=self.createBitmap, progress=w) diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py index 743760d..b735ec2 100644 --- a/pyanaconda/storage/devicetree.py +++ b/pyanaconda/storage/devicetree.py @@ -1382,9 +1382,11 @@ class DeviceTree(object): minor = udev_device_get_minor(dev) break + md_info = devicelibs.mdraid.mdexamine(device.path) + md_metadata = md_info.get("metadata") + if not md_name: # try to name the array based on the preferred minor - md_info = devicelibs.mdraid.mdexamine(device.path) md_path = md_info.get("device", "") md_name = devicePathToName(md_info.get("device", "")) if md_name: @@ -1422,6 +1424,7 @@ class DeviceTree(object): minor=minor, memberDevices=md_devices, uuid=md_uuid, + metadataVersion=md_metadata, sysfsPath=sysfs_path, exists=True) except ValueError as e: -- 1.7.6

2 2

[rhel5-branch] four patches
by David Cantrell 02 Sep '11

02 Sep '11

Four moderately simple patches for rhel5-branch. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Westford, MA | EST5EDT

2 7

[rhel6-branch] call initrd image on ppc64 'initrd.img'
by David Cantrell 01 Sep '11

01 Sep '11

Stop calling it ramdisk.image.gz (or ramdisk.image.xz). -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Westford, MA | EST5EDT

2 2

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel September 2011