[PATCH rhel7] Fix port from rhel 6 to rhel 7 (anaconda.id attribute) (#839297)
by Radek Vykydal
Resolves: rhbz#839297
---
pyanaconda/partIntfHelpers.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/partIntfHelpers.py b/pyanaconda/partIntfHelpers.py
index e26f9b7..dfe85d9 100644
--- a/pyanaconda/partIntfHelpers.py
+++ b/pyanaconda/partIntfHelpers.py
@@ -472,7 +472,7 @@ def drive_iscsi_addition(anaconda, wizard):
_("No iSCSI nodes to log in"))
break
(rc, selected_nodes) = wizard.display_nodes_dialog(found_nodes,
- anaconda.id.storage.iscsi.ifaces)
+ anaconda.storage.iscsi.ifaces)
if not rc or len(selected_nodes) == 0:
break
step = STEP_LOGIN
@@ -499,7 +499,7 @@ def drive_iscsi_addition(anaconda, wizard):
rc = wizard.display_success_dialog(login_ok_nodes,
login_fail_nodes,
login_fail_msg,
- anaconda.id.storage.iscsi.ifaces)
+ anaconda.storage.iscsi.ifaces)
if rc:
step = STEP_STABILIZE
else:
--
1.7.4
11 years, 9 months
[lorax] Cleanup boot menus (#809663)
by Martin Gracik
---
share/config_files/live/x86/isolinux.cfg | 21 +++++++++------------
share/config_files/x86/isolinux.cfg | 25 +++++++++++--------------
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/share/config_files/live/x86/isolinux.cfg b/share/config_files/live/x86/isolinux.cfg
index 9a05a9e..e158834 100644
--- a/share/config_files/live/x86/isolinux.cfg
+++ b/share/config_files/live/x86/isolinux.cfg
@@ -57,29 +57,29 @@ menu tabmsg Press Tab for full configuration options on menu items.
menu separator # insert an empty line
menu separator # insert an empty line
label linux
- menu label ^Start @PRODUCT@
+ menu label ^Start @PRODUCT@ (default)
menu default
kernel vmlinuz
append initrd=initrd.img @ROOT@ quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
+label check
+ menu label Test this ^media & start @PRODUCT@
+ kernel vmlinuz
+ append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
menu separator # insert an empty line
# utilities submenu
menu begin ^Troubleshooting
menu title Troubleshooting
label vesa
menu indent count 5
- menu label Start @PRODUCT@ in ^basic graphics mode.
+ menu label Start @PRODUCT@ in ^basic graphics mode
text help
Try this option out if you're having trouble installing
@PRODUCT@.
endtext
kernel vmlinuz
append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
-label check
- menu label ^Test this media & start @PRODUCT@
- kernel vmlinuz
- append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
label memtest
- menu label Run a ^memory test.
+ menu label Run a ^memory test
text help
If your system is having issues, a problem with your
system's memory may be the cause. Use this utility to
@@ -88,15 +88,12 @@ label memtest
kernel memtest
menu separator # insert an empty line
label local
- menu label Boot from ^local drive.
+ menu label Boot from ^local drive
localboot 0xffff
menu separator # insert an empty line
menu separator # insert an empty line
label returntomain
- menu label Return to ^main menu.
+ menu label Return to ^main menu
menu exit
menu end
-#label local
-# menu label Exit this menu and boot from ^local disk.
-# localboot 0xffff
diff --git a/share/config_files/x86/isolinux.cfg b/share/config_files/x86/isolinux.cfg
index aeb17e4..7ebc36e 100644
--- a/share/config_files/x86/isolinux.cfg
+++ b/share/config_files/x86/isolinux.cfg
@@ -57,30 +57,30 @@ menu tabmsg Press Tab for full configuration options on menu items.
menu separator # insert an empty line
menu separator # insert an empty line
label linux
- menu label ^Install or upgrade @PRODUCT@
- menu default
+ menu label ^Install/upgrade @PRODUCT@
kernel vmlinuz
append initrd=initrd.img @ROOT@ quiet
+label check
+ menu label Test this ^media & install/upgrade @PRODUCT@ (default)
+ menu default
+ kernel vmlinuz
+ append initrd=initrd.img @ROOT@ quiet rd.live.check
menu separator # insert an empty line
# utilities submenu
menu begin ^Troubleshooting
menu title Troubleshooting
label vesa
menu indent count 5
- menu label Install @PRODUCT@ in ^basic graphics mode.
+ menu label Install/upgrade @PRODUCT@ in ^basic graphics mode
text help
Try this option out if you're having trouble installing
@PRODUCT@.
endtext
kernel vmlinuz
append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet
-label check
- menu label ^Test this media & start @PRODUCT@
- kernel vmlinuz
- append initrd=initrd.img @ROOT@ quiet rd.live.check
label rescue
menu indent count 5
- menu label ^Rescue a @PRODUCT@ system.
+ menu label ^Rescue a @PRODUCT@ system
text help
If the system will not boot, this lets you access files
and edit config files to try to get it booting again.
@@ -88,7 +88,7 @@ label rescue
kernel vmlinuz
append initrd=initrd.img @ROOT@ rescue quiet
label memtest
- menu label Run a ^memory test.
+ menu label Run a ^memory test
text help
If your system is having issues, a problem with your
system's memory may be the cause. Use this utility to
@@ -97,15 +97,12 @@ label memtest
kernel memtest
menu separator # insert an empty line
label local
- menu label Boot from ^local drive.
+ menu label Boot from ^local drive
localboot 0xffff
menu separator # insert an empty line
menu separator # insert an empty line
label returntomain
- menu label Return to ^main menu.
+ menu label Return to ^main menu
menu exit
menu end
-#label local
-# menu label Exit this menu and boot from ^local disk.
-# localboot 0xffff
--
1.7.9.5
11 years, 9 months
[lorax 1/2] Add llvm-libs (#826351)
by Martin Gracik
vmware driver needs this when installing in virtual machines.
---
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 379d7f7..0c0d517 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -22,7 +22,7 @@ removepkg alsa* flac gstreamer-tools libsndfile pulseaudio* sound-theme-freedesk
removepkg midisport-firmware
## no fancy video, either
removepkg libcrystalhd crystalhd-firmware ivtv-firmware cx18-firmware
-removepkg mesa-dri-drivers llvm-libs
+removepkg mesa-dri-drivers
## we don't create new initramfs/bootloader conf inside anaconda
## (that happens inside the target system after we install dracut/grubby)
removepkg dracut-network grubby anaconda-dracut
--
1.7.9.5
11 years, 9 months
[lorax] Add llvm-libs (#826351)
by Martin Gracik
vmware driver needs this when installing in virtual machines.
---
share/runtime-install.tmpl | 1 +
1 file changed, 1 insertion(+)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 8e042fb..0fcf86d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -89,6 +89,7 @@ installpkg chrony rdate
installpkg pciutils pcmciautils usbutils
installpkg mt-st hdparm smartmontools
installpkg libmlx4
+installpkg llvm-libs
## translations & language packs
installpkg yum-langpacks specspo
--
1.7.9.5
11 years, 9 months
[PATCH rhel6-branch] Include sha256sum in the installroot (#838742)
by Jesse Keating
---
scripts/upd-instroot | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 122d707..742c76c 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -594,6 +594,7 @@ usr/bin/sg_readcap
usr/bin/sg_scan
usr/bin/sginfo
usr/bin/sha1sum
+usr/bin/sha256sum
usr/bin/split
usr/bin/ssh-keygen
usr/bin/syslinux
--
1.7.10.4
11 years, 9 months
[PATCH] Show more info about source failure in the spoke
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
When package metadata fails to download suggest that the user check the
repo url and, if enabled, the proxy settings.
---
pyanaconda/ui/gui/spokes/source.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 7752439..68020c8 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -500,11 +500,17 @@ class SourceSpoke(NormalSpoke):
try:
self.payload.updateBaseRepo(self.storage, fallback=False)
except PayloadError as e:
+ log.error("PayloadError: %s" % (e,))
self._error = True
communication.send_message(self.__class__.__name__,
_("Failed to set up install source"))
+ if not self.data.method.proxy:
+ self.window.set_info(Gtk.MessageType.WARNING, _("Failed to set up install source, check the repo url"))
+ else:
+ self.window.set_info(Gtk.MessageType.WARNING, _("Failed to set up install source, check the repo url and proxy settings"))
else:
self._error = False
+ self.window.clear_info()
threadMgr.add(AnacondaThread(name="AnaPayloadMDThread",
target=self.getRepoMetadata))
--
1.7.7.6
11 years, 9 months
[newui] disk selection, disk init, storage spoke status
by David Lehman
Patch 1 is in the spirit of quietly building a sane device tree
instead of asking about everything that looks broken or out of
place.
Patch 2 reworks partition clearing and disk (re)initialization to
follow a more consistent/clear/coherent pattern. See the commit
message for details and note how simple Storage.clearPartitions
becomes as a result.
Patch 3 changes the disk selection from the equivalent of choosing
clearpart disks to actually defining the set of disks anaconda sees.
De-selecting a disk means it is not available in custom partitioning.
Selecting a disk means it is fair game for clearpart/autopart.
Patch 4 catches the storage spoke up with the software spoke in terms
of sanity checking. Both spokes can run a sanity check and notify the
user if a failure occurs, but neither has a way to let the user see
the actual set of problems. Baby steps.
11 years, 10 months
[newui] Sort available layouts
by Vratislav Podzimek
PATCH 1/2 makes the list of available layouts sorted by the layouts' show
strings (they are stored as layouts names -- e.g. "cz (qwerty)").
PATCH 2/2 is a simple cosmetic fix. Should I squash it with the previous one?
--
Vratislav Podzimek
11 years, 10 months
[PATCH lorax/master] Don't set a root= argument (#837208)
by Will Woods
Using root= overrides the anaconda magic code for finding product.img
and updates.img. Anaconda can find the CDROM itself without needing
root=, though, so we can omit it safely for boot.iso.
---
share/efi.tmpl | 5 +++--
share/ppc.tmpl | 3 ++-
share/x86.tmpl | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/share/efi.tmpl b/share/efi.tmpl
index 1350ebc..3181eb1 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -35,10 +35,11 @@ ${make_efiboot("images/efiboot.img")}
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
%if disk:
+ ## FIXME: using root= causes problems with product.img (see bug 811979)
replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
%else:
- ## NOTE: this needs to match the boot.iso label (see x86.tmpl)
- replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
+ ## anaconda can find CDROM devices automatically so no root= is needed
+ replace @ROOT@ '' ${eficonf}
%endif
%if efiarch == 'IA32':
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index 3ff15da..65215d6 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -18,7 +18,8 @@ prepboot = ""
## with '_', which means we won't need any udev escapes.
isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
-rootarg = "root=live:CDLABEL=%s" % isolabel
+## Anaconda finds the CDROM device automatically
+rootarg = ""
%>
mkdir ${LIVEDIR}
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 023c1af..0ab1971 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -25,7 +25,8 @@ install boot/memtest* ${BOOTDIR}/memtest
## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
+## anaconda will find the CDROM automatically
+replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg
## install kernels
mkdir ${KERNELDIR}
--
1.7.10.4
11 years, 10 months