[lorax] only ix86/x86_64 and ppc/ppc64 need grub2
by Dan Horák
AFAIK grub2 is used only ix86/x86_64 and ppc/pcc64 arches. This will silence
the error thrown on arches where the package doesn't exist.
---
share/runtime-install.tmpl | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e9e3da3..6fe5768 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -12,7 +12,6 @@ installpkg pigz
## firstaidkit (rescue mode) packages
installpkg firstaidkit-plugin-{passwd,key-recovery,mdadm-conf}
-installpkg grub2 grub2-tools
## kernel and firmware
installpkg kernel
@@ -30,10 +29,10 @@ installpkg kernel
installpkg kernel-PAE gpart
%endif
%if basearch in ("i386", "x86_64"):
- installpkg shim grub2-efi efibootmgr biosdevname memtest86+
+ installpkg grub2 grub2-tools shim grub2-efi efibootmgr biosdevname memtest86+
%endif
%if basearch in ("ppc", "ppc64"):
- installpkg yaboot fbset hfsutils kernel-bootwrapper ppc64-utils
+ installpkg grub2 grub2-tools yaboot fbset hfsutils kernel-bootwrapper ppc64-utils
%endif
%if basearch == "s390x":
installpkg lsscsi modutils mount s390utils-base s390utils-cmsfs-fuse
--
1.7.7.6
11 years, 4 months
[PATCH lorax/master] Correct argument to installupgradeinitrd.
by d.marlin
From: "d.marlin" <dmarlin(a)redhat.com>
Signed-off-by: David A. Marlin <dmarlin(a)redhat.com>
---
share/arm.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/arm.tmpl b/share/arm.tmpl
index de1c8c8..e99c92b 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -33,7 +33,7 @@ mkdir ${KERNELDIR}
installinitrd images-${kernel.flavor}-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd-${kernel.flavor}.img
## install upgrade image
- installupgradeinitrd images-${kernel.flavor}-${basearch} ${kernel.upgrade.img} ${KERNELDIR}/upgrade-${kernel.flavor}.img
+ installupgradeinitrd images-${kernel.flavor}-${basearch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade-${kernel.flavor}.img
## create U-Boot wrapped images
@@ -59,7 +59,7 @@ mkdir ${KERNELDIR}
installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
## install upgrade image
- installupgradeinitrd images-${basearch} ${kernel.upgrade.img} ${KERNELDIR}/upgrade.img
+ installupgradeinitrd images-${basearch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
## create U-Boot wrapped images
--
1.7.10.2
11 years, 4 months
fix some blockers and some future/potential blockers
by David Lehman
Patch 6 deserves some explanation, as does patch 7.
For preexisting devices, if there is encryption below the layers
we can alter (eg: lvm pvs) we should never ever set the encryption
checkbutton sensitive since it is impossible to turn off encryption
for such a device without removing it. We already had this covered
when setting up the customization area, but I dropped the ball in
the on_reformat_toggled handler by not taking this complexity into
account.
Patch 7 adds a udev_settle() call at the bottom of udev_trigger.
This prevents the possibility of getting into DeviceTree.populate
before the udev queue has settled from our trigger call, which could
potentially lead to missing info in the udevdb.
11 years, 4 months
[PATCH] 'make coverage' for pykickstart
by Stef Walter
Attached is a patch which adds support for a 'make coverage' build
command to pykickstart. It runs the tests with the python-coverage
command to produce coverage information.
Cheers,
Stef
11 years, 5 months
[PATCH] When considering whether anything can be shrunk, throw out protected devs.
by Chris Lumens
---
pyanaconda/ui/gui/spokes/lib/resize.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py
index dcc8527..b500c97 100644
--- a/pyanaconda/ui/gui/spokes/lib/resize.py
+++ b/pyanaconda/ui/gui/spokes/lib/resize.py
@@ -142,7 +142,8 @@ class ResizeDialog(GUIObject):
# Devices that are not resizable are still deletable.
if dev.resizable:
freeSize = dev.size - dev.minSize
- canShrinkSomething = True
+ if not dev.protected:
+ canShrinkSomething = True
else:
freeSize = dev.size
--
1.7.11.2
11 years, 5 months
[PATCH rhel6-branch] Fix fipvlan -f argument once more and for good (#836321)
by Radek Vykydal
Related: rhbz#863621
---
storage/fcoe.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/storage/fcoe.py b/storage/fcoe.py
index 75c932b..4fe851e 100644
--- a/storage/fcoe.py
+++ b/storage/fcoe.py
@@ -129,7 +129,7 @@ class fcoe(object):
"e:1", "a:1", "w:1" ],
stdout = "/dev/tty5", stderr="/dev/tty5")
iutil.execWithRedirect("fipvlan", [ "-c", "-s", "-f",
- "'-fcoe'", nic],
+ "-fcoe", nic],
stdout = "/dev/tty5", stderr="/dev/tty5")
else:
if auto_vlan:
@@ -137,7 +137,7 @@ class fcoe(object):
iutil.execWithRedirect("modprobe", ["8021q"],
stdout = "/dev/tty5", stderr="/dev/tty5")
iutil.execWithRedirect("fipvlan", ['-c', '-s', '-f',
- "'-fcoe'", nic],
+ "-fcoe", nic],
stdout = "/dev/tty5", stderr="/dev/tty5")
else:
f = open("/sys/module/libfcoe/parameters/create", "w")
--
1.7.4
11 years, 5 months
[lorax] remove multipath rules (#880263)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
This is a temporary fix until multipath can be updated.
---
share/runtime-cleanup.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index ddd27ad..5ac30a8 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -167,7 +167,7 @@ removefrom dbus-glib /usr/bin/*
removefrom dbus-x11 /etc/X11/*
removefrom dejavu-sans-fonts --allbut *.conf */DejaVuSans{,-Bold}.ttf
removefrom dejavu-sans-mono-fonts --allbut *.conf */DejaVuSansMono.ttf
-removefrom device-mapper-multipath /etc/* /sbin/mpathconf /sbin/multipathd
+removefrom device-mapper-multipath /etc/* /sbin/mpathconf /sbin/multipathd /lib/udev/rules.d/62-multipath.rules
removefrom dhclient /usr/lib/* /usr/share/*
removefrom dnsmasq /etc/rc.d/* /usr/sbin/*
removefrom dump /etc/*
--
1.8.0
11 years, 5 months
[PATCH] don't inject a space between each char in boot device name (#875652)
by Samantha N. Bueno
string.join() by default adds a space between each char/word unless
explicitly noted otherwise.
Resolves: rhbz#875652
---
booty/checkbootloader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/booty/checkbootloader.py b/booty/checkbootloader.py
index d58df8e..c76b5bf 100644
--- a/booty/checkbootloader.py
+++ b/booty/checkbootloader.py
@@ -106,7 +106,7 @@ def getBootDevList(line):
for dev in devs:
dev = getBootDevString("=%s" % (dev,))
rets.append(dev)
- return string.join(rets)
+ return string.join(rets, "")
def getBootloaderTypeAndBoot(instRoot, storage):
haveGrubConf = 1
--
1.8.0
11 years, 5 months
[lorax] no mount (sub-)package since RHEL-2
by Dan Horák
---
share/runtime-install.tmpl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e9e3da3..2ba1818 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -36,7 +36,7 @@ installpkg kernel
installpkg yaboot fbset hfsutils kernel-bootwrapper ppc64-utils
%endif
%if basearch == "s390x":
- installpkg lsscsi modutils mount s390utils-base s390utils-cmsfs-fuse
+ installpkg lsscsi modutils s390utils-base s390utils-cmsfs-fuse
%endif
%if basearch == "sparc":
installpkg silo tilo
--
1.7.7.6
11 years, 5 months
[PATCH] update mdraid superBlock space calculation (#883483)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
mdadm 3.2.4 made a major change in the amount of space used for 1.1 and
1.2 metadata in order to reserve space for reshaping. See commit
508a7f16 in the upstream mdadm repository.
This has resulted in a large difference between what anaconda thinks the
size of the array should be and what it actually is.
We now use 2.0MB for metadata that isn't 1.1 or 1.2
For 1.1 and 1.2 we calculate the reserved space value and use that.
NOTE: This is the f18 variation of 87640, tested against anaconda 18.34-1
---
pyanaconda/storage/devices.py | 57 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 56 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 6967b30..06baab2 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -2670,7 +2670,6 @@ class MDRaidArrayDevice(StorageDevice):
self._memberDevices = numeric_type(memberDevices)
self.chunkSize = 512.0 / 1024.0 # chunk size in MB
- self.superBlockSize = 2.0 # superblock size in MB
if not self.exists and not isinstance(metadataVersion, str):
self.metadataVersion = "default"
@@ -2699,6 +2698,62 @@ class MDRaidArrayDevice(StorageDevice):
% (self.path, self.uuid))
@property
+ def rawArraySize(self):
+ """ Calculate the raw array size without taking into account space
+ reserved for metadata or chunkSize alignment.
+
+ This is used to calculate the superBlockSize for v1.1 and v1.2
+ metadata.
+
+ Returns the raw size in MB
+ """
+ smallestMemberSize = self.smallestMember.size
+ if self.level == mdraid.RAID0:
+ size = self.memberDevices * smallestMemberSize
+ elif self.level == mdraid.RAID1:
+ size = smallestMemberSize
+ elif self.level == mdraid.RAID4:
+ size = (self.memberDevices - 1) * smallestMemberSize
+ elif self.level == mdraid.RAID5:
+ size = (self.memberDevices - 1) * smallestMemberSize
+ elif self.level == mdraid.RAID6:
+ size = (self.memberDevices - 2) * smallestMemberSize
+ elif self.level == mdraid.RAID10:
+ size = (self.memberDevices / 2.0) * smallestMemberSize
+ else:
+ size = smallestMemberSize
+ log.error("unknown RAID level %s" % (self.level))
+ log.debug("raw RAID %s size == %s" % (self.level, size))
+ return size
+
+ @property
+ def superBlockSize(self):
+ """ mdadm has different amounts of space reserved for its use depending
+ on the metadata type and size of the array.
+
+ 0.9 use 2.0 MB
+ 1.0 use 2.0 MB
+ 1.1 or 1.2 use the formula lifted from mdadm/super1.c to calculate it
+ based on the array size.
+ """
+ # mdadm 3.2.4 made a major change in the amount of space used for 1.1 and 1.2
+ # in order to reserve space for reshaping. See commit 508a7f16 in the
+ # upstream mdadm repository.
+ if self.metadataVersion not in ["default", "1.1", "1.2"]:
+ headroom = 2.0
+ else:
+ array_size = self.rawArraySize
+ # MDADM: We try to leave 0.1% at the start for reshape
+ # MDADM: operations, but limit this to 128Meg (0.1% of 10Gig)
+ # MDADM: which is plenty for efficient reshapes
+ # NOTE: In the mdadm code this is in 512b sectors. Converted to use MB
+ headroom = 128
+ while headroom << 10 > array_size:
+ headroom >>= 1
+ log.info("Using %sMB superBlockSize" % (headroom))
+ return headroom
+
+ @property
def smallestMember(self):
try:
smallest = sorted(self.devices, key=lambda d: d.size)[0]
--
1.8.0
11 years, 5 months