[rhel7/master] unpack product.img to correct location (#869098)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
It was being unpacked to /updates instead of /updates/tmp/product
---
dracut/anaconda-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index b09a7cc..19573ed 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -101,7 +101,7 @@ anaconda_auto_updates() {
# Unpack an image into the given dir.
unpack_updates_img() {
- local img="$1" tmpdir="/tmp/${1##*/}.$$" outdir="${2:+/updates}"
+ local img="$1" tmpdir="/tmp/${1##*/}.$$" outdir="${2:-/updates}"
# NOTE: unpack_img $img $outdir can clobber existing subdirs in $outdir,
# which is why we use a tmpdir and copytree (which doesn't clobber)
unpack_img $img $tmpdir
--
1.8.0.2
11 years, 2 months
[rhel7/blivet 1/2] check for stage1 when not installing bootloader (#882065)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
When not installing a bootloader stage1_device may not be set, need to
check before using it.
---
pyanaconda/storage/partitioning.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py
index 87372fa..d6b4dde 100644
--- a/pyanaconda/storage/partitioning.py
+++ b/pyanaconda/storage/partitioning.py
@@ -139,7 +139,7 @@ def _schedulePartitions(storage, disks):
log.info("skipping unneeded stage1 %s request" % request.fstype)
log.debug(request)
- if request.fstype == "efi":
+ if request.fstype == "efi" and stage1_device:
# Set the mountpoint for the existing EFI boot partition
stage1_device.format.mountpoint = "/boot/efi"
--
1.8.0.2
11 years, 2 months
[rhel7/blivet] explicitly detect iso9660 on a disk (#903158)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
Previously we were relying on parted to raise an error when trying to
examine a disk with an iso9660 image written to it. The reason for this
was that isohybrid was writing an incorrect mbr, which has now been
fixed. parted will now return the dos mbr from the hybrid iso.
This skips handleUdevDiskLabel if the device format is iso9660, allowing
it to be selected instead of the mbr.
---
pyanaconda/storage/devicetree.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index 9d902aa..d1f60f2 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -1580,7 +1580,8 @@ class DeviceTree(object):
# If not, see if the user would like to create one.
# XXX ignore disklabels on multipath or biosraid member disks
if not udev_device_is_biosraid_member(info) and \
- not udev_device_is_multipath_member(info):
+ not udev_device_is_multipath_member(info) and \
+ format_type != "iso9660":
self.handleUdevDiskLabelFormat(info, device)
if device.partitioned or self.isIgnored(info) or \
(not device.partitionable and
--
1.8.0.2
11 years, 2 months