August 2012 - anaconda-patches - Fedora mailing-lists

A few patches for parse-kickstart's ksnet_to_dracut()
by Will Woods 07 Sep '12

07 Sep '12

This is roughly the same as my previous patch for supporting kickstart 'network --mtu-...', but broken into a series of smaller patches so you can actually see what's going on. Patch 1-4 are all just cleanups, patch 5 adds --mtu. dracut/parse-kickstart | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) -w

2 6

Support for enabling multilib
by David Lehman 05 Sep '12

05 Sep '12

--multilib option to ks %packages and also as an anaconda arg Once pykickstart is built I'll also patch anaconda.spec.in to require the appropriate pykickstart version.

3 4

[master] Language-related stuff cleanup
by Vratislav Podzimek 04 Sep '12

04 Sep '12

These two patches remove no longer used/needed files and add few lines for writing language system configuration to the installed system. This part needs one more patch for writing /etc/locale.conf, but I don't know how this file should look. Please not that these patches are not tested as I am sending them from the BaseOS team building without virtualization available. I will test them before pusing tomorrow. Vratislav Podzimek (2): Remove lang-table and localeinfo.py Remove anaconda.instLanguage object and language module anaconda | 3 - data/lang-table | 61 --------- pyanaconda/__init__.py | 10 -- pyanaconda/install.py | 1 + pyanaconda/installclass.py | 1 - pyanaconda/kickstart.py | 6 + pyanaconda/language.py | 216 ------------------------------ pyanaconda/localeinfo.py | 56 -------- pyanaconda/localization.py | 25 ++++ tests/pyanaconda_test/language_test.py | 237 --------------------------------- 10 files changed, 32 insertions(+), 584 deletions(-) delete mode 100644 data/lang-table delete mode 100644 pyanaconda/language.py delete mode 100644 pyanaconda/localeinfo.py delete mode 100644 tests/pyanaconda_test/language_test.py -- 1.7.11.4

2 5

[PATCH] Handle invalid spoke input (#853253)
by Jesse Keating 31 Aug '12

31 Aug '12

--- pyanaconda/ui/tui/spokes/storage.py | 4 ++-- pyanaconda/ui/tui/spokes/time.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py index 40a167a..d1b85c3 100644 --- a/pyanaconda/ui/tui/spokes/storage.py +++ b/pyanaconda/ui/tui/spokes/storage.py @@ -207,7 +207,7 @@ class StorageSpoke(NormalTUISpoke): self._update_disk_list(self.disks[number -1]) return None - except (ValueError, KeyError): + except (ValueError, KeyError, IndexError): return key def apply(self): @@ -345,5 +345,5 @@ class AutoPartSpoke(NormalTUISpoke): self.close() return False - except (ValueError, KeyError): + except (ValueError, KeyError, IndexError): return key diff --git a/pyanaconda/ui/tui/spokes/time.py b/pyanaconda/ui/tui/spokes/time.py index bac1d0f..2cea1b8 100644 --- a/pyanaconda/ui/tui/spokes/time.py +++ b/pyanaconda/ui/tui/spokes/time.py @@ -99,7 +99,7 @@ class TimeZoneSpoke(NormalTUISpoke): else: self.app.switch_screen(self, self._regions[keyid]) return True - except ValueError: + except (ValueError, IndexError): pass if key.lower() in self._lower_zones: -- 1.7.11.2

2 1

[PATCH] Remove unnecessary (and broken) import (#853576)
by Jesse Keating 31 Aug '12

31 Aug '12

--- pyanaconda/text.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyanaconda/text.py b/pyanaconda/text.py index c924ae3..f3c9c77 100644 --- a/pyanaconda/text.py +++ b/pyanaconda/text.py @@ -32,7 +32,6 @@ import signal import parted import product import string -from localeinfo import expandLangs from flags import flags from textw.constants_text import * from constants import * -- 1.7.11.2

2 1

[PATCH] Disable the maximize/unmaximize key bindings (#853410).
by Chris Lumens 31 Aug '12

31 Aug '12

--- lorax.spec | 1 + .../common/org.gnome.desktop.wm.keybindings.gschema.override | 4 ++++ share/runtime-postinstall.tmpl | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 share/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override diff --git a/lorax.spec b/lorax.spec index 6a74e0f..ed473a2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -20,6 +20,7 @@ Requires: e2fsprogs Requires: findutils Requires: gawk Requires: genisoimage +Requires: glib2 Requires: glibc Requires: glibc-common Requires: gzip diff --git a/share/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override b/share/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override new file mode 100644 index 0000000..3b08904 --- /dev/null +++ b/share/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override @@ -0,0 +1,4 @@ +[org.gnome.desktop.wm.keybindings] + maximize=[] + unmaximize=[] + toggle-maximized=[] diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 95be02b..114e00b 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -86,6 +86,10 @@ gconfset /apps/metacity/global_keybindings/switch_windows string disabled gconfset /desktop/gnome/interface/accessibility bool true gconfset /desktop/gnome/interface/at-spi-corba bool true +## Some settings are controlled by gsettings now. +install ${configdir}/org.gnome.desktop.wm.keybindings.gschema.override usr/share/glib-2.0/schemas +runcmd chroot ${root} glib-compile-schemas /usr/share/glib-2.0/schemas + move usr/libexec/anaconda/auditd sbin ## for compatibility with Ancient Anaconda Traditions -- 1.7.10.2

2 1

[pykickstart] Add --multilib option to %packages
by David Lehman 31 Aug '12

31 Aug '12

This changes yum's multilib_policy from the default of "best" to "all".

1 1

[PATCH] Destroy the Add Mountpoint dialog when escape is pressed (#853058).
by Chris Lumens 31 Aug '12

31 Aug '12

--- pyanaconda/ui/gui/spokes/custom.glade | 1 - pyanaconda/ui/gui/spokes/custom.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index a2e2b64..1a0bf8d 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -36,7 +36,6 @@ <property name="halign">end</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_add_cancel_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index f0e8d58..5de6c35 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -132,9 +132,6 @@ class AddDialog(GUIObject): completion.set_text_column(0) completion.set_popup_completion(True) - def on_add_cancel_clicked(self, button, *args): - self.window.destroy() - def on_add_confirm_clicked(self, button, *args): self.mountpoint = self.builder.get_object("addMountPointEntry").get_text() @@ -948,6 +945,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): if rc != 1: # user cancel + dialog.window.destroy() return # create a device of the default type, using any disks, with an -- 1.7.11.2

2 1

[PATCH 1/3] Update runpylint to find newui modules correctly.
by Chris Lumens 31 Aug '12

31 Aug '12

--- tests/pylint/runpylint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 8c3e74b..9b771cd 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -80,7 +80,7 @@ fi # run pylint one file / module at a time, otherwise it sometimes gets # confused > pylint-log -for i in pyanaconda/storage pyanaconda/installclasses/*.py pyanaconda/iw/*.py pyanaconda/textw/*.py pyanaconda/isys/*.py pyanaconda/; do +for i in $(find pyanaconda -type f -name '*py'); do pylint --init-hook='import sys; \ sys.path.insert(1, "pyanaconda/isys/.libs"); \ sys.path.insert(2, "pyanaconda/isys"); \ -- 1.7.11.2

2 3

[PATCH] Keep the current spoke on top of the hub.
by Chris Lumens 31 Aug '12

31 Aug '12

This means you can't alt-tab away from the spoke and do stuff on the hub and really confuse anaconda. --- pyanaconda/ui/gui/TODO | 2 -- pyanaconda/ui/gui/hubs/__init__.py | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/TODO b/pyanaconda/ui/gui/TODO index 6f8dcf9..cb86ca4 100644 --- a/pyanaconda/ui/gui/TODO +++ b/pyanaconda/ui/gui/TODO @@ -13,8 +13,6 @@ Fedora 18 where you go next. - Something causes the up and down arrows to resize the anaconda window. - Wall of anaconda needs to be taken into account. -- When you display a spoke, the hub needs to be hidden so you can't alt-tab. This is especially - bad on liveinst. - Why does the first hub jump left a little bit the first time you use the keyboard to navigate? - In custom storage, it'd be nice to be able to say something like "Use this previous installation as the starting storage configuration for the system diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index f5e211f..4d8c6e3 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -94,6 +94,7 @@ class Hub(GUIObject, common.Hub): action.window.set_beta(self.window.get_beta()) action.window.set_property("distribution", self.window.get_property("distribution")) + action.window.set_transient_for(self.window) action.window.show_all() # Start a recursive main loop for this spoke, which will prevent @@ -101,6 +102,7 @@ class Hub(GUIObject, common.Hub): # prevent the user from switching away. It's up to the spoke's back # button handler to kill its own layer of main loop. Gtk.main() + action.window.set_transient_for(None) if not action.skipTo or (action.skipTo and action.applyOnSkip): action.apply() -- 1.7.11.2

2 1

[master] Two additional patches for timezones and NTP
by Vratislav Podzimek 30 Aug '12

30 Aug '12

PATCH 1/2 is something for pity's sake. PATCH 2/2 is a problem I've discovered when testing previous NTP and timezones related patches. Vratislav Podzimek (2): Continue post-installation steps even if writing NTP configuration fails Remove ROOT_PATH/etc/localtime before symlinking timezone pyanaconda/kickstart.py | 7 +++++-- pyanaconda/timezone.py | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) -- 1.7.11.4

2 3

[PATCH f18-alpha-branch 1/2] Fix a string substitution think-o
by Jesse Keating 29 Aug '12

29 Aug '12

--- anaconda | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anaconda b/anaconda index 7f008a9..f9eb878 100755 --- a/anaconda +++ b/anaconda @@ -144,7 +144,8 @@ def setupPythonUpdates(): # from /run/install/ -- JLK for dirname in ("updates", "product"): if os.path.exists("/run/install/%s" % dirname): - os.symlink("/run/install/%s", "/tmp/%s" % (dirname, dirname)) + os.symlink("/run/install/%s" % dirname, + "/tmp/%s" % dirname) if not os.path.exists("/tmp/updates"): return -- 1.7.11.2

2 2

RAID support for the custom spoke
by David Lehman 29 Aug '12

29 Aug '12

pyanaconda/storage/__init__.py | 123 +++++----- pyanaconda/storage/devicelibs/mdraid.py | 33 ++- pyanaconda/storage/devices.py | 23 ++- pyanaconda/storage/devicetree.py | 23 +-- pyanaconda/storage/formats/__init__.py | 7 + pyanaconda/storage/partitioning.py | 8 +- pyanaconda/storage/udev.py | 9 +- pyanaconda/ui/gui/spokes/custom.glade | 400 +++++++------------------------ pyanaconda/ui/gui/spokes/custom.py | 228 ++++++++++++++++-- pyanaconda/ui/gui/spokes/storage.py | 4 + 10 files changed, 417 insertions(+), 441 deletions(-)

2 17

[PATCH] Only show groups in the UI if they have members that install by default (default or mandatory packages).
by Bill Nottingham 29 Aug '12

29 Aug '12

--- pyanaconda/packaging/yumpayload.py | 15 +++++++++++++++ pyanaconda/ui/gui/spokes/software.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 28f728d..44b5b6e 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -876,6 +876,21 @@ reposdir=%s group = groups.return_group(groupid) return group.user_visible + def _groupHasInstallableMembers(self, groupid): + groups = self._yumGroups + if not groups: + return False + + with _yum_lock: + if not groups.has_group(groupid): + return False + + group = groups.return_group(groupid) + pkgs = group.mandatory_packages.keys() + group.default_packages.keys() + if pkgs: + return True + return False + def _selectYumGroup(self, groupid, default=True, optional=False): # select the group in comps pkg_types = ['mandatory'] diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 5e24f90..bbcfd19 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -211,7 +211,7 @@ class SoftwareSelectionSpoke(NormalSpoke): self._addonStore.clear() if self.environment: for grp in self.payload.groups: - if self.payload.environmentHasOption(self.environment, grp) or self.payload._isGroupVisible(grp): + if self.payload.environmentHasOption(self.environment, grp) or (self.payload._isGroupVisible(grp) and self.payload._groupHasInstallableMembers(grp)): (name, desc) = self.payload.groupDescription(grp) selected = self.payload.groupSelected(grp) -- 1.7.11.4

2 1

F18 Alpha patch for handling updates
by Jesse Keating 29 Aug '12

29 Aug '12

This moves our updates image to put content in /run/initramfs/inst.updates/, and anaconda will symlink that back into /tmp/updates/ when it runs. This allows us to re-enable /tmp/ as tmpfs and avoid the overlay overflow. Post-alpha we'll stop making the symlink and instead just use the updates (and product) content directly from /run/initramfs/inst. -jlk

2 2

[f18-alpha] [PATCH] Use Gtk.main_level() to check if main loop is already running
by Vratislav Podzimek 29 Aug '12

29 Aug '12

For some reason GLib.main_depth() stopped working and returns 0 even if Gtk.main loop is already running. This leads to crashes and hangs of whole GUI when exception appears in a thread different from the main one. Resolves: rhbz#849997 --- pyanaconda/exception.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 2ac513b..0ea48b6 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -66,12 +66,20 @@ class AnacondaExceptionHandler(ExceptionHandler): self.intf.showError(hw_error_msg) sys.exit(0) else: - if GLib.main_depth() > 0: - # main loop is running, don't crash it by running another one - # potentially from a different thread - GLib.idle_add(run_handleException_on_idle, - ((ty, value, tb), obj)) - else: + try: + from gi.repository import Gtk + + if Gtk.main_level() > 0: + # main loop is running, don't crash it by running another one + # potentially from a different thread + GLib.idle_add(run_handleException_on_idle, + ((ty, value, tb), obj)) + else: + super(AnacondaExceptionHandler, self).handleException( + (ty, value, tb), obj) + + except RuntimeError: + # X not running (Gtk cannot be initialized) super(AnacondaExceptionHandler, self).handleException( (ty, value, tb), obj) -- 1.7.11.4

2 3

[PATCH] get liveinst limping along
by Chris Lumens 29 Aug '12

29 Aug '12

The following patch series fixes up liveinst enough to where it hits the same NTP traceback post-install that normal installs do. I consider that to be a minor victory. It does, of course, have the following problems: * Using getDirSize for spaceRequired is pretty slow. It's probably good enough for now, though, and someone with a suitably clever idea can figure out a better way to do it. * The spinner on the progress hub doesn't spin, and I have no idea why. Last time I did a real install, it spins. So it's either broken there now too, or it's live-specific. This just makes us look like we're hung. * It's likely there's another traceback or two hiding after the NTP one but I can't tell because that's not been pushed yet. But like I said, limping along. This is probably good enough to get everyone else looking at it so we can have something in for alpha. - Chris

4 16

[PATCH 1/2] parse-kickstart: set IPV6INIT=yes when using ipv6 (#830434)
by Will Woods 28 Aug '12

28 Aug '12

It turns out IPV6INIT defaults to "no", so we need to set this. --- dracut/parse-kickstart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index b0a21a0..a219118 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -280,6 +280,9 @@ def ksnet_to_ifcfg(net, filename=None): # ipv6 settings if net.noipv6: ifcfg['IPV6INIT'] = "no" + elif net.ipv6: + ifcfg['IPV6INIT'] = "yes" + if net.ipv6 == 'dhcp': ifcfg['DHCPV6C'] = "yes" ifcfg['IPV6_AUTOCONF'] = "no" -- 1.7.11.4

2 2

[PATCH] require anaconda-widgets
by Brian C. Lane 28 Aug '12

28 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- anaconda.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/anaconda.spec.in b/anaconda.spec.in index 93e0115..eb9b8ea 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -95,6 +95,7 @@ BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver} BuildRequires: s390utils-devel %endif +Requires: anaconda-widgets = %{version}-%{release} Requires: gnome-icon-theme-symbolic Requires: python-meh >= %{mehver} Requires: policycoreutils -- 1.7.11.4

2 1

[master] Move expandLangs and use it in LanguageMixIn
by Vratislav Podzimek 28 Aug '12

28 Aug '12

PATCH 1/2 moves expandLangs from localeinfo module to localization module and renames it to match coding style in that file. This change is a step to language.py and localeinfo.py modules removal. PATCH 2/2 resolves bug when we get language from kickstart in a different form we have languages in our store (e.g. 'en_US' vs. 'en_US.UTF-8'). Vratislav Podzimek (2): Move expandLangs to localization module Use expand_langs to find matching language (LanguageSpoke) pyanaconda/language.py | 6 +++--- pyanaconda/localeinfo.py | 27 --------------------------- pyanaconda/localization.py | 29 +++++++++++++++++++++++++++++ pyanaconda/ui/gui/hubs/progress.py | 4 ++-- pyanaconda/ui/gui/spokes/welcome.py | 4 ++-- scripts/getlangnames.py | 3 ++- tests/pyanaconda_test/localeinfo_test.py | 5 ----- 7 files changed, 38 insertions(+), 40 deletions(-) -- 1.7.11.4

2 4

[master] Two patches for timezones and NTP processing
by Vratislav Podzimek 28 Aug '12

28 Aug '12

PATCH 1/2 adds some checks and fallbacks for cases when we get invalid timezone. PATCH 2/2 adds code that *I expect* to ensure chrony installation and enabling if user turns on NTP. Is adding items to ksdata.packages.packageList and ksdata.services.enabled enough to make it work? Vratislav Podzimek (2): Don't crash if someone gives us bad timezone Honor user's choice on NTP (ON/OFF) pyanaconda/kickstart.py | 15 ++++++--- pyanaconda/ui/gui/spokes/datetime_spoke.py | 50 ++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 10 deletions(-) -- 1.7.11.4

2 7

miscellaneous patches for f18
by David Lehman 28 Aug '12

28 Aug '12

pyanaconda/packaging/yumpayload.py | 29 +++++++++++++++---------- pyanaconda/storage/__init__.py | 20 ++++++++++++++--- pyanaconda/storage/partitioning.py | 9 ++++++- pyanaconda/ui/gui/spokes/custom.glade | 10 +++++++++ pyanaconda/ui/gui/spokes/custom.py | 37 +++++++++++++++++++++++++-------- 5 files changed, 78 insertions(+), 27 deletions(-)

3 12

Patches to handle DVD media
by Jesse Keating 27 Aug '12

27 Aug '12

This patch set handles having optical media with repodata. If we booted from such media the device will already be mounted thanks to dracut, and we should just use it as is. But if the media was added later in the source spoke we need to mount it where we want it. This has been tested with an updates.img and it seems to work, although the software selection spoke is showing no packages, we think due to yum environment stuff. The media gets mounted properly and the repodata is read correctly. These should go into F18 for the alpha. -jlk

2 6

[PATCH] anaconda-cleanup: fix DeviceTree args
by Brian C. Lane 27 Aug '12

27 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- scripts/anaconda-cleanup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/anaconda-cleanup b/scripts/anaconda-cleanup index 05a3594..4716dc8 100755 --- a/scripts/anaconda-cleanup +++ b/scripts/anaconda-cleanup @@ -84,7 +84,7 @@ for mounted in reversed(open("/proc/mounts").readlines()): os.system("udevadm control --env=ANACONDA=1") os.system("udevadm trigger --subsystem-match block") os.system("udevadm settle") -devicetree = DeviceTree(intf=intf, conf=storage_config) +devicetree = DeviceTree(conf=storage_config) devicetree.populate(cleanupOnly=True) devicetree.teardownAll() for name in devicetree.diskImages.keys(): -- 1.7.11.4

2 1

[PATCH 1/3] Add yum-plugin-fastestmirror (#849797)
by Brian C. Lane 27 Aug '12

27 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/runtime-install.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 868ac37..e6203f3 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -123,5 +123,8 @@ installpkg wget rsync rsh bind-utils ftp mtr vconfig installpkg icfg spice-vdagent installpkg gdisk +## yum plugins +installpkg yum-plugin-fastestmirror + ## actually install all the requested packages run_pkg_transaction -- 1.7.11.4

3 7

[PATCH rhel6-branch] bonding support
by Radek Vykydal 27 Aug '12

27 Aug '12

The set contains also some patches from vlan support (marked in commit message). They contain common changes/code and have been reviewed in vlan patchset, so you can ignore them.

3 12

[PATCH] Unset install_device if repo setup fails
by Jesse Keating 24 Aug '12

24 Aug '12

We're unsetting method there too, we need to unset the install_device so that we don't try and mount it later. --- pyanaconda/packaging/yumpayload.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 28f728d..65263bc 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -378,6 +378,7 @@ reposdir=%s # this preserves the method details while disabling it self.data.method.method = None + self.install_device = None finally: self._yumCacheDirHack() -- 1.7.11.2

2 1

[PATCH] Add old_source checking for closest mirror and url methods too (#851336).
by Chris Lumens 24 Aug '12

24 Aug '12

This way if the user starts with one of those methods and doesn't change anything before hitting back, we won't waste time trying to redownload everything. --- pyanaconda/ui/gui/spokes/source.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index b9f544c..c912be3 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -457,6 +457,8 @@ class SourceSpoke(NormalSpoke): elif self._mirror_active(): # this preserves the url for later editing self.data.method.method = None + if not old_source.method: + return elif self._http_active() or self._ftp_active(): url = self._urlEntry.get_text().strip() @@ -478,6 +480,10 @@ class SourceSpoke(NormalSpoke): self.data.method.url = "http://" + self.data.method.url elif self._protocolComboBox.get_active() == 1 and not self.data.method.url.startswith("https://"): self.data.method.url = "https://" + self.data.method.url + + if (old_source.method == "url" and + old_source.url == self.data.method.url): + return elif self._nfs_active(): url = self._urlEntry.get_text().strip() -- 1.7.11.2

2 1

take II of networking patchset (write conf, init networking) for master
by Radek Vykydal 24 Aug '12

24 Aug '12

This is take II of https://lists.fedorahosted.org/pipermail/anaconda-patches/2012-July/000283.… reviewed and commented by Chris. Compared to previous patchset: [1/7] is the same as original [1/4] [2/7] ksdata argument of writeNetworkConf is added and ksdata is updated with post-install changes of ifcfg files [3/7] is the same as original [2/4] [4/7] is the same as original [3/4] [5/7] is part of original [4/4] which consolidates code [6/7] is part of original [4/4] which adds ksdata.netwrok.hostname - it has also related ks patch - I updated required pykickstart version [7/7] reworked original [5/5] - initializeNetwork is called in install.py instead of __init__ of StandaloneNetworkSpoke (see commit message) - also fixes part of newui->master merge [1/1] kickstart patch - adds new property also to RHEL7 compared to original Details are in commit messages.

2 11

[PATCH] Only use mounted media that has repodata
by Jesse Keating 24 Aug '12

24 Aug '12

This recovers some logic from yuminstall.py, only use /run/install/repo if there is metadata there. This is related to bug 851274 , but only fixes part of it. It gets booting from boot.iso working again, but leaves booting from DVD broken. --- pyanaconda/packaging/yumpayload.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 28f728d..c62e926 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -553,10 +553,11 @@ reposdir=%s # Did dracut leave the DVD mounted for us? device = get_mount_device("/run/install/repo") if device: - self.install_device = storage.devicetree.getDeviceByPath(device) - url = "file:///run/install/repo" - if not method.method: - method.method = "cdrom" + if os.path.isdir("/run/install/repo/os/repodata"): + self.install_device = storage.devicetree.getDeviceByPath(device) + url = "file:///run/install/repo" + if not method.method: + method.method = "cdrom" else: # cdrom or no method specified -- check for media device = opticalInstallMedia(storage.devicetree) -- 1.7.11.2

3 2

[PATCH 1/2] Move the software-specific error message out of the DetailedErrorDialog class.
by Chris Lumens 24 Aug '12

24 Aug '12

--- pyanaconda/ui/gui/spokes/lib/detailederror.glade | 6 ++---- pyanaconda/ui/gui/spokes/lib/detailederror.py | 4 ++++ pyanaconda/ui/gui/spokes/software.py | 7 ++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.glade b/pyanaconda/ui/gui/spokes/lib/detailederror.glade index db9daf2..eb031b5 100644 --- a/pyanaconda/ui/gui/spokes/lib/detailederror.glade +++ b/pyanaconda/ui/gui/spokes/lib/detailederror.glade @@ -15,14 +15,12 @@ <property name="orientation">vertical</property> <property name="spacing">2</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="detailedLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">18</property> <property name="xalign">0</property> - <property name="label" translatable="yes">The following software marked for installation has errors. This is likely caused by an error with -your installation source. You can attempt to remove these packages from your installation, -change your installation source, or quit the installer.</property> + <property name="label" translatable="yes">An unknown error occurred during installation. Details are below.</property> </object> <packing> <property name="expand">False</property> diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.py b/pyanaconda/ui/gui/spokes/lib/detailederror.py index 2696f90..fd6a455 100644 --- a/pyanaconda/ui/gui/spokes/lib/detailederror.py +++ b/pyanaconda/ui/gui/spokes/lib/detailederror.py @@ -43,6 +43,7 @@ class DetailedErrorDialog(GUIObject): def __init__(self, *args, **kwargs): buttons = kwargs.pop("buttons", []) + label = kwargs.pop("label", None) GUIObject.__init__(self, *args, **kwargs) i = 1 @@ -50,6 +51,9 @@ class DetailedErrorDialog(GUIObject): self.window.add_button(button, i) i += 1 + if label: + self.builder.get_object("detailedLabel").set_text(label) + def refresh(self, msg): buf = self.builder.get_object("detailedTextBuffer") buf.set_text(msg, -1) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 3aecad4..5e24f90 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -266,8 +266,13 @@ class SoftwareSelectionSpoke(NormalSpoke): if not self._errorMsgs: return + label = _("The following software marked for installation has errors. " + "This is likely caused by an error with\nyour installation source. " + "You can attempt to remove these packages from your installation.\n" + "change your installation source, or quit the installer.") dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit"), _("_Remove Packages"), - _("_Modify Software Source")]) + _("_Modify Software Source")], + label=label) with enlightbox(self.window, dialog.window): dialog.refresh(self._errorMsgs) rc = dialog.run() -- 1.7.11.2

3 4

Two patches for f18 alpha networking
by Radek Vykydal 24 Aug '12

24 Aug '12

3 6

[PATCH 1/2] Add a mountpoints property.
by Chris Lumens 24 Aug '12

24 Aug '12

This returns all the mountpoints for a given page as a list of strings. --- pyanaconda/ui/gui/spokes/lib/accordion.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py index 473ff04..f4d15c8 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -151,6 +151,10 @@ class Page(Gtk.Box): return selector + @property + def mountpoints(self): + return [mem.props.mountpoint for mem in self._members] + def _mountpointType(self, mountpoint): if not mountpoint: # This catches things like swap. @@ -226,3 +230,7 @@ class CreateNewPage(Page): self._createBox.add(label) self.add(self._createBox) + + @property + def mountpoints(self): + return [] -- 1.7.11.2

2 2

[PATCH] enable fastestmirror yum plugin (#849797)
by Brian C. Lane 23 Aug '12

23 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/packaging/yumpayload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 28f728d..d794d6e 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -175,7 +175,7 @@ class YumPayload(PackagePayload): # Set some configuration parameters that don't get set through a config # file. yum will know what to do with these. - self._yum.preconf.enabled_plugins = ["blacklist", "whiteout"] + self._yum.preconf.enabled_plugins = ["blacklist", "whiteout", "fastestmirror"] self._yum.preconf.fn = "/tmp/anaconda-yum.conf" self._yum.preconf.root = root # set this now to the best default we've got ; we'll update it if/when -- 1.7.11.4

2 1

[PATCH 1/2] livemedia-creator: update templates for grub2-efi support
by Brian C. Lane 23 Aug '12

23 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/live/config_files/x86/grub2-efi.cfg | 31 +++++++++++++++++++++++++++++++ share/live/efi.tmpl | 13 +++++++++---- share/live/x86.tmpl | 4 ++-- 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 share/live/config_files/x86/grub2-efi.cfg diff --git a/share/live/config_files/x86/grub2-efi.cfg b/share/live/config_files/x86/grub2-efi.cfg new file mode 100644 index 0000000..f21d085 --- /dev/null +++ b/share/live/config_files/x86/grub2-efi.cfg @@ -0,0 +1,31 @@ +set default="0" + +function load_video { + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus + insmod all_video +} + +load_video +set gfxpayload=keep +insmod gzio +insmod part_gpt +insmod ext2 + +set timeout=5 +### END /etc/grub.d/00_header ### + +search --no-floppy --set=root -l '@ISOLABEL@' + +### BEGIN /etc/grub.d/10_linux ### +menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ + initrdefi @INITRDPATH@ +} +menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { + linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check + initrdefi @INITRDPATH@ +} + diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl index 644f009..7664d90 100644 --- a/share/live/efi.tmpl +++ b/share/live/efi.tmpl @@ -1,4 +1,4 @@ -<%page args="configdir, KERNELDIR, efiarch"/> +<%page args="configdir, KERNELDIR, efiarch, isolabel"/> <% EFIBOOTDIR="EFI/BOOT" APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns" @@ -6,7 +6,10 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" %> mkdir ${EFIBOOTDIR} -install boot/efi/EFI/redhat/grub.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +mkdir ${EFIBOOTDIR}/fonts/ +install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi +install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images @@ -19,7 +22,7 @@ ${make_efiboot("images/efiboot.img")} <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')"> <% kdir = EFIBOOTDIR if include_kernel else KERNELDIR - eficonf = "%s/BOOT%s.conf" % (EFIBOOTDIR, efiarch) + eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) args = "--label=ANACONDA" if disk: args += " --disk" if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version) @@ -28,12 +31,14 @@ ${make_efiboot("images/efiboot.img")} copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} %endif - install ${configdir}/grub.conf ${eficonf} + install ${configdir}/grub2-efi.cfg ${eficonf} replace @PRODUCT@ '${product.name}' ${eficonf} replace @VERSION@ ${product.version} ${eficonf} + replace @KERNELNAME@ vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf} + replace @ISOLABEL@ '${isolabel}' ${eficonf} %if disk: ## FIXME: using root= causes problems with product.img (see bug 811979) replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf} diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl index 023c1af..107ed05 100644 --- a/share/live/x86.tmpl +++ b/share/live/x86.tmpl @@ -49,7 +49,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} ## WHeeeeeeee, EFI. ## We could remove the basearch restriction someday.. <% efiargs=""; efigraft=""; efihybrid="" %> -%if exists("boot/efi/EFI/redhat/grub.efi") and basearch != 'i386': +%if exists("boot/efi/EFI/fedora/grub-cd.efi") and basearch != 'i386': <% efiarch = 'X64' if basearch=='x86_64' else 'IA32' efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) @@ -61,7 +61,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} efigraft += " {0}={1}/{0}".format(img,outroot) efihybrid = "--uefi --mac" if domacboot else "--uefi" %> - <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/> + <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/> %endif ## make boot.iso -- 1.7.11.2

2 2

[PATCH] use inst.stage2=hd:LABEL (#848641)
by Brian C. Lane 23 Aug '12

23 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> The iso is able to autodetect the device and find stage2, but when they are written to USB via dd it needs to know where to find the install media. --- share/efi.tmpl | 6 ++---- share/live/efi.tmpl | 4 ++-- share/live/sparc.tmpl | 2 +- share/live/x86.tmpl | 2 +- share/sparc.tmpl | 2 +- share/x86.tmpl | 3 +-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/share/efi.tmpl b/share/efi.tmpl index aa430ec..550e9e3 100644 --- a/share/efi.tmpl +++ b/share/efi.tmpl @@ -40,11 +40,9 @@ ${make_efiboot("images/efiboot.img")} replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf} replace @ISOLABEL@ '${isolabel}' ${eficonf} %if disk: - ## FIXME: using root= causes problems with product.img (see bug 811979) - replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf} + replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf} %else: - ## anaconda can find CDROM devices automatically so no root= is needed - replace @ROOT@ '' ${eficonf} + replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf} %endif %if efiarch == 'IA32': copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl index 7664d90..0daad49 100644 --- a/share/live/efi.tmpl +++ b/share/live/efi.tmpl @@ -41,9 +41,9 @@ ${make_efiboot("images/efiboot.img")} replace @ISOLABEL@ '${isolabel}' ${eficonf} %if disk: ## FIXME: using root= causes problems with product.img (see bug 811979) - replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf} + replace @ROOT@ inst.stage2:LABEL=ANACONDA ${eficonf} %else: - replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf} + replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf} %endif %if efiarch == 'IA32': copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf diff --git a/share/live/sparc.tmpl b/share/live/sparc.tmpl index 2452f80..1a66e2c 100644 --- a/share/live/sparc.tmpl +++ b/share/live/sparc.tmpl @@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR} ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf ## install kernels ## FIXME: this will overwrite if there are multiple sparc kernels diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl index 107ed05..490f18b 100644 --- a/share/live/x86.tmpl +++ b/share/live/x86.tmpl @@ -25,7 +25,7 @@ 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 +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg ## install kernels mkdir ${KERNELDIR} diff --git a/share/sparc.tmpl b/share/sparc.tmpl index 2452f80..1a66e2c 100644 --- a/share/sparc.tmpl +++ b/share/sparc.tmpl @@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR} ## configure bootloader replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf ## install kernels ## FIXME: this will overwrite if there are multiple sparc kernels diff --git a/share/x86.tmpl b/share/x86.tmpl index 849eef8..490f18b 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -25,8 +25,7 @@ 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 -## anaconda will find the CDROM automatically -replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg ## install kernels mkdir ${KERNELDIR} -- 1.7.11.4

2 1

[PATCH] use wildcard for product path to efi binaries (#851196)
by Brian C. Lane 23 Aug '12

23 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> Depending on the product the path to these may be /fedora/ or /redhat/ so just use whatever they were installed under. --- share/efi.tmpl | 6 +++--- share/live/efi.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/efi.tmpl b/share/efi.tmpl index 550e9e3..fa8b558 100644 --- a/share/efi.tmpl +++ b/share/efi.tmpl @@ -7,9 +7,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ -install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi -install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi -install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +install boot/efi/EFI/*/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi +install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl index 0daad49..4f457b6 100644 --- a/share/live/efi.tmpl +++ b/share/live/efi.tmpl @@ -7,9 +7,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ -install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi -install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi -install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ +install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi +install boot/efi/EFI/*/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi +install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images -- 1.7.11.4

2 1

[PATCH] Mask the tmp.mount service to avoid tmpfs
by Jesse Keating 23 Aug '12

23 Aug '12

Anaconda runtime is already in memory, no need to use tmpfs here. In fact use of tmpfs here will overwrite any updates content that was put in place by dracut. --- share/runtime-postinstall.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 95be02b..837d06f 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -33,7 +33,7 @@ systemctl disable systemd-readahead-collect.service \ systemctl mask fedora-configure.service fedora-loadmodules.service \ fedora-storage-init.service fedora-storage-init-late.service \ fedora-autorelabel.service fedora-autorelabel-mark.service \ - fedora-wait-storage.service media.mount + fedora-wait-storage.service media.mount tmp.mount ## install some basic configuration files append etc/resolv.conf "" -- 1.7.11.2

3 5

Root password GUI spoke take 2
by Jesse Keating 23 Aug '12

23 Aug '12

Uses patch from Chris to effectively trap the user inside the spoke until they get the password right. Now can hit back twice on a weak password to use anyway. Also updates some of the strings for accuracy and fixes up the glade file a bit. -jlk

2 3

[master] Patches for bugs causing firstboot crashes
by Vratislav Podzimek 23 Aug '12

23 Aug '12

Anaconda patch fixes the bug when firstboot crashes while trying to read /etc/sysconfig/i18n file. I want to remove the whole language.py module, but for now, let's use this quick simple patch to make firstboot work. Firstboot patch makes firstboot use python-meh's text UI instead of the graphical one that was causing crash by importing Gtk3. -- 1.7.11.2

2 9

Couple patches for passwd spoke in text mode
by Jesse Keating 23 Aug '12

23 Aug '12

These go on master, tested with run-text-spoke. -jlk

4 8

[PATCH] Fix traceback when /etc/sysconfig/i18n doesn't exist (#849967)
by Vratislav Podzimek 23 Aug '12

23 Aug '12

--- firstboot/frontend.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/firstboot/frontend.py b/firstboot/frontend.py index 2735303..04245e0 100644 --- a/firstboot/frontend.py +++ b/firstboot/frontend.py @@ -42,11 +42,14 @@ class Frontend: self.wm_pid = None def set_lang(self): - i18n = shlex.split(open(I18N).read()) - i18n = dict(item.split('=') for item in i18n) - if 'LANG' in i18n: - log.info('setting LANG to %s', i18n['LANG']) - os.environ['LANG'] = i18n['LANG'] + try: + i18n = shlex.split(open(I18N).read()) + i18n = dict(item.split('=') for item in i18n) + if 'LANG' in i18n: + log.info('setting LANG to %s', i18n['LANG']) + os.environ['LANG'] = i18n['LANG'] + except: + os.environ.setdefault("LANG", "en_US.UTF-8") def startx(self): def sigusr1_handler(num, frame): -- 1.7.11.4

2 1

First attempt at a graphical root pw spoke
by Jesse Keating 23 Aug '12

23 Aug '12

The root password spoke is optional, and defaults to a locked account. But if a user does enter the spoke and tries to set a password (doesn't just leave the boxes blank) the password will be validated and the spoke will become incomplete if the password doesn't validate. The user will have to enter the spoke again to find out why it didn't validate. This borrows code from the old pyanaconda/iw/account_gui.py, and tries to re-use as many strings as possible. I think there are only one or two new strings here. Comments and commit comments try to explain what's going on with the code. I've tested it with run-spoke and run-hub and it seems to get the right data in place, which might be enough for F18 alpha. -jlk

2 4

[PATCH] Put traceback reports on a diet.
by Chris Lumens 23 Aug '12

23 Aug '12

This updates what attributes get written out to the traceback file for the newui. In particular, it avoids writing out all the yum stuff that makes the traceback file grow over 2 MB and take nearly a minute to pickle. It's entirely possible this is either skipping too much or writing out too much still, but we can work on that over time. --- pyanaconda/exception.py | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 70deed5..2ac513b 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -146,28 +146,13 @@ def initExceptionHandling(anaconda): conf = Config(programName="anaconda", programVersion=isys.getAnacondaVersion(), - attrSkipList=[ "backend.ayum", - "backend.dlpkgs", - "accounts", - "bootloader.password", - "comps", - "hdList", - "ksdata", - "instLanguage.font", - "instLanguage.kbd", - "instLanguage.info", - "instLanguage.localeInfo", - "instLanguage.nativeLangNames", - "instLanguage.tz", - "keyboard._mods._modelDict", - "keyboard.modelDict", - "storage.encryptionPassphrase", - "users.rootPassword", - "tmpData", - "intf.icw.buff", - "intf.icw.currentWindow.storage.encryptionPassphrase", - "intf.icw.stockButtons", - ], + attrSkipList=["_intf._actions", + "_intf.storage.bootloader.password", + "_intf.storage.data", + "_bootloader.encrypted_password", + "_bootloader.password", + "payload._groups", + "payload._yum"], localSkipList=[ "passphrase", "password" ], fileList=fileList) handler = AnacondaExceptionHandler(conf, anaconda.intf, ReverseExceptionDump) -- 1.7.11.2

2 1

[PATCH 2/3] parse-kickstart: simplify logging
by Will Woods 23 Aug '12

23 Aug '12

Systemd handles the tricky bits of logging for us now. Yay! --- dracut/parse-kickstart | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 851cecb..a9da517 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -169,31 +169,12 @@ class DracutHandler(handlerclass): self.output.append(command.dracut_args(args, lineno, obj)) return obj -# set up logging -class KmsgFormatter(logging.Formatter): - '''Formats log output for /dev/kmsg like dracut does.''' - def format(self, record): - if record.levelno <= logging.INFO: tag = "<30>" - elif record.levelno <= logging.WARNING: tag = "<28>" - else: tag = "<24>" - return tag + logging.Formatter.format(self, record) -def init_logger(level=logging.WARNING): - if 'rd.debug' in proc_cmdline: +def init_logger(level=None): + if level is None and 'rd.debug' in proc_cmdline: level = logging.DEBUG - elif 'rd.info' in proc_cmdline: - level = logging.INFO logfmt = "%(name)s %(levelname)s: %(message)s" - stderr = logging.StreamHandler() - stderr.setFormatter(logging.Formatter(logfmt)) + logging.basicConfig(format=logfmt, level=level) logger = logging.getLogger('parse-kickstart') - logger.setLevel(level) - logger.addHandler(stderr) - try: - kmsg = logging.FileHandler("/dev/kmsg", "w") - kmsg.setFormatter(KmsgFormatter(logfmt)) - logger.addHandler(kmsg) - except IOError: - pass return logger def is_mac(addr): -- 1.7.11.4

2 1

[PATCH 3/3] remove dead code (setMethodstr, expandFTPMethod)
by Will Woods 23 Aug '12

23 Aug '12

Nothing uses a method/repo of 'cdrom://<dev>:<path>' anymore, and nothing passes a method like '@/tmp/filename', so this code is all useless. --- anaconda | 24 +----------------------- pyanaconda/__init__.py | 15 --------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/anaconda b/anaconda index 88f4fa9..f86cdf4 100755 --- a/anaconda +++ b/anaconda @@ -321,20 +321,6 @@ def setupLoggingFromOpts(opts): if opts.syslog: anaconda_log.logger.remote_syslog = opts.syslog -# ftp installs pass the password via a file in /tmp so -# ps doesn't show it -def expandFTPMethod(str): - ret = None - - try: - filename = str[1:] - ret = open(filename, "r").readline() - ret = ret[:len(ret) - 1] - os.unlink(filename) - return ret - except: - return None - def gtk_warning(title, reason): import gtk dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, @@ -748,17 +734,9 @@ if __name__ == "__main__": anaconda.updateSrc = opts.updateSrc if opts.method: - if opts.method[0] == '@': - opts.method = expandFTPMethod(opts.method) - - anaconda.setMethodstr(opts.method) - else: - anaconda.methodstr = None + anaconda.methodstr = opts.method if opts.stage2: - if opts.stage2[0] == '@': - opts.stage2 = expandFTPMethod(opts.stage2) - anaconda.stage2 = opts.stage2 if opts.noverifyssl: diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py index 5f2ccbe..4c39841 100644 --- a/pyanaconda/__init__.py +++ b/pyanaconda/__init__.py @@ -237,21 +237,6 @@ class Anaconda(object): f.write('Section "Device"\n\tIdentifier "Videocard0"\n\tDriver "%s"\nEndSection\n' % self.xdriver) f.close() - def setMethodstr(self, methodstr): - if methodstr.startswith("cdrom://"): - (device, tree) = string.split(methodstr[8:], ":", 1) - - if not tree.startswith("/"): - tree = "/%s" %(tree,) - - if device.startswith("/dev/"): - device = device[5:] - - self.mediaDevice = device - self.methodstr = "cdrom://%s" % tree - else: - self.methodstr = methodstr - def write(self): import network self.writeXdriver() -- 1.7.11.4

2 1

[PATCH 1/3] ksnet_to_dracut(): handle --mtu, cleanups
by Will Woods 22 Aug '12

22 Aug '12

Make parse-kickstart handle 'network --mtu=...' properly (now that dracut supports it). Also generally clean up the handling of the "ip=" arg and correctly handle missing data for static ipv4. --- dracut/parse-kickstart | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 55bc43a..851cecb 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -208,54 +208,54 @@ def find_devname(mac): def ksnet_to_dracut(args, lineno, net, bootdev=False): '''Translate the kickstart network data into dracut network data.''' line = [] - ip="" if is_mac(net.device): # this is a MAC - find the interface name mac = net.device net.device = find_devname(mac) - if net.device is None: # iface not active - pick a name for it + if not net.device: # iface not active - pick a name for it net.device = "ksdev0" # we only get called once, so this is OK line.append("ifname=%s:%s" % (net.device, mac.lower())) # NOTE: dracut currently only does ipv4 *or* ipv6, so only one ip=arg.. + ip = "" + if not net.device: + net.device = "" + net.autoconf = "dhcp" # dracut's default if net.bootProto in (BOOTPROTO_DHCP, BOOTPROTO_BOOTP): - ip="dhcp" + net.autoconf = "dhcp" elif net.bootProto == BOOTPROTO_IBFT: - ip="ibft" + net.autoconf = "ibft" elif net.bootProto == BOOTPROTO_QUERY: log.error("'%s': --bootproto=query is deprecated", " ".join(args)) elif net.bootProto == BOOTPROTO_STATIC: + net.autoconf = "none" + ip = net.ip req = ("gateway", "netmask", "nameserver", "ip") - missing = ", ".join("--%s" % i for i in req if not hasattr(net, i)) + missing = ", ".join("--%s" % i for i in req if not getattr(net, i, "")) if missing: log.warn("line %u: network missing %s", lineno, missing) - else: - ip="{0.ip}::{0.gateway}:{0.netmask}:" \ - "{0.hostname}:{0.device}:none".format(net) elif net.ipv6 == "auto": - ip="auto6" + net.autoconf = "auto6" elif net.ipv6 == "dhcp": - ip="dhcp6" + net.autoconf = "dhcp6" elif net.ipv6: - ip="[{0.ipv6}]::{0.gateway}:{0.netmask}:" \ - "{0.hostname}:{0.device}:none".format(net) - - if net.device and not ip.endswith(":none"): - line.append("ip=%s:%s" % (net.device, ip)) + net.autoconf = "none" + ip = "[%s]" % net.ipv6 + + # These argument forms are documented in dracut.kernel(7) + if net.autoconf == "none" or (net.mtu and not net.device): + ipstr = "ip={ip}::{net.gateway}:{net.netmask}:{net.hostname}:{net.device}:{net.autoconf}:{net.mtu}".format(ip=ip, net=net) + elif net.device: + ipstr = "ip={net.device}:{net.autoconf}:{net.mtu}".format(net=net) else: - line.append("ip=%s" % ip) + ipstr = "ip={net.autoconf}".format(net=net) + + line.append(ipstr) for ns in net.nameserver.split(","): if ns: line.append("nameserver=%s" % ns) - if net.mtu: - # XXX FIXME: dracut doesn't support mtu= (yet) - if net.device: - line.append("mtu=%s:%s" % (net.device, net.mtu)) - else: - line.append("mtu=%s" % net.mtu) - # TODO: nodefroute, noipv[46], nodns: pass along to 'ifcfg' module somehow # TODO FIXME dhcpclass: dracut only uses one dhclient.conf for all ifaces # so we can't (yet) have per-interface dhcpclass -- 1.7.11.4

1 0

[PATCH 1/2] Don't require hfs-tools on RHEL (#849987).
by Chris Lumens 22 Aug '12

22 Aug '12

--- anaconda.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anaconda.spec.in b/anaconda.spec.in index 2c4a328..98bb73a 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -143,7 +143,9 @@ Requires: zenity %endif Requires: createrepo >= %{createrepover} Requires: squashfs-tools +%if ! 0%{?rhel} Requires: hfsplus-tools +%endif Requires: genisoimage >= %{genisoimagever} Requires: GConf2 >= %{gconfversion} %ifarch %{ix86} x86_64 -- 1.7.11.2

2 2

[PATCH] Add yum-plugin-fastestmirror (#849797)
by Brian C. Lane 22 Aug '12

22 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/runtime-install.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 868ac37..651871c 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -123,5 +123,8 @@ installpkg wget rsync rsh bind-utils ftp mtr vconfig installpkg icfg spice-vdagent installpkg gdisk +## yum plugins +yum-plugin-fastestmirror + ## actually install all the requested packages run_pkg_transaction -- 1.7.11.4

2 1

[master] Port rhel6-branch patches for swap --hibernation on LVM
by Vratislav Podzimek 22 Aug '12

22 Aug '12

I have already accidentaly pushed the pykickstart part (instead of pushing rhel6-branch). I hope it's okay. -- 1.7.11.2

2 3

[master] Rebased patches removing scdate usage
by Vratislav Podzimek 22 Aug '12

22 Aug '12

I have finally rebased the not pushed patches removing scdate usage and anaconda.timezone object by replacing it with our timezone.py module. Since there were lot of conflicts and I had to add one additional change (TUI code), I'm sending these for a re-review. Vratislav Podzimek (2): Remove the last usage of the system-config-date in Anaconda Use ksdata.timezone and timezone module instead of anaconda.timezone anaconda | 2 +- pyanaconda/__init__.py | 11 -- pyanaconda/install.py | 1 + pyanaconda/kickstart.py | 12 +- pyanaconda/localization.py | 35 ----- pyanaconda/packages.py | 6 +- pyanaconda/timezone.py | 200 +++++++++++++++++++++-------- pyanaconda/ui/gui/spokes/datetime_spoke.py | 4 +- pyanaconda/ui/gui/spokes/welcome.py | 4 +- pyanaconda/ui/tui/spokes/time.py | 4 +- 10 files changed, 158 insertions(+), 121 deletions(-) -- 1.7.11.2

2 5

[PATCH] integer out of range for L format code
by Mark Hamzy 22 Aug '12

22 Aug '12

http://docs.python.org/library/ctypes.html#specifying-the-required-argument… and http://docs.python.org/library/ctypes.html#return-types need to be followed for the call to nm_utils.nm_utils_ip4_prefix_to_netmask. --- pyanaconda/ui/gui/spokes/network.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index e0f3792..329be82 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -619,6 +619,8 @@ class NetworkControlBox(): self._set_device_info_value(dt, "route", gateway) if dt == "wired": prefix = ipv4cfg.get_addresses()[0].get_prefix() + nm_utils.nm_utils_ip4_prefix_to_netmask.argtypes = [ctypes.c_uint32] + nm_utils.nm_utils_ip4_prefix_to_netmask.restype = ctypes.c_uint32 netmask = nm_utils.nm_utils_ip4_prefix_to_netmask(prefix) netmask = socket.inet_ntoa(struct.pack('=L', netmask)) self._set_device_info_value(dt, "subnet", netmask) -- 1.7.10.4

2 1

[PATCH] Don't rely on selection staying selected when doing crazy things to it
by Vratislav Podzimek 22 Aug '12

22 Aug '12

LanguageSpoke inherits from the LanguageMixIn which is also used by the WelcomeLanguageSpoke and contains the treeview with available languages and the selection object. Obviously the selection doesn't stay selected when WelcomeLanguageSpoke is hidden. So in LanguageMixIn.initialize -- if there is nothing selected, try to use self.data.lang.lang value first and if it is None, fallback to prefered_language (English). Fixes the issue with no translations and default language selected on the SummaryHub before going to LanguageSpoke and back. --- pyanaconda/ui/gui/spokes/welcome.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index dc4c733..7982e23 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -106,7 +106,9 @@ class LanguageMixIn(object): # select the preferred translation if there wasn't any (store, itr) = self._selection.get_selected() if not itr: - self._selectLanguage(store, self.language.preferred_translation.short_name) + lang = self.data.lang.lang or \ + self.language.preferred_translation.short_name + self._selectLanguage(store, lang) def retranslate(self): -- 1.7.11.2

2 1

[master] New icon for the DatetimeSpoke
by Vratislav Podzimek 22 Aug '12

22 Aug '12

The system-date-time icon we used for the the DatetimeSpoke no longer exists in the package with scalable icons. There is the system-time [1] icon instead. [1] http://vpodzime.fedorapeople.org/preferences-system-time-symbolic.png Vratislav Podzimek (1): Replace nonexisting icon with an existing one (DatetimeSpoke) pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.11.2

2 2

[rhel6-branch] Fixes for LVM --onpart and swap --hibernation options
by Vratislav Podzimek 22 Aug '12

22 Aug '12

Two patches resolving RHEL 6.4 bugs. PATCH 2/2 has a related patch for pykickstart. Vratislav Podzimek (2): Try to use both udev_resolve_devspec(pv) and pv as device name Add support for swap --hibernation on LVM iutil.py | 6 +++--- kickstart.py | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) -- 1.7.11.2

3 6

[PATCH] use F18_PartData for hibernation flag support.
by Brian C. Lane 22 Aug '12

22 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/kickstart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index f48f292..2544fdf 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -852,7 +852,7 @@ class Partition(commands.partition.F17_Partition): if self.partitions: doPartitioning(storage) -class PartitionData(commands.partition.F17_PartData): +class PartitionData(commands.partition.F18_PartData): def execute(self, storage, ksdata, instClass): devicetree = storage.devicetree kwargs = {} -- 1.7.11.2

3 2

[PATCH] imgutils: fix umount retry handling
by Brian C. Lane 21 Aug '12

21 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> When umount fails it doesn't throw an error, so retry when the rv is non-zero instead. --- src/pylorax/imgutils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py index 8da4b8c..6a6c40f 100644 --- a/src/pylorax/imgutils.py +++ b/src/pylorax/imgutils.py @@ -128,7 +128,12 @@ def umount(mnt, lazy=False, maxretry=3, retrysleep=1.0): while maxretry > 0: try: rv = execWithRedirect(umount[0], umount[1:]) - except CalledProcessError: + except Exception: + # execWithRedirect will log what the errors was, so we can just + # ignore it and retry. + pass + + if rv != 0: count += 1 if count == maxretry: raise -- 1.7.11.2

3 3

[PATCH] dracut: remove workarounds for broken splitsep()
by Will Woods 21 Aug '12

21 Aug '12

the splitsep function was buggy before, but it was fixed in dracut 019 so we don't need these workarounds anymore. See upstream dracut commit f7cadaa843498c4b986f8a030fab39002ad108b6. Related: 844c0c156ed2f27920257d86690f3017727f398e Related: 700e985082b03abcbd3009de81885b8fbf72818b --- dracut/anaconda-netroot.sh | 3 +-- dracut/parse-anaconda-repo.sh | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 3ab873a..0425661 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -8,8 +8,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh netif="$1" # get repo info -# splitsep ":" "$root" prefix repo # FIXME: doesn't work as documented! -prefix=${root%%:*}; repo=${root#*:} +splitsep ":" "$root" prefix repo # no repo? non-net root? we're not needed here. [ "$prefix" = "anaconda-net" ] && [ -n "$repo" ] || return 0 diff --git a/dracut/parse-anaconda-repo.sh b/dracut/parse-anaconda-repo.sh index 59bf7b5..96de458 100755 --- a/dracut/parse-anaconda-repo.sh +++ b/dracut/parse-anaconda-repo.sh @@ -12,9 +12,7 @@ arg="repo" [ -n "$stage2" ] && arg="stage2" && repo="$stage2" if [ -n "$repo" ]; then - #splitsep ":" "$repo" repotype rest # FIXME: splitsep is buggy - repotype=${repo%%:*} - rest=${repo#$repotype:}; [ "$rest" = "$repo" ] && rest="" + splitsep ":" "$repo" repotype rest case "$repotype" in http|https|ftp|nfs|nfs4|nfsiso) set_neednet; root="anaconda-net:$repo" ;; -- 1.7.11.4

2 1

[PATCH] dracut: update Requires: in spec
by Will Woods 21 Aug '12

21 Aug '12

We updated the anaconda dracut module to work with "newer" dracut; all the features/changes that would actually cause compatibility problems are present in dracut 019 and later. (The systemd changes are in dracut 020 but existing anaconda-dracut code is still backward-compatible with 019) --- anaconda.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 2c4a328..588564c 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -199,7 +199,7 @@ documentation for working with this library. %package dracut Summary: The anaconda dracut module BuildArch: noarch -Requires: dracut >= 16 +Requires: dracut >= 19 Requires: dracut-network Requires: xz Requires: pykickstart -- 1.7.11.4

2 1

[PATCH] fix Gtk import in software.py
by Brian C. Lane 21 Aug '12

21 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- pyanaconda/ui/gui/spokes/software.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index d9080e1..3aecad4 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -184,8 +184,6 @@ class SoftwareSelectionSpoke(NormalSpoke): self.apply() def refresh(self): - from gi.repository import Gtk - from pyanaconda.threads import threadMgr NormalSpoke.refresh(self) @@ -207,6 +205,8 @@ class SoftwareSelectionSpoke(NormalSpoke): self.refreshAddons() def refreshAddons(self): + from gi.repository import Gtk + self._addonStore = self.builder.get_object("addonStore") self._addonStore.clear() if self.environment: -- 1.7.11.2

2 1

[PATCH master] Network spoke: use chr() instead of str() to convert dbus.Byte (#849395)
by Radek Vykydal 21 Aug '12

21 Aug '12

--- pyanaconda/ui/gui/spokes/network.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 9142ad0..d254bf8 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -636,7 +636,7 @@ class NetworkControlBox(): config = dbus.SystemBus().get_object(NM_SERVICE, ipv6cfg.get_path()) addr, prefix, gw = getNMObjProperty(config, ".IP6Config", "Addresses")[0] - ipv6_addr = socket.inet_ntop(socket.AF_INET6, "".join(str(byte) for byte in addr)) + ipv6_addr = socket.inet_ntop(socket.AF_INET6, "".join(chr(byte) for byte in addr)) self._set_device_info_value(dt, "ipv6", ipv6_addr) if ipv4cfg and ipv6_addr: -- 1.7.4

2 1

[PATCH 1/2] livemedia-creator: add location option
by Brian C. Lane 21 Aug '12

21 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --location specifies an iso directory tree to be used by virt-install instead of the iso. This allows you to update the initrd in the tree for debugging. virt-install uses the images/pxeboot/ directory for initrd.img and vmlinux. An iso is still required for the LiveOS/squashfs.img stage2 file. --- src/sbin/livemedia-creator | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index e781b8e..9344636 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -170,15 +170,27 @@ class IsoMountpoint(object): vmlinuz and initrd.img files exist Check the iso for a LiveOS directory and set a flag. Extract the iso's label. + + initrd_path can be used to point to a boot.iso tree with a newer + initrd.img than the iso has. The iso is still used for stage2. """ - def __init__( self, iso_path ): + def __init__( self, iso_path, initrd_path=None ): + """ iso_path is the path to a boot.iso + initrd_path overrides mounting the iso for access to + initrd and vmlinuz. + """ self.label = None self.iso_path = iso_path - self.mount_dir = tempfile.mkdtemp() - if not self.mount_dir: - raise Exception("Error creating temporary directory") + self.initrd_path = initrd_path - execWithRedirect("mount", ["-o", "loop", self.iso_path, self.mount_dir]) + if not self.initrd_path: + self.mount_dir = tempfile.mkdtemp() + if not self.mount_dir: + raise Exception("Error creating temporary directory") + + execWithRedirect("mount", ["-o", "loop", self.iso_path, self.mount_dir]) + else: + self.mount_dir = self.initrd_path self.kernel = self.mount_dir+"/isolinux/vmlinuz" self.initrd = self.mount_dir+"/isolinux/initrd.img" @@ -200,8 +212,9 @@ class IsoMountpoint(object): self.get_iso_label() def umount( self ): - execWithRedirect("umount", [self.mount_dir]) - os.rmdir( self.mount_dir ) + if not self.initrd_path: + execWithRedirect("umount", [self.mount_dir]) + os.rmdir( self.mount_dir ) def get_iso_label( self ): """ @@ -580,6 +593,10 @@ if __name__ == '__main__': parser.add_argument( "--armplatform", help="the platform to use when creating images for ARM, " "i.e., highbank, mvebu, omap, tegra, etc." ) + parser.add_argument( "--location", default=None, type=os.path.abspath, + help="location of iso directory tree with initrd.img " + "and vmlinuz. Used to run virt-install with a " + "newer initrd than the iso." ) parser.add_argument( "--logfile", default="./livemedia.log", type=os.path.abspath, @@ -771,7 +788,7 @@ if __name__ == '__main__': loop_detach(get_loop_name(disk_img)) else: - iso_mount = IsoMountpoint( opts.iso ) + iso_mount = IsoMountpoint( opts.iso, opts.location ) log_monitor = LogMonitor( install_log ) kernel_args = "" -- 1.7.11.2

2 2

[PATCH] Use chvt command for tty switching
by Vratislav Podzimek 21 Aug '12

21 Aug '12

isys.vtActivate is problematic when using tmux, chvt command works well and we use it so rarely that it should be okay to call an external command. --- anaconda | 2 +- anaconda.spec.in | 1 + pyanaconda/exception.py | 12 ++++-------- pyanaconda/isys/__init__.py | 5 ----- pyanaconda/isys/isys.c | 15 --------------- pyanaconda/iutil.py | 22 ++++++++++++++++++++++ 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/anaconda b/anaconda index a6bb720..8e67ec5 100755 --- a/anaconda +++ b/anaconda @@ -44,7 +44,7 @@ def exitHandler(rebootData, storage, exitCode=None): anaconda.intf.shutdown() if "nokill" in flags.cmdline: - isys.vtActivate(1) + iutil.vtActivate(1) print "anaconda halting due to nokill flag." print "The system will be rebooted when you press Ctrl-Alt-Delete." while True: diff --git a/anaconda.spec.in b/anaconda.spec.in index 1cc1c41..72a1051 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -161,6 +161,7 @@ Requires: dhclient Requires: anaconda-yum-plugins Requires: libselinux-python >= %{libselinuxver} Requires: fcoe-utils >= %{fcoeutilsver} +Requires: kbd %ifarch %{sparc} Requires: elftoaout piggyback %endif diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 70deed5..b18f228 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -23,6 +23,7 @@ from meh.handler import * from meh.dump import * import isys +import iutil import sys import os import shutil @@ -94,10 +95,7 @@ class AnacondaExceptionHandler(ExceptionHandler): def runDebug(self, (ty, value, tb)): # vtActivate does not work on certain ppc64 machines, so just skip # that and continue with the rest of the debugger setup. - try: - isys.vtActivate(1) - except SystemError: - pass + iutil.vtActivate(1) pidfl = "/tmp/vncshell.pid" if os.path.exists(pidfl) and os.path.isfile(pidfl): @@ -126,10 +124,8 @@ class AnacondaExceptionHandler(ExceptionHandler): "the main window") import pdb pdb.post_mortem (tb) - try: - isys.vtActivate(6) - except SystemError: - pass + + iutil.vtActivate(6) def initExceptionHandling(anaconda): fileList = [ "/tmp/anaconda.log", diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py index 63edbf6..8195f0d 100755 --- a/pyanaconda/isys/__init__.py +++ b/pyanaconda/isys/__init__.py @@ -265,11 +265,6 @@ def driveUsesModule(device, modules): pass return rc -def vtActivate (num): - if iutil.isS390(): - return - _isys.vtActivate (num) - def isPseudoTTY (fd): return _isys.isPseudoTTY (fd) diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c index 9b9046a..82dc404 100644 --- a/pyanaconda/isys/isys.c +++ b/pyanaconda/isys/isys.c @@ -125,7 +125,6 @@ static PyMethodDef isysModuleMethods[] = { { "resetresolv", (PyCFunction) doResetResolv, METH_VARARGS, NULL }, { "swapon", (PyCFunction) doSwapon, METH_VARARGS, NULL }, { "swapoff", (PyCFunction) doSwapoff, METH_VARARGS, NULL }, - { "vtActivate", (PyCFunction) doVtActivate, METH_VARARGS, NULL}, { "isPseudoTTY", (PyCFunction) doisPseudoTTY, METH_VARARGS, NULL}, { "isVioConsole", (PyCFunction) doisVioConsole, METH_NOARGS, NULL}, { "sync", (PyCFunction) doSync, METH_VARARGS, NULL}, @@ -444,20 +443,6 @@ static PyObject * doEjectCdrom(PyObject * s, PyObject * args) { return Py_None; } -static PyObject * doVtActivate(PyObject * s, PyObject * args) { - int vtnum; - - if (!PyArg_ParseTuple(args, "i", &vtnum)) return NULL; - - if (ioctl(0, VT_ACTIVATE, vtnum)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - Py_INCREF(Py_None); - return Py_None; -} - static PyObject * doisPseudoTTY(PyObject * s, PyObject * args) { int fd; struct stat sb; diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index fd0b985..f232309 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -1074,6 +1074,28 @@ def get_option_value(opt_name, options): if name == opt_name: return val.strip() +def vtActivate(num): + """ + Try to switch to tty number $num. + + @type num: int + @return: whether the switch was successful or not + @rtype: bool + + """ + + try: + ret = execWithRedirect("chvt", [num], stdout="/dev/tty5", + stderr="/dev/tty5") + except OSError as oserr: + ret = -1 + log.error("Failed to run chvt: %s", oserr.strerror) + + if ret != 0: + log.error("Failed to switch tty to tty%d", num) + + return ret == 0 + class ProxyStringError(Exception): pass -- 1.7.11.2

2 2

[PATCH] parse-anaconda-net: Add missing semicolon for dhclient.conf
by Brian C. Lane 20 Aug '12

20 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- dracut/parse-anaconda-net.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/parse-anaconda-net.sh b/dracut/parse-anaconda-net.sh index 683a009..411b1f5 100755 --- a/dracut/parse-anaconda-net.sh +++ b/dracut/parse-anaconda-net.sh @@ -51,6 +51,6 @@ fi # set dhcp vendor class dhcpclass=$(getarg inst.dhcpclass) || dhcpclass="anaconda-$(uname -srm)" -echo "send vendor-class-identifier \"$dhcpclass\"" >> /etc/dhclient.conf +echo "send vendor-class-identifier \"$dhcpclass\";" >> /etc/dhclient.conf unset CMDLINE -- 1.7.11.2

2 1

[PATCH] anaconda-modprobe: fix .ko removal
by Brian C. Lane 20 Aug '12

20 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- dracut/anaconda-modprobe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/anaconda-modprobe.sh b/dracut/anaconda-modprobe.sh index 6a6b20d..f8ac2ca 100644 --- a/dracut/anaconda-modprobe.sh +++ b/dracut/anaconda-modprobe.sh @@ -14,7 +14,7 @@ for m in $SCSI_MODULES/*.ko; do # Shell spew to work around not having basename # Trim the paths off the prefix, then the . suffix a="${m##*/}" - MODULE_LIST+=" ${a%*.}" + MODULE_LIST+=" ${a%.*}" done if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then -- 1.7.11.2

2 1

[PATCH] dracut: fix rd.neednet use in parse-kickstart (#849672)
by Will Woods 20 Aug '12

20 Aug '12

rd.neednet is no longer in use by dracut. This is how you tell dracut "definitely bring up the network interfaces, dammit" now. Related: 861d6e3fc9d9cd3f719f7e2dbbff31244dc80142 --- dracut/parse-kickstart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index daa87cc..55bc43a 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -263,7 +263,8 @@ def ksnet_to_dracut(args, lineno, net, bootdev=False): if bootdev: if net.device: line.append("bootdev=%s" % net.device) - line.append("rd.neednet=1") + # touch /tmp/net.ifaces to make sure dracut brings up network + open("/tmp/net.ifaces", "a") if net.essid or net.wepkey or net.wpakey: # TODO: make dracut support wireless? (do we care?) -- 1.7.11.2

2 1

[PATCH] Only devices that already exist may be ISO install sources (#849482).
by Chris Lumens 20 Aug '12

20 Aug '12

--- pyanaconda/image.py | 2 +- pyanaconda/ui/gui/spokes/source.py | 45 ++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index 009e38a..0bc5c99 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -203,7 +203,7 @@ def opticalInstallMedia(devicetree, mountpoint=INSTALL_TREE): # Return a list of Device instances that may have HDISO install media # somewhere. Candidate devices are simply any that we can mount. def potentialHdisoSources(devicetree): - return filter(lambda d: d.format.mountable, devicetree.getDevicesByType("partition")) + return filter(lambda d: d.exists and d.format.mountable, devicetree.getDevicesByType("partition")) def umountImage(tree): if os.path.ismount(tree): diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index fd40b5c..b9f544c 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -641,27 +641,6 @@ class SourceSpoke(NormalSpoke): self._autodetectBox.set_no_show_all(False) self._autodetectButton.set_no_show_all(False) - # Find all hard drive partitions that could hold an ISO and add each - # to the diskStore. - store = self.builder.get_object("partitionStore") - - added = False - active = 0 - idx = 0 - for dev in potentialHdisoSources(self.storage.devicetree): - store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))]) - if dev.name == self.data.method.partition: - active = idx - added = True - idx += 1 - - # Again, only display these widgets if an HDISO source was found. - if added: - self._isoBox.set_no_show_all(False) - self._isoButton.set_no_show_all(False) - combo = self.builder.get_object("isoPartitionCombo") - combo.set_active(active) - # Add the mirror manager URL in as the default for HTTP and HTTPS. # We'll override this later in the refresh() method, if they've already # provided a URL. @@ -673,6 +652,30 @@ class SourceSpoke(NormalSpoke): def refresh(self): NormalSpoke.refresh(self) + # Find all hard drive partitions that could hold an ISO and add each + # to the partitionStore. This has to be done here because if the user + # has done partitioning first, they may have blown away partitions + # found during _initialize on the partitioning spoke. + store = self.builder.get_object("partitionStore") + store.clear() + + added = False + active = 0 + idx = 0 + for dev in potentialHdisoSources(self.storage.devicetree): + store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))]) + if dev.name == self.data.method.partition: + active = idx + added = True + idx += 1 + + # Again, only display these widgets if an HDISO source was found. + if added: + self._isoBox.set_no_show_all(False) + self._isoButton.set_no_show_all(False) + combo = self.builder.get_object("isoPartitionCombo") + combo.set_active(active) + # We default to the mirror list, and then if the method tells us # something different later, we can change it. self._protocolComboBox.set_active(0) -- 1.7.11.2

2 1

[PATCH rhel5-branch] Add support for hyperv (VM_BUS) (#824880)
by Radek Vykydal 20 Aug '12

20 Aug '12

Related: rhbz#824880 --- loader2/hardware.c | 7 ++++++- loader2/hardware.h | 2 ++ loader2/loader.c | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/loader2/hardware.c b/loader2/hardware.c index 4639ecd..cb83df9 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -105,7 +105,7 @@ static int detectHardware(moduleInfoSet modInfo, char *** modules) { BUS_PCI | BUS_SBUS | BUS_VIO | BUS_MACIO | /* Waiting on kudzu to define BUS_EBUS */ /* BUS_PCMCIA | BUS_XEN | BUS_VIRTIO | BUS_EBUS, */ - BUS_PCMCIA | BUS_XEN | BUS_VIRTIO, + BUS_PCMCIA | BUS_XEN | BUS_VIRTIO | BUS_VMBUS, PROBE_ALL); logMessage(DEBUGLVL, "finished bus probing"); @@ -308,6 +308,11 @@ void ipv6Setup(moduleList modLoaded, moduleDeps modDeps, mlLoadModule("ipv6", modLoaded, modDeps, modInfo, NULL); } +void hypervBusSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo) +{ + mlLoadModule("hv_vmbus", modLoaded, modDeps, modInfo, NULL); +} void scsiSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo) { diff --git a/loader2/hardware.h b/loader2/hardware.h index 206d7b3..19fc3e6 100644 --- a/loader2/hardware.h +++ b/loader2/hardware.h @@ -21,6 +21,8 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); void infinibandSetup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); +void hypervBusSetup(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo); void ipv6Setup(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo); void spufsSetup(moduleList modLoaded, moduleDeps modDeps, diff --git a/loader2/loader.c b/loader2/loader.c index 53a2201..23bfe09 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1617,6 +1617,7 @@ int main(int argc, char ** argv) { dasdSetup(modLoaded, modDeps, modInfo); spufsSetup(modLoaded, modDeps, modInfo); infinibandSetup(modLoaded, modDeps, modInfo); + hypervBusSetup(modLoaded, modDeps, modInfo); /* Note we *always* do this. If you could avoid this you could get a system w/o USB keyboard support, which would be bad. */ -- 1.7.5.1

2 1

More custom partitioning patches
by David Lehman 20 Aug '12

20 Aug '12

These are all little things, largely to do with btrfs.

2 10

[python-meh] Patches for F18 TC issues
by Vratislav Podzimek 20 Aug '12

20 Aug '12

PATCH 1/3 fixes a bug in the spec file that was probably never hit. PATCH 2/3 fixes the exception appearing instead of the anaconda object dump in anaconda-tb files. PATCH 3/3 adds a property needed in Anaconda (patch follows) Vratislav Podzimek (3): Change require from rpm to rpm-python Don't try to dump objects without __dict__ Add main_window property to the MainExceptionWindow meh/dump.py | 3 ++- meh/ui/gui.py | 4 ++++ python-meh.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 1.7.11.2

2 6

[PATCH loarx/master] nm-connection-editor was moved to separate package (#849056)
by Radek Vykydal 20 Aug '12

20 Aug '12

It is missing in f18 alpha images. --- share/runtime-cleanup.tmpl | 4 ++-- share/runtime-install.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 9f34133..9f94b2f 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -128,8 +128,8 @@ removefrom GConf2 /usr/libexec/gconf-defaults-mechanism /usr/share/GConf/* removefrom GConf2 /usr/share/locale/* /usr/share/sgml/* removefrom NetworkManager /usr/share/NetworkManager/* removefrom NetworkManager /usr/share/locale/*/NetworkManager.mo -removefrom NetworkManager-gnome /etc/xdg/* /usr/bin/nm-applet /usr/${libdir}/* -removefrom NetworkManager-gnome /usr/share/applications/* +removefrom nm-connection-editor /usr/${libdir}/* +removefrom nm-connection-editor /usr/share/applications/* removefrom anaconda /etc/* /usr/share/applications/* /usr/share/icons/* removefrom at-spi /etc/xdg/* /usr/${libdir}/libcspi* removefrom at-spi /usr/${libdir}/libloginhelper* /usr/share/locale/* diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index acd65b1..868ac37 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -64,7 +64,7 @@ installpkg rsyslog installpkg xorg-x11-drivers xorg-x11-server-Xorg installpkg xorg-x11-server-utils xorg-x11-xauth installpkg dbus-x11 metacity gsettings-desktop-schemas -installpkg NetworkManager-gnome +installpkg nm-connection-editor installpkg at-spi at-spi2-atk pyatspi installpkg gnome-python2-gconf installpkg gobject-introspection -- 1.7.4

2 1

[PATCH] If dracut left the DVD mounted, don't try to remount it (#849152).
by Chris Lumens 20 Aug '12

20 Aug '12

Trying to remount was causing an exception which meant the DVD got thrown out as a possible installation source, so we were trying to use the network. --- pyanaconda/packaging/yumpayload.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 5720e4c..64f91e8 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -550,16 +550,24 @@ reposdir=%s url = method.url sslverify = not (method.noverifyssl or flags.noverifyssl) elif method.method == "cdrom" or not method.method: - # cdrom or no method specified -- check for media - device = opticalInstallMedia(storage.devicetree) + # Did dracut leave the DVD mounted for us? + device = get_mount_device("/run/install/repo") if device: - self._setUpMedia(device) - self.install_device = device - url = "file://" + INSTALL_TREE + self.install_device = storage.devicetree.getDeviceByPath(device) + url = "file:///run/install/repo" if not method.method: method.method = "cdrom" - elif method.method == "cdrom": - raise PayloadSetupError("no usable optical media found") + else: + # cdrom or no method specified -- check for media + device = opticalInstallMedia(storage.devicetree) + if device: + self._setUpMedia(device) + self.install_device = device + url = "file://" + INSTALL_TREE + if not method.method: + method.method = "cdrom" + elif method.method == "cdrom": + raise PayloadSetupError("no usable optical media found") if method.method: self._yum.preconf.releasever = self._getReleaseVersion(url) -- 1.7.11.2

2 1

10 small fixes for dracut changes
by Will Woods 17 Aug '12

17 Aug '12

This patchset cleans up a bunch of stuff relating to dracut changes since Fedora 17. A summary: #1 and #3 are mostly just refactoring. #4 and #7 drop code that got moved upstream. #2 is a temporary fix for BOOTIF+ip (PXE crashes). I'm trying to engage with upstream to get this fixed properly. #5 fixes set_neednet, since 'rd.neednet' was dropped upstream. This should fix problems like "the kickstart never gets fetched". #6 should fix a bunch of 'command not found' problems where we need to import anaconda-lib.sh again. These all stem from the change to systemd upstream, which means that hooks all run in separate shells. #7 (as mentioned above) removes code, but it also happens to fix old-style static network configuration (ip=<ip> gw=<gw> nm=<nm> etc.). Yay! #8 fixes missing '$netif' in anaconda-netroot and fetch-kickstart-net. Upstream started passing it as '$1' rather than in the environment. #9 just drops a now-unneeded hack for upgrades. Easy. #10 should fix some problems with 'ksdevice', since it turns out you can't use 'eth0' as your device name. At some point (post-Alpha) we should probable examine the device naming thing more closely and see if there's some way to let users actually specify "I want to use the device with the MAC <XXX>" without renaming the device itself. Anyway, here's the diffstat: dracut/anaconda-diskroot | 8 +------- dracut/anaconda-lib.sh | 25 +++-------------------- dracut/anaconda-modprobe.sh | 6 +++++- dracut/anaconda-netroot.sh | 3 +++ dracut/fetch-kickstart-net.sh | 3 +++ dracut/module-setup.sh | 2 +- dracut/parse-anaconda-net.sh | 18 ++--------------- dracut/parse-kickstart | 47 +++++++++++++++++++++++++++++++------------ dracut/repo-genrules.sh | 4 ++-- 9 files changed, 54 insertions(+), 62 deletions(-) Enjoy, -w

2 11

[PATCH] Make sure we have wait_for_kickstart (#847831)
by Jesse Keating 17 Aug '12

17 Aug '12

More dracut whack-a-mole --- dracut/kickstart-genrules.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dracut/kickstart-genrules.sh b/dracut/kickstart-genrules.sh index 880c553..d2b33a4 100755 --- a/dracut/kickstart-genrules.sh +++ b/dracut/kickstart-genrules.sh @@ -1,6 +1,9 @@ #!/bin/sh # generate udev rules for fetching kickstarts. +# see if we need anaconda-lib.sh +command -v wait_for_kickstart >/dev/null || . /lib/anaconda-lib.sh + case "${kickstart%%:*}" in http|https|ftp|nfs) # handled by fetch-kickstart-net in the online hook -- 1.7.11.2

2 1

initial support for editing devices in the custom spoke
by David Lehman 17 Aug '12

17 Aug '12

The vast majority of my testing was with partitions and lvm. RAID is completely untested and BTRFS is mostly untested. There's a SIGABRT coming from one of the btrfs commands used to create either the main volume or a subvolume, but I can't even reproduce it in the installer's shell on screen 2. Switching between partition and lvm for devices has worked well for me. Resizing of devices should work, but there's no way to assign a mountpoint to a preexisting device as of now so it won't do you much good. I've attempted to disable keyboard navigation of the custom spoke since it is broken.

2 15

[master] Fix mainExceptionWindow issues
by Vratislav Podzimek 17 Aug '12

17 Aug '12

PATCH 1/2 puts python-meh's mainExceptionWindow in a WindowGroup to fix the problem with insensitivity of the window if it appears above a spoke. This is a simple version of a patch that could (should?) be much bigger -- we should probably have all our Gtk.Windows (Gtk.Dialog resolves the problem itself) in one or more Gtk.WindowGroup(s). Because the same problem with insensitivity may emerge in the future with some other window running its own Gtk.main loop. PATCH 2/2 puts our lightbox below the python-meh's window. There is no simple way how to remove it then, but finishing python-meh means reboot so this doesn't matter. Vratislav Podzimek (2): Put mainExceptionWindow in a WindowGroup Enlightbox mainExceptionWindow pyanaconda/ui/gui/__init__.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 1.7.11.2

2 3

[PATCH] Remove linuxrc.s390, it's no longer used.
by Jesse Keating 17 Aug '12

17 Aug '12

Really this just boosts my line removal stats. --- data/Makefile.am | 5 - data/linuxrc.s390 | 3079 ----------------------------------------------------- 2 files changed, 3084 deletions(-) delete mode 100644 data/linuxrc.s390 diff --git a/data/Makefile.am b/data/Makefile.am index 18e165f..dfb4280 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -35,11 +35,6 @@ dist_lang_DATA = lang-table tmuxdir = $(datadir)/$(PACKAGE_NAME) dist_tmux_DATA = tmux.conf -if IS_S390 -shareddir = $(datadir)/$(PACKAGE_NAME) -dist_shared_SCRIPTS = linuxrc.s390 -endif - MAINTAINERCLEANFILES = Makefile.in lang-names: lang-table diff --git a/data/linuxrc.s390 b/data/linuxrc.s390 deleted file mode 100644 index 3280498..0000000 --- a/data/linuxrc.s390 +++ /dev/null @@ -1,3079 +0,0 @@ -#! /bin/bash - -# linuxrc.s390: init process of Red Hat's installer initrd for s390(x) -# Copyright (C) 2000-2004 by -# Bernhard Rosenkraenzer <bero(a)redhat.com> -# Oliver Paukstadt <opaukstadt(a)millenux.com> -# Karsten Hopp <karsten(a)redhat.de> -# Florian La Roche <laroche(a)redhat.com> -# Nils Philippsen <nils(a)redhat.de> -# Helge Deller <hdeller(a)redhat.de> -# David Sainty <dsainty(a)redhat.com> -# Copyright (C) IBM Corp. 2008,2009 -# Author: Steffen Maier <maier(a)de.ibm.com> -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -# prerequisites of this script to run inside the installer initrd: -# - udevadm and udevd need to be there -# - have /etc/udev/udev.conf with at least one comment line as content -# - if necessary, have udev rules -# - lsznet.raw and znetcontrolunits from s390utils-base in /lib/s390-tools -# - pack kernel modules and module-init-tools (no longer use busybox for that) -# - "multi on" in /etc/host.conf [RH bugs 486457,486461,483244] - -# TODOs: -# - make sure driver modules get loaded automatically -# - udev rule for lcs/ctcm vs. cu3088 - -# debug: set -x - -if [ "${0##*/}" = "reboot" ]; then - kill -USR2 1 - exit -elif [ "${0##*/}" = "halt" ]; then - kill -USR1 1 - exit -fi - -VERSION=1.2 - -export TEXTDOMAIN=s390installer -export TEXTDOMAINDIR=/usr/lib/locale - -# helper function to execute command in arguments and print command on stdout -function debug() { - # uncomment the following echo "$*" to enable debug output - #echo "$*" - $* -} - -# FIXME: maybe change to "$$" for production use, in case it wouldn't be init -declare -r INITPID="1" - -unset testing -[ "$$" != "$INITPID" ] && testing="1" -# uncomment the following test="1" to never execute sensitive commands -#testing="1" - -if [ "$RUNKS" = "0" ]; then - RUNKS="" -fi - -# ping command to use to test host availability (for gateway & dns servers) -PINGOPTS="-c 3 -w 30" -PING="ping $PINGOPTS" -PING6="ping6 $PINGOPTS" - -# helper function to disable commands while running outside the initrd -function tv() { - if [ -z "$testing" ]; then - $* - else - return 0 - fi -} - -function checkipv6() -{ - local ip=$1 - [ -z "$ip" ] && return 1 - /bin/ipcalc -c -6 "$ip" >/dev/null 2>&1 - return $? -} - -function checkipv4() -{ - local ip=$1 - [ -z "$ip" ] && return 1 - /bin/ipcalc -c -4 "$ip" >/dev/null 2>&1 - return $? -} - -function doshutdown() -{ - echo $"about to exec shutdown" - /sbin/umount -a -d -n >/dev/null 2>&1 - exec /sbin/shutdown - exit 0 -} - -function doreboot() -{ - if [ -e "/sys/firmware/reipl" ]; then - read REIPL_TYPE < /sys/firmware/reipl/reipl_type - echo "reipl_type=$REIPL_TYPE" - pushd /sys/firmware/reipl/$REIPL_TYPE >/dev/null 2>&1 - for i in *; do - echo "$i=`cat $i`" - done - popd >/dev/null 2>&1 - fi - - echo $"about to exec shutdown -r" - /sbin/umount -a -d -n >/dev/null 2>&1 - exec /sbin/shutdown -r - exit 0 -} - -function sysecho () { - file=$1 - shift - local i=1 - while [ $i -le 10 ] ; do - if [ ! -f "$file" ]; then - sleep 1 - i=$((i+1)) - else - break - fi - done - [ -f "$file" ] && echo $* > $file -} - -function dasd_settle() { - local dasd_status=/sys/bus/ccw/devices/$1/status - if [ ! -f $dasd_status ]; then - return 1 - fi - local i=1 - while [ $i -le 30 ] ; do - local status - read status < $dasd_status - case $status in - online|unformatted) - return 0 ;; - *) - sleep 0.1 - i=$((i+1)) ;; - esac - done - return 1 -} - -function dasd_settle_all() { - for dasdccw in $(cut -d '(' -f 1 /proc/dasd/devices) ; do - if ! dasd_settle $dasdccw ; then - echo $"Could not access DASD $dasdccw in time" - return 1 - fi - done - return 0 -} - -function startinetd() -{ - echo - echo $"Starting sshd to allow login over the network." - if [ -z "$testing" ]; then - echo $"Welcome to the anaconda install environment $VERSION for $S390ARCH" > /etc/issue.net - echo $"Welcome to the anaconda install environment $VERSION for $S390ARCH" > /etc/motd - echo >> /etc/motd - fi # testing - - /usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda - if [ -z "$RUNKS" ]; then - echo - echo $"Connect now to $IPADDR and log in as user 'install' to start the installation." - echo $"E.g. using: ssh -x install@$IPADDR" - echo $"For VNC or text mode, disable X11 forwarding (recommended) with 'ssh -x'." - echo $"For X11, enable X11 forwarding with 'ssh -X'." - echo - echo $"You may log in as the root user to start an interactive shell." - read - while : ; do - /bin/sh --login - [ $? = 0 ] || break - done - fi -} - -# prints a canonocalized device bus ID for a given devno of any format -function canonicalize_devno() -{ - case ${#1} in - 3) echo "0.0.0${1}" ;; - 4) echo "0.0.${1}" ;; - *) echo "${1}" ;; - esac - return 0 -} - -# read file from CMS and write it to /tmp -function readcmsfile() # $1=dasdport $2=filename -{ - local dev - if [ $# -ne 2 ]; then return; fi - # precondition: udevd created dasda block device node - if ! dasd_cio_free -d $1 ; then - echo $"DASD $1 could not be cleared from device blacklist" - return 1 - fi - # precondition: dasd_eckd_mod driver incl. dependencies loaded, - # dasd_mod must be loaded without setting any DASD online - dev=$(canonicalize_devno $1) - if ! sysecho /sys/bus/ccw/devices/$dev/online 1; then - echo $"DASD $dev could not be set online" - return 1 - fi - udevadm settle - if ! dasd_settle $dev ; then - echo $"Could not access DASD $dev in time" - return 1 - fi - udevadm settle - if ! cmsfscat -d /dev/dasda -a $2 > /tmp/$2; then - echo $"Could not read conf file $2 on CMS DASD $1." - fi - if ! sysecho /sys/bus/ccw/devices/$dev/online 0; then - echo $"DASD $dev could not be set offline again" - return 1 - fi - udevadm settle - # consequences of no more module unload: loader can no longer - # use DASD module option to online DASDs and set other DASD parameters! -} - -# adaption of the same function in init.c (udevd gets started later) -function createDevices() -{ - awk '{ printf("mknod /dev/%s %s %s %s\n", $1, $2, $3, $4); - printf("chmod %s /dev/%s\n", $5, $1); - printf("chown %s /dev/%s\n", $6, $1); - }' <<EOF | sh -console c 5 1 600 root:root -null c 1 3 666 root:root -zero c 1 5 666 root:root -mem c 1 1 600 root:root -ptmx c 5 2 666 root:root -tty c 5 0 666 root:root -tty0 c 4 0 600 root:tty -tty1 c 4 1 600 root:tty -random c 1 8 644 root:root -urandom c 1 9 644 root:root -rtc c 10 135 644 root:root -EOF - # tty handling is different from init.c since s390 does not have all - for i in 2 3 4 5 6 7 8 9 ; do - ln -s console /dev/tty$i - done - mkdir /dev/pts - ln -s /proc/self/fd /dev/fd -} - -# approximately the main() function of init.c -function init_main() { - S390ARCH=$(uname -m) - if [ "$S390ARCH" = "s390" ]; then - export S390ARCH="S/390" - else - export S390ARCH="zSeries" - fi - - echo - echo $"Starting the $S390ARCH initrd to configure networking. Version is $VERSION" - - # set up env vars as we do in init.c - if [ $(uname -m) = "s390x" ]; then - LD_LIBRARY_PATH=/lib64:/usr/lib64:/usr/X11R6/lib64:/usr/kerberos/lib64:/lib:/usr/lib:/usr/X11R6/lib:/usr/kerberos/lib - else - LD_LIBRARY_PATH=/lib:/usr/lib:/usr/X11R6/lib:/usr/kerberos/lib - fi - export LD_LIBRARY_PATH - - PATH="$PATH:/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin:/mnt/sysimage/usr/X11R6/bin" - export PATH - HOME=/ - export HOME - PYTHONPATH=/tmp/updates - export PYTHONPATH - - if [ -z "$testing" ]; then - - mount -t proc none /proc - - mount -t tmpfs none /dev - createDevices - # udevd req'd by udevadm settle (/dev/.udev/queue) - # in readcmsfile, dialog_network_table, semantic_check_subchannels. - # (important: start udevd at the right time, e.g. after setup of /dev) - echo $"Starting udev..." - udevd --daemon - # debug: udevadm control --log-priority=debug - - udevadm control --env=ANACONDA=1 - - mount -t devpts /dev/pts /dev/pts - mount -t sysfs none /sys - - # remount root fs rw - mount /dev/root / -o remount,rw - - # limit output on 3270 console - # (console_loglevel of 4 is just right to not get driver info, - # e.g. from qeth, since that would mix up with the user dialog) - echo "4 4 1 7" > /proc/sys/kernel/printk - - # make /tmp/ramfs - mount -t ramfs none /tmp - - # start rsyslogd after mount of /tmp ramfs since it logs to /tmp/syslog - echo $"Starting rsyslogd..." - rsyslogd -c 4 - - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - route add -host 127.0.0.1 dev lo - - echo -e "127.0.0.1\tlocalhost.localdomain localhost localhost4 localhost4.localdomain4" > /etc/hosts - echo -e "::1\t\tlocalhost.localdomain localhost localhost6 localhost6.localdomain6" >> /etc/hosts - - /bin/dbus-uuidgen --ensure & - [ $? != 0 ] && echo "error on calling /bin/dbus-uuidgen --ensure" - /bin/dbus-daemon --system & - [ $? != 0 ] && echo "error on calling /bin/dbus-daemon --system" - - fi # testing -} - -# trigger udev to automatically load device drivers -function udev_setup() { - if [ -z "$testing" ]; then - # debug: udevadm monitor & - udevadm trigger - udevadm settle - fi # testing -} - -# from here on accesses to sysfs try to follow -# linux/Documentation/sysfs-rules.txt - -### lsznet.raw integration - -declare -a nettable - -function read_lsznet_output() { - count=0 - local line - while read line; do - nettable[$count]="$line" - count=$((count + 1)) - # using the more sophisticated process substitution instead of temp file - # requires the symlink /dev/fd -> /proc/self/fd => createDevices - done < <(/lib/s390-tools/lsznet.raw) -} - -function print_nettable() { - local fmtstring="%3s %-14s %-7s %-5s %-4s %-6s %-7s %s\n" - printf "$fmtstring" \ - "NUM" "CARD" "CU" "CHPID" "TYPE" "DRIVER" "IF" "DEVICES" - local i - for ((i=0; i < count; i++)); do - local item cutype chp chpidtype devdrv devname chlist cardtype - read item cutype chp chpidtype devdrv devname chlist cardtype <<< ${nettable[$i]} - printf "$fmtstring" \ - $item "$cardtype" $cutype $chp "$chpidtype" $devdrv $devname $chlist - done -} - -function clear_screen() { - # FIXME: find a way to clear screen despite 3215 line mode terminal - echo -} - -function dialog_network_table() { - while : ; do - echo $"Scanning for available network devices..." - # This may take a long time so we show "progress": - #( while true; do echo -n "."; sleep 1; done ) & - #local childpid=$! - read_lsznet_output - #kill $childpid - #echo - echo $"Autodetection found ${count} devices." - # count==0: there might still be a blacklist the user wants to clear. - # do not flood user with long list if there are many devices - if [ "$count" -le 15 ]; then - # Show list - answer=s - else # [ $count -gt 15 ] - echo - while : ; do - echo $"s) show all, m) manual config:" - local answer - read answer - case $answer in - s|m) break ;; - esac - done - fi - [ "$answer" = "m" ] && break - # show network table to select network hardware configuration from - if [ "$count" -gt 0 ]; then - clear_screen - print_nettable - echo - fi - # account for possibly ignored common I/O devices - # cio_wc_bytes is NOT local so it can be re-used outside this function - cio_wc_bytes=0 - local cio_wc_filename cio_wc_foo - if [ -f /proc/cio_ignore ]; then - local cio_wc=$(wc -c /proc/cio_ignore) - read cio_wc_bytes cio_wc_filename cio_wc_foo <<< "$cio_wc" - if [ "$cio_wc_bytes" != "0" ]; then - echo $"Note: There is a device blacklist active! (Clearing might take long)" - #cat /proc/cio_ignore | tr '\n' ',' - #echo - else - if [ "$count" -eq 0 ]; then - # count==0 AND no device blacklist => manual mode - echo $"Entering manual configuration mode." - break - fi - fi - fi - # selection dialog - while : ; do - [ "$count" -gt 0 ] && echo -n $"<num>) use config, " - [ "$cio_wc_bytes" != "0" ] && echo -n $"c) clear blacklist, " - echo $"m) manual config, r) rescan, s) shell:" - local choice - read choice - [ -z "$choice" ] && continue - if [ "$choice" = "s" ]; then - echo $"Enter 'exit' at the shell prompt to get back to the installation dialog." - /bin/bash - continue 2 - fi - [ "$choice" = "m" ] && break - [ "$choice" = "r" ] && continue 2 - [ "$cio_wc_bytes" != "0" -a "$choice" = "c" ] && break - [[ "$choice" =~ ^[[:digit:]]+$ ]] - case $? in - 0) - # string matched the pattern - [ "$choice" -ge 1 -a "$choice" -le "$count" ] && break - ;; - 1) - # string did not match the pattern - continue - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - done - if [ "$choice" = "c" ]; then - echo $"Clearing device blacklist..." - cio_ignore -R || echo $"Device blacklist could not be cleared" - fi - [ "$choice" = "m" ] && break - # finally extract config info from selected item - # array nettable starts at index zero, user input starts at index one - choice=$((choice - 1)) - local item cutype chp chpidtype devdrv devname chlist cardtype - read item cutype chp chpidtype devdrv devname chlist cardtype <<< ${nettable[$choice]} - # $NETTYPE happens to be exactly the network driver name - if [ "$devdrv" = "ctcm" ]; then - NETTYPE="ctc" - else - NETTYPE=$devdrv - fi - SUBCHANNELS=$chlist - break - done - echo -} - -declare -r PREFIXFORMAT=[[:xdigit:]]* -declare -r SSIDFORMAT=[0-3] -declare -r BUSIDFORMAT=[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] -declare -r IDFORMAT=$PREFIXFORMAT.$SSIDFORMAT.$BUSIDFORMAT -declare -r SUBCHANNEL_TYPE_IO=0 - -. /lib/s390-tools/znetcontrolunits - -function cardtype2cleartext() { - local cardtype=$1 - case $cardtype in - OSD_10GIG) echo "OSA card in OSD mode, 10 Gigabit Ethernet" ;; - OSD_1000) echo "OSA card in OSD mode, Gigabit Ethernet" ;; - OSD_100) echo "OSA card in OSD mode, Fast Ethernet" ;; - OSD_GbE_LANE) echo "OSA card in OSD mode, Gigabit Ethernet, LAN Emulation" ;; - OSD_FE_LANE) echo "OSA card in OSD mode, Fast Ethernet, LAN Emulation" ;; - OSD_TR_LANE) echo "OSA card in OSD mode, Token Ring, LAN Emulation" ;; - OSD_ATM_LANE) echo "OSA card in OSD mode, ATM, LAN Emulation" ;; - OSD_Express) echo "OSA card in OSD mode, unknown link type" ;; - HSTR) echo "OSA card in OSD mode, High Speed Token Ring" ;; - OSN) echo "OSA for NCP, ESCON/CDLC bridge" ;; - HiperSockets) echo "HiperSockets with CHPID type IQD" ;; - "GuestLAN QDIO") echo "GuestLAN based on OSA (QDIO)" ;; - "GuestLAN Hiper") echo "GuestLAN based on HiperSockets" ;; - unknown) echo "other" ;; - *) echo "unknown" - echo "l.$LINENO: found unknown card_type, code needs to be fixed" 1>&2 - ;; - esac -} - -# returns true iff running under z/VM -function isVM() { - local cpu_version=$(cat /proc/cpuinfo |grep "^processor " | head -n1 | sed 's/.*version = $[[:xdigit:]][[:xdigit:]]$.*/\1/' | tr '[:lower:]' '[:upper:]') - if [ "$cpu_version" = "FF" ]; then - return 0 - else - return 1 - fi -} - -# watch out: potential error message as side effect -function isLayer2Default() { - # Read default from sysfs because according to device - # drivers book there are differences in the default between - # OSA (l2), hipersockets (l3). - # This only works here in installer where nobody has overwritten - # the default setting with another custom value already! - if [ ! -f /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/layer2 ]; then - echo $"Could not read layer mode from sysfs" - return 1 - fi - local layer2 - read layer2 < /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/layer2 - if [ "$layer2" = "1" ]; then - return 0 - else - return 1 - fi -} - -# returns true iff either LAYER2 has been set to 1 or is the default -# watch out: potential error message as side effect -function isLayer2() { - case "x$LAYER2" in - x0) return 1 ;; # layer 3 - x1) return 0 ;; # layer 2 - x) # LAYER2 is unset or empty => qeth driver default applies. - isLayer2Default - return $? - ;; - *) echo "l.$LINENO: unknown value \"$LAYER2\" for LAYER2, code needs to be fixed" 1>&2 - return 2 ;; - esac -} - -# returns true iff qeth device $SCH_R_DEVBUSID -# is capable of supporting IPv6 -# watch out: potential error message as side effect -function ipv6_capable() { - [ "$NETTYPE" = "qeth" ] || return 1 - case $cardtype in - OSD_10GIG|OSD_1000|OSD_100|OSD_Express|HiperSockets|"GuestLAN QDIO") - return 0 ;; - OSD_GbE_LANE|OSD_FE_LANE|OSD_TR_LANE|OSD_ATM_LANE) return 1 ;; - HSTR|OSN|unknown) return 1 ;; - "GuestLAN Hiper") return 1 ;; - *) echo $"Unknown card_type to determine IPv6 support" - return 1 ;; - esac -} - -# sets device online _and_ retrieves DEVICE at the same time -function set_device_online() { - echo $"Activating network device..." - local sysnettype - case "${NETTYPE}" in - qeth|lcs) sysnettype=${NETTYPE} ;; - ctc) sysnettype=ctcm ;; - esac - if ! [ -f /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online ]; then - echo $"Sysfs path to set device online does not exist." - return 1 - fi - if ! sysecho /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online "1"; then - echo $"Could not set device ($SUBCHANNELS) online" - return 1 - fi - udevadm settle - local i=1 - while : ; do - local online - read online < /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online - [ "$online" == "1" ] && break - sleep 1 - i=$((i+1)) - if [ "$i" -gt 10 ]; then - echo $"Could not set device ($SUBCHANNELS) online within timeout" - return 1 - fi - done - if [ "$NETTYPE" = "lcs" -o "$NETTYPE" = "ctc" ]; then - if [ ! -d /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/net ]; then - echo $"Device $SUBCHANNELS does not have required sysfs directory 'net'" - return 1 - fi - DEVICE=$(ls /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/net/) - if [ "$DEVICE" = "" ]; then - echo $"Could not get device name for $SUBCHANNELS" - return 1 - fi - else # qeth - if [ ! -f /sys/devices/qeth/$SCH_R_DEVBUSID/if_name ]; then - echo $"Device $SUBCHANNELS does not have required sysfs attribute 'if_name'" - return 1 - fi - # (device needs to be online to read if_name from sysfs attribute!) - read DEVICE < /sys/devices/qeth/$SCH_R_DEVBUSID/if_name - if [ "$DEVICE" = "" ]; then - echo $"Could not get device name for $SUBCHANNELS" - return 1 - fi - if [ -f /sys/devices/qeth/$SCH_R_DEVBUSID/card_type ]; then - read cardtype < /sys/devices/qeth/$SCH_R_DEVBUSID/card_type - #debug echo "$cardtype" - # device is now online and link type will be known - echo -n $"Detected: " - cardtype2cleartext "$cardtype" - else - echo $"Could not read qeth network card type from sysfs." - fi - fi -} - -# sets device up and blocks until device appears to be up -function set_device_up() { - if [ -z "$DEVICE" ]; then - echo $"Could not determine interface name to bring up device $SUBCHANNELS" - return 1 - fi - # Device does not come up fast enough to use "ip" to configure, so block. - # While OSA come up themselves after setting online, - # e.g. HiperSockets won't => set them up explicitly for the following check - debug ip link set up $DEVICE - local i=1 - while : ; do - local tst=$(ip -o link show up dev $DEVICE) - [ -n "$tst" ] && break - sleep 1 - i=$((i+1)) - if [ "$i" -gt 10 ]; then - echo $"Could not bring up device $DEVICE within timeout" - return 1 - fi - done - return 0 -} - -function syntax_check_domainname() { - # - match against regex adopted from RFC1035,sec.2.3.1 or RFC1034,sec.3.5 - # (Internationalized Domain Names in Applications (IDNA) [RFC4690] - # have to be entered after encoding by punycode [RFC3492]) - [[ "$1" =~ ^[[:alpha:]]([[:alnum:]-]{0,61}[[:alnum:]])?(\.[[:alpha:]]([[:alnum:]-]{0,61}[[:alnum:]])?)*$ ]] - case $? in - 0) - # string matched the pattern - return 0 - ;; - 1) - # string did not match the pattern - echo "$2" - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - return 1 -} - -function disable_ipv6_autoconf() { - sysctl -w net.ipv6.conf.all.accept_ra=0 > /dev/null - sysctl -w net.ipv6.conf.all.accept_redirects=0 > /dev/null - sysctl -w net.ipv6.conf.all.autoconf=0 > /dev/null - sysctl -w net.ipv6.conf.default.accept_ra=0 > /dev/null - sysctl -w net.ipv6.conf.default.accept_redirects=0 > /dev/null - sysctl -w net.ipv6.conf.default.autoconf=0 > /dev/null -} - -function configure_ipv6_address() { - # device needs to be online - # arp flag needs to be on for ipv6 over osa because of ndisc. - # happens automatically by the driver. do NOT mess with default setting. - #NO#debug ip link set dev $DEVICE arp on - if ! debug ip -6 address add $IPADDR/$NETMASK dev $DEVICE; then - echo $"Could net set IPv6 address $IPADDR/$NETMASK for device $DEVICE" - return 1 - fi - # network route has been set by above "ip address add" already - # take care of MTU, which is bundled with ifconfig in the other IPv4 cases - if [ -n "$MMTU" ]; then - if ! debug ip link set $DEVICE $MMTU; then - echo $"Could net set maximum transfer unit ($MMTU) for device $DEVICE" - return 1 - fi - fi - return 0 -} - -function configure_ipv4_address() { - # it's IPv4 and we can make use of ipcalc for better usability - if ipcalc -bmnp $ipcalc_arg > /tmp/ipcalc.$$.out 2> /dev/null; then - . /tmp/ipcalc.$$.out - else - echo $"Could not calculate network address and broadcast address from" - echo $" IPv4 address $IPADDR and netmask $NETMASK" - return 1 - fi - rm /tmp/ipcalc.$$.out - # device needs to be online - if ! debug ifconfig $DEVICE $IPADDR $MMTU netmask $NETMASK broadcast $BROADCAST; then - echo $"Could not set IPv4 address $IPADDR for device $DEVICE" - echo $" with network mask $NETMASK and broadcast address $BROADCAST" - [ -n "$MMTU" ] && echo $" and maximum transfer unit: $MMTU" - return 1 - fi - # This network route is already there after ifconfig! - #if ! debug route add -net $NETWORK netmask $NETMASK dev $DEVICE; then - # echo $"Could not add network route to $NETWORK/$NETMASK on device $DEVICE" - # return 1 - #fi - return 0 -} - -function handle_mtu() { - # don't ask for MTU, but use it if it has been set in the .parm file - # don't overwrite MMTU if it has been set for CTC - [ -n "$MTU" -a -z "$MMTU" ] && MMTU="mtu $MTU" -} - -function rollback_config() { - # each transaction to roll back may fail, if previous setup has not - # made progress that far to reach a certain transation - # => error output is misleading and should be avoided - [ -n "$DEVICE" ] && tv ip -4 route flush default dev $DEVICE - [ -n "$DEVICE" ] && tv ip -6 route flush default dev $DEVICE - # address flush seems to be effective for all address families - [ -n "$DEVICE" ] && ip address flush dev $DEVICE - if [ -n "$NETTYPE" ]; then - if [ -n "$SCH_R_DEVBUSID" ]; then - local sysnettype - case "${NETTYPE}" in - qeth|lcs) sysnettype=${NETTYPE} ;; - ctcm) sysnettype=ctcm ;; - esac - [ -f /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online ] && \ - sysecho /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/online "0" - udevadm settle - [ -f /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/ungroup ] && \ - sysecho /sys/devices/${sysnettype}/$SCH_R_DEVBUSID/ungroup "1" - udevadm settle - fi - fi - [ -z "$mtu_was_set" ] && unset MTU - [ -z "$mmtu_was_set" ] && unset MMTU - [ -z "$vswitch_was_set" ] && unset VSWITCH - # prevent possible reuse of an old DEVICE on restarting dialog - unset DEVICE - # set activated DASDs offline again - local dasd - while read dasd < /proc/dasd/devices; do - dasd=${dasd%%(*} - sysecho /sys/bus/ccw/devices/$dasd/online 0 - done - udevadm settle -} - -### workflow helper functions - -# workflow ideas: -# - setting/applying single configuration steps right away save us explicit -# syntactical & semantic checks PLUS we get direct feedback on error -# - check error level of forked external programs and react on errors - -unset reenter -unset redoitem -unset interaction_happened - -function reenter() { - [ -z "$reenter" ] && return 1 - # reenter menu should only be shown if NOT redoing item - if [ -n "$redoitem" ]; then - # unset redoitem # wrong => do NOT do this here - return 1 - fi - return 0 -} - -function reenter_menu() { - local oldvalue=$1 - interaction_happened="yes" - # unsetting input here is not sufficient, since reenter_menu - # is not called for predefined parameters - # which then might get assigned a previous old input of another parameter! - #unset input - reenter || return 0 - # don't present reenter menu for empty parameters - # (currently ignoring parameters that are allowed to be empty!) - # this could be improved by checking if variable has been set/defined - #[ -z "$1" ] && return 0 - while : ; do - if [ -n "$helptext" ]; then - echo $"0) default is previous \"$oldvalue\", 1) new value, ?) help" - else - echo $"0) default is previous \"$oldvalue\", 1) new value" - fi - # uncoded alternative: 2) skip parameter - local answer - read answer - [ -z "$answer" ] && return 1 - case $answer in - 0) return 1 ;; - 1) # Deciding to enter new value gets user out of reenter-mode - # temporarily for this parameter. - # To put it differently: redoing does NOT present old values. - redoitem="yes" - echo -n $"new value: " - return 0 - ;; - "?") input="?" - return 1 - ;; - esac - done -} - -function workflow_item_menu() { - local noredo=$1 - # default is to continue if running kickstart to prevent interaction - [ -n "$RUNKS" ] && return 0 - interaction_happened="yes" - while : ; do - unset redoitem - if [ "$noredo" = "noredo" ]; then - echo $"1) continue, 2) restart dialog, 3) halt, 4) shell" - else - echo $"0) redo this parameter, 1) continue, 2) restart dialog, 3) halt, 4) shell" - fi - local answer - read answer - case $answer in - 0) [ "$noredo" = "noredo" ] && continue - redoitem="yes" - continue 2 - ;; - 1) return 0 ;; # can be used to break at caller on ignore - 2) reenter="yes" - rollback_config - continue 3 - ;; - 3) tv doshutdown - exit 0 - ;; - 4) echo $"Enter 'exit' at the shell prompt to get back to the installation dialog." - /bin/bash - if [ "$noredo" != "noredo" ] && [ -n "$question_prefix" ]; then - $question_prefix - echo - fi - ;; # stay in workflow item menu - esac - done -} - -# input variables: PARMNAME, question_prefix, question_choices, -# "options" ... -# output variables: $question_prefix, $helptext -# modifies: the variable named $PARMNAME, $OPTIND -function ask() { - [ $# -lt 3 ] && echo "l.$LINENO: too few arguments (<3), please fix calling code." 1>&2 - local PARMNAME=$1 - shift - question_prefix=$1 - shift - local question_choices=$1 - shift - local exception - local syntax_check - unset helptext - local handle - local finish - local optname - OPTIND=1 - while getopts ":e:s:h:c:f:" optname; do - case $optname in - e) exception=$OPTARG ;; - s) syntax_check=$OPTARG ;; - h) helptext=$OPTARG ;; - c) handle=$OPTARG ;; - f) finish=$OPTARG ;; - "?") ;; # ignore invalid option - :) echo "l.$LINENO: Missing parameter to option -$OPTARG" 1>&2 ;; - esac - done - while : ; do - unset input - local input - # actually ask question if one of the following is true: - # - $PARMNAME parameter has not been set yet, e.g. not in parm file - # - on 2nd and further attempts, i.e. redoing the parameter - # - on having restarted the whole dialog - # describing the same from another viewpoint: - # - if $PARMNAME has been set, try to check syntax and apply - # - on redo, $PARMNAME has been set and reenter is false, - # but still ask question again - # - on reenter, $PARMNAME might have been set, but still ask question - if [ -z "${!PARMNAME}" -o -n "$redoitem" -o -n "$reenter" ]; then - # one empty line to separate parameter questions from each other - echo - $question_prefix - if reenter; then - echo - else - $question_choices - fi - # on reenter, give choice between old value and entering new one - reenter_menu ${!PARMNAME} && read input \ - && [ "$input" != "?" ] && eval ${PARMNAME}=\$input - # escaping the $ in the RHS of the eval statement makes it safe - fi - if [ -n "$helptext" ] && [ "$input" = "?" ]; then - $helptext - continue - fi - # optional: default or exceptional handling - [ -n "$exception" ] && $exception - if [ -n "$syntax_check" -a -z "$handle" ]; then - # some parameters have only syntax check (and deferred config): - if $syntax_check; then - break - else - workflow_item_menu && break - fi - elif [ -n "$syntax_check" -a -n "$handle" ]; then - # most common parameters have syntax and configuration: - # user might still continue on syntax error - $syntax_check || workflow_item_menu - # optional: actual configuration - if $handle; then - # parmname has been configured successfully - break - else - # user might still continue on configuration failure - workflow_item_menu && break - fi - elif [ -n "$finish" ]; then - # few parameters need special handling done by their own function: - $finish - else - echo $"Unsupported calling of ask function, please fix calling code" - fi - done # PARMNAME - # disable potential temporary redoing-mode during reenter-mode - unset redoitem -} - -### NETTYPE - -function syntax_check_nettype() { - # - NETTYPE \in {qeth,lcs,ctc} - [[ "$NETTYPE" =~ (^qeth$)|(^lcs$)|(^ctc$) ]] - case $? in - 0) - # string matched the pattern - return 0 - ;; - 1) - # string did not match the pattern - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - echo $"Incorrect format or value for network type (NETTYPE): $NETTYPE" - return 1 -} - -function question_prefix_nettype() { - echo -n $"Network type" -} - -function question_choices_nettype() { - echo $" (qeth, lcs, ctc, ? for help). Default is qeth:" -} - -function helptext_nettype() { - echo $" Help text for network type:" - echo $" qeth: OSA-Express Fast Ethernet, Gigabit Ethernet (including 1000Base-T)," - echo $" High Speed Token Ring, Hipersockets, and ATM (running Ethernet LAN emulation)" - echo $" features in QDIO mode." - echo $" [default]" - echo $" lcs: OSA-2 Ethernet/Token Ring, OSA-Express Fast Ethernet in non-QDIO mode," - echo $" OSA-Express High Speed Token Ring in non-QDIO mode and Gigabit Ethernet" - echo $" in non-QDIO mode." - echo $" ctc: Deprecated, useful for migration." -} - -function exception_nettype() { - # - default is qeth since it should be common - if [ -z "$NETTYPE" ]; then - NETTYPE=qeth - break - fi -} - -function finish_nettype() { - if syntax_check_nettype; then - break - else - # necessary parts which would otherwise be done by workflow_item_menu - interaction_happened="yes" - redoitem="yes" - fi -} - -function do_nettype() { - ask NETTYPE \ - question_prefix_nettype question_choices_nettype \ - -h helptext_nettype -e exception_nettype -f finish_nettype -} - -### CHANDEV - -function do_chandev() { - echo - echo $"The CHANDEV variable isn't used anymore, please update your " - echo $".parm or the .conf file to use NETTYPE, SUBCHANNELS, etc. instead." - echo -} - -### SUBCHANNELS - -function syntax_check_subchannels() { - SUBCHANNELS=$(echo $SUBCHANNELS | tr ABCDEF abcdef) - # - make subchannel question dependent on NETTYPE (2 vs. 3 subchannels) - if [ "$NETTYPE" = "qeth" ]; then - # - match against regex, depending on qeth - [[ "$SUBCHANNELS" =~ ^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4},[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4},[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$ ]] - else - # - match against regex, depending on lcs/ctc - [[ "$SUBCHANNELS" =~ ^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4},[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$ ]] - fi - case $? in - 0) - # string matched the pattern - return 0 - ;; - 1) - # string did not match the pattern - echo $"Incorrect format for channels (SUBCHANNELS): $SUBCHANNELS" - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - return 1 -} - -function semantic_check_subchannels() { - local subch_count - if [ "$NETTYPE" = "qeth" ]; then - subch_count=3 - else - subch_count=2 - fi - # done: make subchannel handling more robust by not relying on REMATCH - local -a subch_array - IFS=, - read -a subch_array <<< "indexzero,$SUBCHANNELS" - unset IFS - local i - local all_subch_good=0 - for ((i=1; i <= $subch_count; i++)); do - local devbusid=${subch_array[$i]} - # remember first subchannel for potential undo of ccwgroup - # (via /sys/devices/qeth/$SCH_R_DEVBUSID/ungroup) - [ "$i" -eq 1 ] && SCH_R_DEVBUSID=$devbusid - local prefix ssid devno foo - IFS=. - read prefix ssid devno foo <<< "$devbusid" - unset IFS - local dev_p=$(echo /sys/devices/css$prefix/$IDFORMAT/$devbusid) - # - check for existence of devnos in sysfs - if [ ! -d "$dev_p" -a "$cio_wc_bytes" != "0" ]; then - # - try to free from /proc/cio_ignore if they don't exist - echo $"Device $devbusid not present, trying to clear from blacklist and resense..." - if ! znet_cio_free -d $devbusid; then - echo $"Device $devbusid could not be cleared from device blacklist" - fi - fi - # reevaluate since globbing might not have worked before device existed - dev_p=$(echo /sys/devices/css$prefix/$IDFORMAT/$devbusid) - if [ ! -d "$dev_p" ]; then - echo $"Device $devbusid does not exist" - all_subch_good=1 - continue - fi - # devno does exist now - local subch_p=${dev_p%/*} - local subch=${subch_p##*/} - # filter definitely unusable subchannels ... - # - check for subchannel type I/O - if [ -f $subch_p/type ]; then - local type - read type < $subch_p/type - if [ "$type" != "$SUBCHANNEL_TYPE_IO" ]; then - echo $"Channel $subch (device $devbusid) is not of type I/O" - all_subch_good=1 - continue - fi - fi - # - check for correct CU type/model, depending on qeth/lcs/ctc - if [ ! -f $dev_p/cutype ]; then - echo $"Device $devbusid does not have required sysfs attribute 'cutype'" - all_subch_good=1 - continue - fi - local cutype - read cutype < $dev_p/cutype - if search_cu $cutype; then - local driver - if [ "$NETTYPE" = "ctc" ]; then - driver="ctcm" - else - driver=$NETTYPE - fi - if [ "${CU_DEVDRV[$cu_idx]}" != "$driver" ]; then - echo $"Device $devbusid has control unit type $cutype," - echo $" which does not match your selected network type $NETTYPE" - all_subch_good=1 - continue - fi - else - echo $"Device $devbusid has control unit type $cutype which is unknown" - all_subch_good=1 - continue - fi - # read CHPIDs information about subchannels - if [ ! -f $subch_p/chpids ]; then - echo $"Channel $subch (device $devbusid) does not have required sysfs attribute 'chpids'" - all_subch_good=1 - continue - fi - local chpid_list - read chpid_list < $subch_p/chpids - local -a chpids - read -a chpids <<< "$chpid_list" - if [ ${#chpids[@]} -ne 8 ]; then - echo $"sysfs reported ${#chpids[@]} CHPIDs instead of expected 8, code needs fix" - fi - if [ ! -f $subch_p/pimpampom ]; then - echo $"Channel $subch (device $devbusid) does not have required sysfs attribute 'pimpampom'" - all_subch_good=1 - continue - fi - local pim pam pom foo - read pim pam pom foo < $subch_p/pimpampom - local pimchpidZ="" - for ((chp=0; chp < 8; chp++)); do - local mask=$((0x80 >> chp)) - if (( 0x$pim & $mask )); then - pimchpidZ=${pimchpidZ}${chpids[chp]} - else - pimchpidZ=${pimchpidZ}"ZZ" - fi - done - local pimchpids=${pimchpidZ//ZZ/} - if [ "x$pimchpids" == "x" ]; then - echo $"Channel $subch (device $devbusid) does not have any installed channel path" - all_subch_good=1 - continue - fi - # compare parts of different subchannels for required matches - if [ "$i" -eq 1 ]; then - # remember parts of first subchannel for comparison - local sch_r_prefix=$prefix - local sch_r_ssid=$ssid - local sch_r_devno=$devno - local sch_r_pimchipidZ=$pimchpidZ - local sch_r_cutype=$cutype - else - local comparison=0 - # $sch_r_... might be empty if first channel was wrong - # => be sure to quote all variable accesses in test statements. - # - all subchannels must be of same CU type/model - if [ "$cutype" != "$sch_r_cutype" ]; then - echo $"Device $devbusid does not have the same control unit type as device $SCH_R_DEVBUSID" - comparison=1 - fi - # - all subchannels must have same CHPIDs - if [ "$pimchpidZ" != "$sch_r_pimchipidZ" ]; then - echo $"Device $devbusid does not have the same CHPIDs as device $SCH_R_DEVBUSID" - comparison=1 - fi - # - all subchannels should have same prefix & ssid ? - if [ "$prefix" != "$sch_r_prefix" \ - -o "$ssid" != "$sch_r_ssid" ]; then - echo $"Device $devbusid does not have the same prefix and subchannel set ID as device $SCH_R_DEVBUSID" - comparison=1 - fi - if [ "$i" -eq 2 ]; then - local sch_w_devbusid=$devbusid - local sch_w_devno=$devno - # TODO: not true for CTCM => relax - # - write_devbusid == read_devbusid+1 - if [ $((0x$devno)) -ne $((0x$sch_r_devno + 1)) ]; then - echo $"Device bus ID of write channel (dev $devbusid) must be one larger than" - echo $" that of read channel (dev $SCH_R_DEVBUSID)" - comparison=1 - fi - elif [ "$i" -eq 3 ]; then - # check data subchannel unequal to read/write subchannel - # (also seems to be handled by ccwgroup kernel subsystem) - if [ "$devbusid" = "$sch_w_devbusid" \ - -o "$devbusid" = "$SCH_R_DEVBUSID" ]; then - echo $"Device bus ID of data channel (dev $devbusid) must be different to that of" - echo $" read channel ($SCH_R_DEVBUSID) and write channel ($sch_w_devbusid)" - comparison=1 - fi - fi - if [ "$comparison" != 0 ]; then - all_subch_good=1 - continue - fi - fi - # filter potentially good subchannels ... - if [ -h $dev_p/group_device ]; then - echo $"Device $devbusid is already in a ccwgroup and thus unavailable" - all_subch_good=1 - continue - fi - if [ ! -f $dev_p/online ]; then - echo $"Device $devbusid does not have required sysfs attribute 'online'" - all_subch_good=1 - continue - fi - local online - read online < $dev_p/online - if [ "$online" = "1" ]; then - echo $"Device $devbusid is already in use and thus unavailable" - all_subch_good=1 - continue - fi - # - check availability - if [ ! -f $dev_p/availability ]; then - echo $"Device $devbusid does not have required sysfs attribute 'availability'" - all_subch_good=1 - continue - fi - local availability - read availability < $dev_p/availability - if [ "$availability" != "good" ]; then - echo $"Device $devbusid is not available but '$availiability'" - all_subch_good=1 - continue - fi - - done # for ((i=1; i <= $subch_count; i++)) - if [ "$all_subch_good" = "0" ]; then - return 0 - fi - return 1 -} - -function handle_subchannels() { - # - try to establish ccwgroup right here and fail out on error - local driver - if [ "$NETTYPE" = "ctc" ]; then - driver="ctcm" - else - driver=$NETTYPE - fi - # if necessary, - # rebind hybrid devices (3088/08 and 3088/1f) to user specified driver - local curdrv - curdrv=$(readlink /sys/bus/ccw/devices/$SCH_R_DEVBUSID/driver) - curdrv=${curdrv##*/} - if [ "$curdrv" = "lcs" -a "$NETTYPE" = "ctc" ]; then - sysecho /sys/bus/ccw/drivers/lcs/unbind "$SCH_R_DEVBUSID" - sysecho /sys/bus/ccw/drivers/ctcm/bind "$SCH_R_DEVBUSID" - fi - if [ "$curdrv" = "ctcm" -a "$NETTYPE" = "lcs" ]; then - sysecho /sys/bus/ccw/drivers/ctcm/unbind "$SCH_R_DEVBUSID" - sysecho /sys/bus/ccw/drivers/lcs/bind "$SCH_R_DEVBUSID" - fi - local channel2 - channel2=${SUBCHANNELS##*,} - curdrv=$(readlink /sys/bus/ccw/devices/$channel2/driver) - curdrv=${curdrv##*/} - if [ "$curdrv" = "lcs" -a "$NETTYPE" = "ctc" ]; then - sysecho /sys/bus/ccw/drivers/lcs/unbind "$channel2" - sysecho /sys/bus/ccw/drivers/ctcm/bind "$channel2" - fi - if [ "$curdrv" = "ctcm" -a "$NETTYPE" = "lcs" ]; then - sysecho /sys/bus/ccw/drivers/ctcm/unbind "$channel2" - sysecho /sys/bus/ccw/drivers/lcs/bind "$channel2" - fi - # create ccwgroup - if sysecho /sys/bus/ccwgroup/drivers/${driver}/group "$SUBCHANNELS"; then - udevadm settle - case "$NETTYPE" in - qeth) - # Just preliminary card_type info until device goes online! - # In fact it seems enough to separate OSA from HiperSockets. - if [ -f /sys/devices/qeth/$SCH_R_DEVBUSID/card_type ]; then - read cardtype < /sys/devices/qeth/$SCH_R_DEVBUSID/card_type - else - echo $"Could not read qeth network card type from sysfs." - fi - ;; - ctc|lcs) - if [ -f /sys/devices/$driver/$SCH_R_DEVBUSID/type ]; then - local type - read type < /sys/devices/$driver/$SCH_R_DEVBUSID/type - [ "$type" = "CTC/A" ] && \ - type="channel-to-channel adapter (CTC/A)" - echo $"Detected: $type" - else - echo $"Could not read ctc network card type from sysfs." - fi - ;; - esac - return 0 - else - echo $"Channels $SUBCHANNELS could not be grouped" - fi - return 1 -} - -function question_prefix_subchannels() { - if [ "$NETTYPE" = "qeth" ]; then - echo -n $"Read,write,data channel" - else - echo -n $"Read,write channel" - fi -} - -function question_choices_subchannels() { - if [ "$NETTYPE" = "qeth" ]; then - echo $" (e.g. 0.0.0300,0.0.0301,0.0.0302 or ? for help)." - else - echo $" (e.g. 0.0.0600,0.0.0601 or ? for help)" - fi -} - -function helptext_subchannels() { - if [ "$NETTYPE" = "qeth" ]; then - echo $" Help text for qeth channels:" - echo $" Enter the device bus ID of your CCW devices." - echo $" QETH needs three channels for read, write, and data," - echo $" e.g. 0.0.0300,0.0.0301,0.0.0302" - else - echo $" Help text for lcs/ctc channels:" - echo $" Enter the device bus ID of your CCW devices." - echo $" CTC/ESCON and LCS need two channels for read and write," - echo $" e.g. 0.0.0600,0.0.0601 will configure the CTC or ESCON interface" - echo $" with the channels 0x600 and 0x601" - fi -} - -function finish_subchannels() { - syntax_check_subchannels || workflow_item_menu - # continuing on syntax error is doomed to fail, - # since handle_subchannels relies on the regex-based strict parsing - # in syntax_check_subchannels which does not match anything then - # news: relaxed by splitting semantic check and actual handling - semantic_check_subchannels || workflow_item_menu - if handle_subchannels; then - break - else - workflow_item_menu && break - fi -} - -function do_subchannels() { - ask SUBCHANNELS \ - question_prefix_subchannels question_choices_subchannels \ - -h helptext_subchannels -f finish_subchannels -} - -### PORTNAME (qeth) - -function syntax_check_portname() { - # - 1-8 characters, we convert it to upper case - PORTNAME=$(echo $PORTNAME | tr '[:lower:]' '[:upper:]') - local portname_len=${#PORTNAME} - if [ "$portname_len" -ge 1 -a "$portname_len" -le 8 ]; then - return 0 - fi - echo $"Incorrect string length [1..8] for portname (PORTNAME): $PORTNAME" - return 1 -} - -function handle_portname() { - [ -n "$PORTNAME" ] || return 0 - # - try to set portname right here w/ error handling - if sysecho /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/portname "$PORTNAME"; then - return 0 - else - echo $"Portname '$PORTNAME' could not be configured for $SUBCHANNELS" - fi - return 1 -} - -function hint_portname() { - if [ -f /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/portname ]; then - local pname_hint - read pname_hint < /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/portname - if [ "$pname_hint" = "no portname required" ]; then - echo $" * Your configuration does not require a portname. *" - fi - fi -} - -function question_prefix_portname(){ - echo -n $"Portname" -} - -function question_choices_portname(){ - echo $" (1..8 characters, or ? for help). Default is no portname:" -} - -function helptext_portname(){ - echo $" Help text for portname:" - # updated text describing when portname is obsolete; - # taken from: - # SA22-7935-09, Open Systems Adapter-Express Customer's - # Guide and Reference, 10th ed. May 2008, IBM, p.17f. - # SC33-8411-00, Device Drivers, Features, and Commands, - # 1st ed. May 2008, IBM, p.116. - echo $" Portname of the OSA-Express feature in QDIO mode and z/VM Guest LAN." - echo $" This parameter is optional with:" - echo $" - z/VM 4.4.0 or z/VM 4.3.0 with APARs VM63308 and PQ73878" - echo $" - z800, z900 with >= Driver 3G - EC stream J11204, MCL032 (OSA level 3.33)" - echo $" - z890, z990, z9, z10 mainframes" - hint_portname - echo $" If portname is used, all operating systems sharing port must use same name." - echo $" Input empty string if you don't want to enter a portname. [default]" -} - -function exception_portname(){ - [ -z "$PORTNAME" ] && break -} - -function do_portname() { - ask PORTNAME \ - question_prefix_portname question_choices_portname \ - -h helptext_portname \ - -e exception_portname -s syntax_check_portname -c handle_portname -} - -### PORTNO (qeth) - -function syntax_check_qeth_portno() { - case $PORTNO in - 0|1) - return 0 - ;; - esac - echo $"Incorrect format or value for relative port number (PORTNO): $PORTNO" - return 1 -} - -function handle_qeth_portno() { - if sysecho /sys/devices/qeth/$SCH_R_DEVBUSID/portno "$PORTNO"; then - return 0 - fi - echo $"Could not configure relative port number $PORTNO for $SUBCHANNELS" - return 1 -} - -function question_prefix_portno() { - echo -n $"Relative port number for OSA" -} - -function question_choices_portno() { - echo $" (0, 1, or ? for help). Default is 0:" -} - -function helptext_portno() { - echo $" Help text for relative port number for OSA with 2 ports per CHPID:" - echo $" This applies to:" - echo $" - OSA-Express3 Gigabit Ethernet on z10 systems" - echo $" - OSA-Express ATM on zSeries 800 and 900 systems" - echo $" 0 for relative port number 0 [default]" - echo $" 1 for relative port number 1" - echo $" Input empty string to not modify the default configuration." -} - -function exception_portno() { - # Writing portno of e.g. hipersockets device fails. - # Therefore, do not configure on empty default value. - [ -z "$PORTNO" ] && break -} - -function do_portno() { - ask PORTNO \ - question_prefix_portno question_choices_portno \ - -h helptext_portno -e exception_portno \ - -s syntax_check_qeth_portno -c handle_qeth_portno -} - -### LAYER2 - -function syntax_check_layer2() { - # - $LAYER2 \in {0,1} - case $LAYER2 in - 0|1) - return 0 - ;; - esac - echo $"Incorrect format or value for layer2 mode (LAYER2): $LAYER2" - return 1 -} - -function handle_layer2() { - [ "$NETTYPE" == "qeth" ] || return 0 - [ -n "$LAYER2" ] || return 0 - # - try to set layer2 mode right here w/ error handling - if sysecho /sys/devices/${NETTYPE}/$SCH_R_DEVBUSID/layer2 "$LAYER2"; then - return 0 - else - echo $"Layer2 mode '$LAYER2' could not be configured for $SUBCHANNELS" - fi - return 1 -} - -function question_prefix_layer2() { - echo -n $"Layer mode" -} - -function question_choices_layer2() { - echo -n $" (0 for layer3, 1 for layer2, or ? for help)." - if [ "$isLayer2Default" = "yes" ]; then - echo $" Default is 1:" - else - echo $" Default is 0:" - fi -} - -function helptext_layer2() { - echo $" Help text for OSA mode of operation: layer 2 vs. layer 3" - if [ "$isLayer2Default" = "yes" ]; then - echo $" 0 for layer 3 mode (may not work with dhcp, tcpdump, etc.)" - echo $" 1 for layer 2 mode [default]" - else - echo $" 0 for layer 3 mode [default] (may not work with dhcp, tcpdump, etc.)" - echo $" 1 for layer 2 mode" - fi -} - -function exception_layer2() { - if [ -z "$LAYER2" ]; then - isLayer2Default && LAYER2=1 || LAYER2=0 - # do not break, always apply, default may differ from online layer mode - #break - fi -} - -function do_layer2() { - isLayer2Default && isLayer2Default=yes || isLayer2Default=no - ask LAYER2 \ - question_prefix_layer2 question_choices_layer2 \ - -h helptext_layer2 -e exception_layer2 \ - -s syntax_check_layer2 -c handle_layer2 -} - -### MACADDR - -function syntax_check_macaddr() { - # - match against regex - [[ "$MACADDR" =~ ^[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]$ ]] - case $? in - 0) - # string matched the pattern - return 0 - ;; - 1) - # string did not match the pattern - echo $"Incorrect format for mac address (MACADDR): $MACADDR" - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - return 1 -} - -function handle_macaddr() { - # - try to set macaddr right here w/ error handlg. - # device needs to be online - if debug ifconfig $DEVICE hw ether $MACADDR; then - return 0 - fi - echo $"MAC address $MACADDR could not be configured for" - echo $" $SUBCHANNELS (network device $DEVICE)" - return 1 -} - -function question_prefix_macaddr() { - echo -n $"Unique MAC address" -} - -function question_choices_macaddr() { - macaddr_default=$(ifconfig $DEVICE | grep 'HWaddr' | sed 's/.*HWaddr $[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]:[[:xdigit:]][[:xdigit:]]$.*/\1/') - echo $" (e.g. 02:00:00:00:00:00, ? for help). Default is $macaddr_default:" -} - -function helptext_macaddr() { - echo $" Help text for MAC address:" - if [ -z "${cardtype//OSD_*/}" ]; then - echo $" For real OSA in layer 2 mode, a random MAC address is automatically assigned." - else - echo $" If connecting to a layer 2 VSWITCH, a MAC address is automatically assigned." - fi - echo $" You may accept the automatic MAC address with an empty input. [default]" - echo $" If the automatic address is not unique, please provide a MAC address." - [ -z "${cardtype//OSD_*/}" ] && \ - echo $" For real OSA, the provided address must be different from that of the OSA." - echo $" You may override the automatic MAC address with non-empty input." - echo $" An example MAC address would be: 02:00:00:00:00:00" -} - -function exception_macaddr() { - if [ -z "$MACADDR" ]; then - if [ -z "${cardtype//OSD_*/}" ]; then - # keep random default MAC address of real OSA, - # so the OSA comes up with the same MAC each time in the future - MACADDR=$macaddr_default - else - # virtual OSA in layer2 is GuestLAN or VSWITCH - VSWITCH=1 - fi - break - fi -} - -function do_macaddr() { - ask MACADDR \ - question_prefix_macaddr question_choices_macaddr \ - -h helptext_macaddr -e exception_macaddr \ - -s syntax_check_macaddr -c handle_macaddr -} - -### CTCPROT - -function syntax_check_ctcprot() { - case "x$CTCPROT" in - x|x0) - unset CTCPROT - return 0 - ;; - x1|x3) - return 0 - ;; - x2) - echo $"CTC tty's are not usable for this installation (CTCPROT)" - ;; - *) - echo $"Incorrect format or value for CTC protocol (CTCPROT): $CTCPROT" - ;; - esac - return 1 -} - -function handle_ctcprot() { - [ -n "$CTCPROT" ] || return 0 - if sysecho /sys/devices/ctcm/${SCH_R_DEVBUSID}/protocol "$CTCPROT"; then - return 0 - fi - echo $"Could not configure CTC protocol $CTCPROT for $SUBCHANNELS" - return 1 -} - -function question_prefix_ctcprot() { - echo -n $"CTC protocol" -} - -function question_choices_ctcprot() { - echo $" (0, 1, 3, or ? for help). Default is 0:" -} - -function helptext_ctcprot() { - echo $" Help text for CTC protocol:" - echo $" Protocol which should be used for the CTC interface" - echo $" 0 for compatibility with p.e. VM TCP service machine [default]" - echo $" 1 for enhanced package checking for Linux peers" - echo $" 3 for compatibility with OS/390 or z/OS peers" -} - -function do_ctcprot() { - ask CTCPROT \ - question_prefix_ctcprot question_choices_ctcprot \ - -h helptext_ctcprot -s syntax_check_ctcprot -c handle_ctcprot -} - -### PORTNAME (LCS portno) - -function syntax_check_lcs_portno() { - [[ "$PORTNAME" =~ ^[[:digit:]]+$ ]] - case $? in - 0) - # string matched the pattern - return 0 - ;; - 1) - # string did not match the pattern - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - echo $"Incorrect format for LCS port number (PORTNAME): $PORTNAME" - return 1 -} - -function handle_lcs_portno() { - [ -n "$PORTNAME" ] || return 0 - if sysecho /sys/devices/lcs/$SCH_R_DEVBUSID/portno "$PORTNAME"; then - return 0 - fi - echo $"Could not configure relative port number $PORTNAME for $SUBCHANNELS" - return 1 -} - -function question_prefix_lcs_portno() { - echo -n $"Relative port number of your LCS device" -} - -function question_choices_lcs_portno() { - echo $" (number or ? for help). Default is 0:" -} - -function helptext_lcs_portno() { - echo $" Help text for relative port number of LCS device:" - echo $" Required for OSA-Express ATM cards only." -} - -function exception_lcs_portno() { - [ -z "$PORTNAME" ] && break -} - -function do_lcs_portno() { - # LCS portno and QETH portname share the parameter variable PORTNAME. - # For compatibility with existing parm files we keep this scheme. - ask PORTNAME \ - question_prefix_lcs_portno question_choices_lcs_portno \ - -e exception_lcs_portno \ - -h helptext_lcs_portno -s syntax_check_lcs_portno -c handle_lcs_portno -} - -### HOSTNAME - -function syntax_check_hostname() { - syntax_check_domainname "$HOSTNAME" "Incorrect format for hostname (HOSTNAME): $HOSTNAME" -} - -function handle_hostname() { - if ! hostname $HOSTNAME; then - echo $"Could not configure hostname $HOSTNAME" - return 1 - fi - return 0 -} - -function question_prefix_hostname() { - echo -n $"Hostname of your new Linux guest" -} - -function question_choices_hostname() { - echo $" (FQDN e.g. s390.redhat.com or ? for help):" -} - -function helptext_hostname() { - echo $" Help text for hostname:" - echo $" Enter the full qualified domain name of your host." -} - -function do_hostname() { - ask HOSTNAME \ - question_prefix_hostname question_choices_hostname \ - -h helptext_hostname -s syntax_check_hostname -c handle_hostname -} - -### IPADDR - -function syntax_check_ipaddr() { - unset ipv4 - unset ipv6 - if checkipv4 $IPADDR; then - ipv4="yes" - return 0 - elif [ "$ipv6_capable" = "yes" ] && checkipv6 $IPADDR; then - ipv6="yes" - return 0 - fi - echo $"Incorrect format for IP address (IPADDR): $IPADDR" - return 1 -} - -function question_prefix_ipaddr() { - echo -n $"IPv4 address" - [ "$ipv6_capable" = "yes" ] && echo -n $" / IPv6 addr." -} - -function question_choices_ipaddr() { - echo -n $" (e.g. 10.0.0.2" - [ "$ipv6_capable" = "yes" ] && echo -n $" / 2001:0DB8::" - echo $" or ? for help)" -} - -function helptext_ipaddr() { - echo $" Help text for IP address:" - echo $" Enter a valid IPv4 address of your new Linux guest (e.g. 10.0.0.2)" - if [ "$ipv6_capable" = "yes" ]; then - echo $" or alternatively a valid IPv6 address without CIDR prefix (e.g. 2001:0DB8::)" - echo $" IPv6 is supported on:" - echo $" - Ethernet interfaces of the OSA-Express adapter running in QDIO mode." - echo $" - HiperSockets interfaces" - echo $" - z/VM guest LAN interfaces running in QDIO mode." - echo $" IPv6 is not supported on HiperSockets guest LAN, OSA-Express Token Ring, ATM." - fi -} - -function do_ipaddr() { - ipv6_capable && ipv6_capable=yes || ipv6_capable=no - ask IPADDR \ - question_prefix_ipaddr question_choices_ipaddr \ - -h helptext_ipaddr -s syntax_check_ipaddr - if [ "$ipv6" ]; then - # qeth_l3 would load ipv6 automatically but not qeth_l2 - modprobe ipv6 - tv disable_ipv6_autoconf - fi - - # no handling/configuring of IPADDR yet, since more parameters needed -} - -### NETMASK (IPv4) - -function syntax_check_netmask_v4() { - # also support CIDR prefix - if [[ "$NETMASK" =~ ^[[:digit:]]+$ ]]; then - if [ "$NETMASK" -ge 1 -a "$NETMASK" -le 32 ]; then - ipcalc_arg="$IPADDR/$NETMASK" - return 0 - fi - echo $"Incorrect value for network prefix [1..32] (NETMASK): $NETMASK" - return 1 - elif checkipv4 $NETMASK; then - ipcalc_arg="$IPADDR $NETMASK" - return 0 - fi - echo $"Incorrect format or value for network mask (NETMASK): $NETMASK" - return 1 -} - -function question_prefix_netmask() { - echo -n $"IPv4 netmask or CIDR prefix" -} - -function hint_netmask_v4() { - # default based on class a/b/c address - local a b c d - IFS=. - read a b c d <<< "$IPADDR" - unset IFS - local ip=$(( ( a << 24 ) + ( b << 16 ) + ( c << 8 ) + ( d ) )) - # <<EOF convince syntax highlighter that above shifts are no here documents - if [ $(( ip & 0x80000000 )) -eq $(( 0x00000000 )) ]; then - # class a - echo "255.0.0.0" - elif [ $(( ip & 0xC0000000 )) -eq $(( 0x80000000 )) ]; then - # class b - echo "255.255.0.0" - elif [ $(( ip & 0xE0000000 )) -eq $(( 0xC0000000 )) ]; then - # class c - echo "255.255.255.0" - else - # some other class that should not be used as host address - return 1 - fi - return 0 -} - -function question_choices_netmask() { - echo -n $" (e.g. 255.255.255.0 or 1..32 or ? for help)" - local default=$(hint_netmask_v4) - if [ -n "$default" ]; then - echo $". Default is $default:" - else - echo $":" - echo $"The IP address you entered previously should probably not be used for a host." - fi -} - -function helptext_netmask() { - echo $" Help text for IPv4 netmask or CIDR prefix:" - echo $" Enter a valid IPv4 netmask or CIDR prefix (e.g. 255.255.255.0 or 1..32)" - local default=$(hint_netmask_v4) - if [ -n "$default" ]; then - echo $" Default is $default" - else - echo $"The IP address you entered previously should probably not be used for a host." - fi -} - -function exception_netmask() { - if [ -z "$NETMASK" ]; then - NETMASK=$(hint_netmask_v4) - fi -} - -function do_netmask() { - ask NETMASK \ - question_prefix_netmask question_choices_netmask \ - -h helptext_netmask \ - -s syntax_check_netmask_v4 -e exception_netmask - # no handling/configuring of NETMASK yet, since more parameters needed -} - -### NETWORK - -function do_network() { - echo - echo $"The NETWORK parameter isn't used anymore and will be ignored." - echo $" It is sufficient to specify IPADDR and NETMASK." - echo - unset NETWORK -} - -### BROADCAST - -function do_broadcast() { - echo - echo $"The BROADCAST parameter isn't used anymore and will be ignored." - echo $" It is sufficient to specify IPADDR and NETMASK." - echo - unset BROADCAST -} - -### NETMASK (IPv6) - -function syntax_check_prefix_v6() { - if [[ "$NETMASK" =~ ^[[:digit:]]+$ ]]; then - if [ "$NETMASK" -ge 1 -a "$NETMASK" -le 128 ]; then - return 0 - fi - fi - echo $"Incorrect value for network prefix [1..128] (NETMASK): $NETMASK" - return 1 -} - -function question_prefix_netmask_v6() { - echo -n $"CIDR prefix for the IPv6 address" -} - -function question_choices_netmask_v6() { - echo $" (1..128):" -} - -function do_netmask_v6() { - ask NETMASK \ - question_prefix_netmask_v6 question_choices_netmask_v6 \ - -s syntax_check_prefix_v6 - # no handling/configuring of NETMASK yet, since more parameters needed -} - -### GATEWAY (IPv4) - -function configure_ipv4_gateway() { - # FIXME: - # - Strictly speaking we should first check reachability of gateway - # and then configure the gateway route. - # This would require a new intermediate workflow_item step - # so that the user might continue despite unreachable gateway. - # done: Only adding default route might add multiple undesired default - # routes on redoing the parameter item, so delete default route - # before adding a new one. - ip -4 route del default dev $DEVICE >& /dev/null - [ -z "$GATEWAY" ] && return 0 - if ! tv route add default gw $GATEWAY dev $DEVICE; then - echo $"Could net set default route on device $DEVICE via gateway $GATEWAY" - return 1 - fi - # BH FIXME: Workaround for manual MACADDR, need ping to update arp table - echo $"Trying to reach gateway $GATEWAY..." - if [ "$NETTYPE" = "ctc" ]; then - # (virtual) CTC(/A) seems to need some time to get functional - local i=1 - while : ; do - $PING $GATEWAY >& /dev/null && break - i=$((i+1)) - if [ "$i" -gt 3 ]; then - echo $"Could not reach gateway $GATEWAY within timeout" - return 1 - fi - done - else - if ! $PING $GATEWAY >& /dev/null; then - echo $"Could not reach your default gateway $GATEWAY" - return 1 - fi - fi - return 0 -} - -function hint_ipv4_gateway() { - # - provide default suggestion based on network, - # for a class C network this would be either .1 or .254 at the end - local a b c d - IFS=. - read a b c d <<< "$NETWORK" - unset IFS - local ip=$(( ( a << 24 ) + ( b << 16 ) + ( c << 8 ) + ( d ) )) - # <<EOF convince syntax highlighter that above shifts are no here documents - local lo=$(( ip | 1 )) - local lo_a=$(( (lo & 0xFF000000) >> 24 )) - local lo_b=$(( (lo & 0x00FF0000) >> 16 )) - local lo_c=$(( (lo & 0x0000FF00) >> 8 )) - local lo_d=$(( (lo & 0x000000FF) )) - local hi=$(( ip | ( (2**(32 - PREFIX)) - 1 ) )) - local hi_a=$(( (hi & 0xFF000000) >> 24 )) - local hi_b=$(( (hi & 0x00FF0000) >> 16 )) - local hi_c=$(( (hi & 0x0000FF00) >> 8 )) - local hi_d=$(( (hi & 0x000000FE) )) - echo $" Depending on your network design patterns, the default gateway" - echo $" might be $lo_a.$lo_b.$lo_c.$lo_d or $hi_a.$hi_b.$hi_c.$hi_d" -} - -function question_prefix_gateway() { - echo -n $"IPv4 address of your default gateway" -} - -function question_choices_gateway() { - echo $" or ? for help:" -} - -function helptext_gateway() { - echo $" Help text for IPv4 default gateway:" - echo $" For HiperSockets with internal traffic only you may want to leave this empty" - echo $" and choose continue afterwards to go on without gateway." - hint_ipv4_gateway -} - -function finish_gateway() { - if ! checkipv4 $GATEWAY; then - # above checkipv4 is silent, so make up for syntax error - echo $"Incorrect format for IPv4 address of gateway (GATEWAY): $GATEWAY" - workflow_item_menu - fi - if configure_ipv4_gateway; then - break - else - workflow_item_menu && break - fi -} - -# FIXME: allow empty/no gateway? - -function do_gateway() { - ask GATEWAY \ - question_prefix_gateway question_choices_gateway \ - -h helptext_gateway -f finish_gateway -} - -### GATEWAY (IPv6) - -function configure_ipv6_gateway() { - # FIXME: - # - Strictly speaking we should first check reachability of gateway - # and then configure the gateway route. - # This would require a new intermediate workflow_item step - # so that the user might continue despite unreachable gateway. - # done: Only adding default route might add multiple undesired default - # routes on redoing the parameter item, so delete default route - # before adding a new one. - ip -6 route del default dev $DEVICE >& /dev/null - [ -z "$GATEWAY" ] && return 0 - # IPv6 http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Linux… - # ip -6 route add ::/0 dev $DEVICE via $GATEWAY - # (Could also be learned by autoconfiguration on the link: - # after IP address setup and device up, - # see if default route has been learned - # ip -6 route show | grep ^default - # However, we currently use manual IPv6 configuration only.) - if ! debug ip -6 route add ::/0 dev $DEVICE via $GATEWAY; then - echo $"Could net set default route on device $DEVICE" - echo $" via gateway $GATEWAY" - return 1 - fi - # BH FIXME: Workaround for manual MACADDR, need ping to update arp table - echo $"Trying to reach gateway $GATEWAY..." - if ! $PING6 $GATEWAY >& /dev/null; then - echo $"Could not reach your default gateway $GATEWAY" - return 1 - fi - return 0 -} - -function question_prefix_gateway_v6() { - echo -n $"IPv6 address of your default gateway" -} - -function question_choices_gateway_v6() { - echo $":" -} - -function helptext_gateway_v6() { - echo $" Help text for IPv6 default gateway:" - echo $" For HiperSockets with internal traffic only you may want to leave this empty" - echo $" and choose continue afterwards to go on without gateway." -} - -function finish_gateway_v6() { - if ! checkipv6 $GATEWAY; then - # above checkipv6 is silent, so make up for syntax error - echo $"Incorrect format for IPv6 address of gateway (GATEWAY): $GATEWAY" - workflow_item_menu - fi - if configure_ipv6_gateway; then - break - else - workflow_item_menu && break - fi -} - -# FIXME: allow empty/no gateway? - -function do_gateway_v6() { - ask GATEWAY \ - question_prefix_gateway_v6 question_choices_gateway_v6 \ - -h helptext_gateway_v6 -f finish_gateway_v6 -} - -### GATEWAY (IPv4, point-to-point) - -function configure_ipv4_ptp() { - # device needs to be online - if debug ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY; then - configure_ipv4_gateway - return $? - fi - echo $"Could not set IPv4 address $IPADDR for device $DEVICE" - echo $" to peer $GATEWAY" - [ -n "$MMTU" ] && echo $" and maximum transfer unit: $MMTU" - return 1 -} - -function question_prefix_ptp_gateway() { - echo -n $"IPv4 address of your point-to-point partner" -} - -function question_choices_ptp_gateway() { - echo $" or ? for help:" - # no hinting possible here -} - -function helptext_ptp_gateway() { - echo $" Help text for point-to-point partner:" - echo $" IPv4 address of your CTC or ESCON point-to-point partner." -} - -function finish_ptp_gateway() { - if checkipv4 $GATEWAY; then - if [ "$GATEWAY" = "$IPADDR" ]; then - echo $"IPv4 address of partner should probably be different from the guest's address" - workflow_item_menu && break - else - break - fi - else - # above checkipv4 is silent, so make up for syntax error - echo $"Incorrect format for IPv4 address of partner (GATEWAY): $GATEWAY" - workflow_item_menu && break - fi - # too early to actually configure gateway -} - -function do_ptp_gateway() { - ask GATEWAY \ - question_prefix_ptp_gateway question_choices_ptp_gateway \ - -h helptext_ptp_gateway -f finish_ptp_gateway -} - -### DNS - -function syntax_check_dns() { - if [ -z "$DNS" ]; then - echo $"You might encounter problems without a nameserver, especially with FTP installs" - return 1 - fi - local dnsitem - local allgood="yes" - if [ "$ipv6" ]; then - while read dnsitem; do - if ! checkipv6 $dnsitem; then - echo $"Not a valid IPv6 address for DNS server: $dnsitem" - allgood="no" - fi - done < <(echo $DNS | sed 's/,/\n/g') - else - while read dnsitem; do - if ! checkipv4 $dnsitem; then - echo $"Not a valid IPv4 address for DNS server: $dnsitem" - allgood="no" - fi - done < <(echo $DNS | sed 's/:/\n/g') - fi - if [ "$allgood" = "yes" ]; then - return 0 - else - return 1 - fi -} - -function handle_dns() { - # - foreach DNS try if server is reachable by one ping - [ -z "$DNS" ] && return 0 - local dnsitem - local allgood="yes" - echo $"Trying to reach DNS servers..." - if [ "$ipv6" ]; then - while read dnsitem; do - if ! $PING6 $dnsitem >& /dev/null; then - echo $"Could not ping DNS server (might still serve DNS requests): $dnsitem" - allgood="no" - # this should not be a hard failure since some network - # environments may prevent pings to DNS servers - # => prevent workflow_item_menu in kickstart mode - fi - done < <(echo $DNS | sed 's/,/\n/g') - else - while read dnsitem; do - # Some network environment may prevent a DNS server from being - # reachable by ping, so it would make sense to use nslookup. - # However, nslookup fails with "Resolver Error 0 (no error)" - # at this stage of the setup progress => not useful - if ! $PING $dnsitem >& /dev/null; then - echo $"Could not ping DNS server: $dnsitem" -# if nslookup $dnsitem $dnsitem >& /dev/null; then -# echo $" but could resolve DNS server with itself: $dnsitem" -# else -# echo $"Could not resolve DNS server with itself: $dnsitem" -# allgood="no" -# fi -# elif ! nslookup $dnsitem $dnsitem >& /dev/null; then -# echo $"Could not resolve DNS server with itself: $dnsitem" - allgood="no" - fi - done < <(echo $DNS | sed 's/:/\n/g') - fi - if [ "$allgood" = "yes" ]; then - return 0 - else - return 1 - fi -} - -function question_prefix_dns() { - if [ "$ipv6" ]; then - echo -n $"IPv6 addresses of DNS servers" - else - echo -n $"IPv4 addresses of DNS servers" - fi -} - -function question_choices_dns() { - if [ "$ipv6" ]; then - echo $" (separated by commas ',' or ? for help):" - else - echo $" (separated by colons ':' or ? for help):" - fi -} - -function helptext_dns() { - echo $" Help text for DNS servers:" - if [ "$ipv6" ]; then - echo $" Enter IPv6 addresses of DNS servers separated by commas ','" - else - echo $" Enter IPv4 addresses of DNS servers separated by colons ':'" - fi - echo $" Default are no DNS servers at all." - echo $" However, you might encounter problems without a nameserver," - echo $" especially with FTP installs." - if [ "$ipv6" ]; then - echo $" An example with 2 servers would be: 2001:0DB8::42,2001:0DB8::BE:AF" - else - echo $" An example with 2 servers would be: 10.0.0.250:10.1.1.1" - fi -} - -function do_dns() { - ask DNS \ - question_prefix_dns question_choices_dns \ - -h helptext_dns -s syntax_check_dns -c handle_dns -} - -### SEARCHDNS - -function syntax_check_searchdns() { - [ -z "$SEARCHDNS" ] && return 0 - local dnsitem - local allgood="yes" - while read dnsitem; do - syntax_check_domainname "$dnsitem" $"Not a valid DNS search domain: $dnsitem" || allgood="no" - done < <(echo $SEARCHDNS | sed 's/:/\n/g') - if [ "$allgood" = "yes" ]; then - return 0 - else - return 1 - fi -} - -function question_prefix_searchdns() { - echo -n $"DNS search domains" -} - -function question_choices_searchdns() { - echo $" (separated by colons ':' or ? for help):" -} - -function helptext_searchdns() { - echo $" Help text for DNS search domains:" - echo $" Enter search domains according to hostname syntax separated by colons." - echo $" Default are no DNS search domains at all." - echo $" An example would be: subdomain.domain.com:domain.com" -} - -function do_searchdns() { - ask SEARCHDNS \ - question_prefix_searchdns question_choices_searchdns \ - -h helptext_searchdns -s syntax_check_searchdns -} - -### DASD - -function parse_dasd() { - local handle - [ "$1" = "-h" ] && handle=yes || unset handle - local dasditem - local allgood="yes" - local cio_wc=$(wc -c /proc/cio_ignore) - read cio_wc_bytes cio_wc_filename cio_wc_foo <<< "$cio_wc" - if [ "$handle" = "yes" -a "$cio_wc_bytes" != "0" ]; then - echo $"Trying to clear specified DASDs from device blacklist..." - mkdir -p /etc/modprobe.d - echo "options dasd_mod dasd=$DASD" > /etc/modprobe.d/dasd_mod.conf - if ! dasd_cio_free; then - echo $"Not all specified DASDs could be detected within timeout." - allgood="no" - fi - fi - while read dasditem; do - unset range features range lo hi rangegood \ - attrs devno lodevno hidevno devbusid sys - case $dasditem in - autodetect) - [ -z "$handle" ] && continue - cio_wc=$(wc -c /proc/cio_ignore) - read cio_wc_bytes cio_wc_filename cio_wc_foo <<< "$cio_wc" - # above we only freed the devices specified in $DASD, - # so there might still be other DASDs in the blacklist - if [ "$cio_wc_bytes" != "0" ]; then - echo $"Note: There is a device blacklist active! Only activating visible DASDs." - fi - local sys - while read sys; do - if ! sysecho $sys/online 1; then - echo $"Could not set DASD ${sys##*/} online" - fi - done < <(find /sys/bus/ccw/drivers/dasd-eckd/ -name "*.?.????" 2>/dev/null;\ - find /sys/bus/ccw/drivers/dasd-fba/ -name "*.?.????" 2>/dev/null) - ;; - probeonly|nopav|nofcx) - if [ -z "$handle" ]; then - echo $"DASD option $dasditem not supported by installer" - fi - ;; - "") continue ;; # empty range - *) local range features rangegood="yes" - IFS='(' - read range features <<< "$dasditem" - unset IFS - # parse: dev OR dev'-'dev - local lo=${range%%-*} - [[ "$lo" =~ (^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$)|(^[[:xdigit:]]{3,4}$) ]] - case $? in - 0) # string matched the pattern - lo=$(canonicalize_devno $lo) ;; - 1) # string did not match the pattern - rangegood="no" - if [ -z "$handle" ]; then - echo $"Incorrect format for lower bound of DASD range $range: $lo" - allgood="no" - fi - ;; - 2) echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 ;; - *) echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 ;; - esac - if [ "${range//*-*/}" = "" ]; then - local hi=${range##*-} - [[ "$hi" =~ (^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$)|(^[[:xdigit:]]{3,4}$) ]] - case $? in - 0) # string matched the pattern - hi=$(canonicalize_devno $hi) - if [ "${lo%.*}" != "${hi%.*}" ]; then - echo $"Prefixes of DASD range $range do not match: ${lo%.*} != ${hi%.*}" - rangegood="no" - allgood="no" - fi - ;; - 1) # string did not match the pattern - rangegood="no" - if [ -z "$handle" ]; then - echo $"Incorrect format for upper bound of DASD range $range: $hi" - allgood="no" - fi - ;; - 2) echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 ;; - *) echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 ;; - esac - fi - if [ "${features//*)/}" != "" ]; then - if [ -z "$handle" ]; then - echo $"Missing closing parenthesis at features of DASD range $range: ($features" - allgood="no" - fi - fi - local attrs="" - if [ -n "$features" ]; then - features="${features%)}" - while read feature; do - case $feature in - ro) attrs=$attrs" readonly" ;; - diag) attrs=$attrs" use_diag" ;; - erplog|failfast) attrs=$attrs" "$feature ;; - *) if [ -z "$handle" ]; then - echo $"Unknown DASD feature for device range $range: $feature" - allgood="no" - fi - ;; - esac - done < <(echo $features | sed 's/:/\n/g') - fi - [ "$rangegood" = "yes" ] || continue - [ "$handle" = "yes" ] || continue - # now apply $attrs and set DASDs $lo to $hi online - [ -z "$hi" ] && hi=$lo - local devno lodevno=$((0x${lo##*.})) hidevno=$((0x${hi##*.})) - local dasdconf="/etc/dasd.conf" - for ((devno=$lodevno; $devno <= $hidevno; ++devno)); do - local devbusid=$(printf "%s.%04x" ${lo%.*} $devno) - local sys="/sys/bus/ccw/devices/"$devbusid - echo -n "$devbusid" >> $dasdconf - for attr in $attrs; do - if [ "$attr" = "use_diag" ]; then - # diag discipline cannot be auto-loaded - modprobe dasd_diag_mod - fi - if [ ! -f $sys/$attr ]; then - echo $"DASD $devbusid does not provide attribute $attr" - continue - fi - if ! sysecho $sys/$attr 1; then - echo $"Could not set attribute $attr for DASD $devbusid" - fi - echo -n " $attr=1" >> $dasdconf - done - if [ ! -f $sys/online ]; then - echo $"DASD $devbusid not found" - continue - fi - if ! sysecho $sys/online 1; then - echo $"Could not set DASD $devbusid online" - fi - echo >> $dasdconf - done - ;; - esac - done < <(echo $DASD | sed 's/,/\n/g') - if [ "$handle" = "yes" ]; then - udevadm settle - dasd_settle_all || return 1 - echo $"Activated DASDs:" - cat /proc/dasd/devices | sed -e 's/ at ([^)]*) is//' -e 's/ at/,/' - fi - if [ "$allgood" = "yes" ]; then - return 0 - else - return 1 - fi -} - -function syntax_check_dasd() { - parse_dasd - return $? -} - -function handle_dasd() { - parse_dasd -h - return $? -} - -function question_prefix_dasd() { - echo -n $"DASD range" -} - -function question_choices_dasd() { - echo $" (e.g. 200-203,205 or ? for help). Default is autoprobing:" -} - -function helptext_dasd() { - echo $" Help text for DASD range:" - echo $" Comma separated list of ranges of device bus IDs." - echo $" Default is autoprobing (not recommended)." - echo $" Examples would be: 200-203 or 200,201,202,203 or 0.0.0200-0.0.0203,0.0.0205" -} - -function exception_dasd() { - [ -z "$DASD" ] && DASD="autodetect" -} - -function do_dasd() { - ask DASD \ - question_prefix_dasd question_choices_dasd \ - -h helptext_dasd -e exception_dasd -s syntax_check_dasd -c handle_dasd -} - -### FCP - -function syntax_check_fcp() { - local allgood="yes" - local i - for i in ${!FCP_*}; do - local -a fcp - local devno wwpn lun - read -a fcp <<< "${!i}" - case ${#fcp[@]} in - 3) - devno=${fcp[0]} - wwpn=${fcp[1]} - lun=${fcp[2]} - ;; - 5) - devno=${fcp[0]} - wwpn=${fcp[2]} - lun=${fcp[4]} - echo $"Deprecated number of FCP arguments (5 instead of 3): " - echo $" $i=\"${!i}\"" - echo $" should instead be: " - echo $" $i=\"$devno $wwpn $lun\"" - ;; - *) - echo $"Unsupported number of FCP arguments (${#fcp[@]} instead of 3) in:" - echo $" $i=\"${!i}\"" - allgood="no" - continue - ;; - esac - [[ "$devno" =~ (^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$)|(^[[:xdigit:]]{3,4}$) ]] - case $? in - 0) ;; # string matched the pattern - 1) # string did not match the pattern - echo $"Incorrect format for FCP device $devno in:" - echo $" $i=\"${!i}\"" - allgood="no" - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - # zfcp.py:class ZFCPDevice would also accept WWPN without leading 0x - [[ "$wwpn" =~ ^0x[[:xdigit:]]{16}$ ]] - case $? in - 0) ;; # string matched the pattern - 1) # string did not match the pattern - echo $"Incorrect format for FCP WWPN $wwpn in:" - echo $" $i=\"${!i}\"" - allgood="no" - ;; - 2) echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 ;; - *) echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 ;; - esac - # zfcp.py:class ZFCPDevice would also accept LUN without leading 0x - # zfcp.py:class ZFCPDevice would also accept 16 bit LUN and pads with 0 - [[ "$lun" =~ ^0x[[:xdigit:]]{8}0{8}$ ]] - case $? in - 0) ;; # string matched the pattern - 1) # string did not match the pattern - echo $"Incorrect format for FCP LUN $lun in:" - echo $" $i=\"${!i}\"" - allgood="no" - ;; - 2) - echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 - ;; - *) - echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 - ;; - esac - done - if [ "$allgood" = "yes" ]; then - return 0 - else - return 1 - fi -} - -### - -function show_parms() { - # The only issue with this stateless approach to showing parameters based - # on their content being non-empty is, that parameters with defaults - # such as LAYER2, (PORTNAME,) CTCPROT, PORTNO (,MACADDR) won't be shown - # if the user just hit enter, so the parm file would be "incomplete". - # However this is not easy to fix in here, since it would require the - # inter-parameter dependenies coded below in the main part, e.g. an - # empty LAYER2 should only be printed with default value if $NETTYPE=qeth. - # For the time being, at least the parameters LAYER2, PORTNAME, and CTCPROT - # only get asked on being empty if not running in kickstart mode. - cat << EOF -NETTYPE=$NETTYPE -IPADDR=$IPADDR -NETMASK=$NETMASK -GATEWAY=$GATEWAY -HOSTNAME=$HOSTNAME -EOF - [ "$SUBCHANNELS" ] && echo "SUBCHANNELS=$SUBCHANNELS" - [ "$LAYER2" ] && echo "LAYER2=$LAYER2" - [ "$VSWITCH" ] && echo "VSWITCH=$VSWITCH" - [ "$MACADDR" ] && echo "MACADDR=$MACADDR" - [ "$PORTNAME" ] && echo "PORTNAME=$PORTNAME" - [ "$PORTNO" ] && echo "PORTNO=$PORTNO" - [ "$PEERID" ] && echo "PEERID=$PEERID" - [ "$CTCPROT" ] && echo "CTCPROT=$CTCPROT" - if [ -n "$mmtu_was_set" ]; then - echo "MMTU=\"$MMTU\"" - elif [ -n "$mtu_was_set" ]; then - echo "MTU=$MTU" - fi - [ "$DNS" ] && echo "DNS=$DNS" - [ "$SEARCHDNS" ] && echo "SEARCHDNS=$SEARCHDNS" - [ "$DASD" ] && echo "DASD=$DASD" -} - -function final_check() { - # final check && break - if [ -z "$interaction_happened" ]; then - # if parm file was good enough just continue without interaction - break - return 0 - fi - while : ; do - # optionally consider "continue" as default - # but then again the user may inadvertently continue - echo - echo $"c) continue, p) parm file/configuration, n) network state, r) restart, s) shell" - local answer - read answer - case $answer in - c) return 0 ;; - p) echo - show_parms ;; - n) # show interfaces and routing table - ifconfig -a - if [ "$ipv6" ]; then - #route -n -A inet6 - # the following produces more compact output for 80 columns - ip -6 route show | grep -v "^unreachable " - else - route -n - fi - ;; - d) # show active DASDs with some useful details - echo $"Activated DASDs:" - cat /proc/dasd/devices|sed -e 's/ at ([^)]*) is//' -e 's/ at/,/' - ;; - r) break ;; - s) echo $"Enter 'exit' at the shell prompt to get back to the installation dialog." - /bin/bash - ;; - esac - done - return 1 -} - -### MAIN ### - -init_main -udev_setup - -# Parse configuration -if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then - readcmsfile $CMSDASD $CMSCONFFILE - source /tmp/$CMSCONFFILE #2>/dev/null -fi - -if [ -r /sys/firmware/ipl/ipl_type ]; then - #local ipl_type - read ipl_type < /sys/firmware/ipl/ipl_type - if [ "$ipl_type" = "fcp" ]; then - while : ; do - echo $"Your IPL device is set to FCP." - echo $"Would you like to perform a CD-ROM/DVD-ROM installation? (y/n)" - #local do_cd_install - read do_cd_install - case $do_cd_install in - y|Y|[Yy][Ee][Ss]) - # precondition: zfcp driver incl. dependencies loaded - #local CD_DEVICE WWPN LUN - read CD_DEVICE < /sys/firmware/ipl/device - read WWPN < /sys/firmware/ipl/wwpn - read LUN < /sys/firmware/ipl/lun - zfcp_cio_free -d $CD_DEVICE \ - || echo $"Device $CD_DEVICE could not be cleared from device blacklist" - sysecho /sys/bus/ccw/drivers/zfcp/$CD_DEVICE/online 1 \ - || echo $"Could not set FCP device $CD_DEVICE online" - udevadm settle - # port (WWPN) appears automatically - sysecho /sys/bus/ccw/drivers/zfcp/$CD_DEVICE/$WWPN/unit_add $LUN \ - || echo $"Could not add LUN $LUN at WWPN $WWPN on FCP device $CD_DEVICE" - udevadm settle - break - ;; - n|N|[Nn][Oo]) - break - ;; - *) - echo - echo $"*** INVALID ANSWER: $do_cd_install" - echo - unset do_cd_install - ;; - esac - done - fi -fi - -# Perform a network installation - -[ -n "$MTU" ] && mtu_was_set=$MTU -[ -n "$MMTU" ] && mmtu_was_set=$MMTU -[ -n "$VSWITCH" ] && vswitch_was_set=$VSWITCH - -[ -n "$CHANDEV" ] && do_chandev -[ -n "$NETWORK" ] && do_network -[ -n "$BROADCAST" ] && do_broadcast - -# [ -z "${cardtype//OSD_*/}" ] can be used to check for real OSA - -# Check for missing parameters, prompt for them if necessary -while : ; do - - # do not show list of possible network device configurations, if: - # - running unattended install with kickstart - # - relevant parameters have already been specified in parm file - # (a possible optimization would be matching those parms to table entry) - # - dialog has not been restarted - [ -n "$reenter" \ - -o -z "$RUNKS" -a $ -z "$NETTYPE" -o -z "$SUBCHANNELS" $ ] && \ - dialog_network_table - if isVM; then - echo $"* NOTE: To enter default or empty values press enter twice. *" - fi - do_nettype - - # precondition: driver (qeth/lcs/ctcm) loaded incl. dependencies - do_subchannels - if [ "$NETTYPE" = "qeth" ]; then - [ -z "$reenter" -a -n "$RUNKS" -a -z "$PORTNAME" ] || \ - [ -n "${cardtype//OSD_*/}" ] || do_portname - # See also https://bugzilla.redhat.com/show_bug.cgi?id=439461 - # - # If running in kickstart mode (unattended), we assume no - # interaction and the user won't get asked for PORTNO. - # Otherwise the user will be asked for PORTNO. - # If the user specified PORTNO in parm/conf file, PORTNO gets - # respected (or the user will be asked if it was wrong). - if [ -f /sys/devices/qeth/$SCH_R_DEVBUSID/portno ]; then - # driver support exists since RHEL5.2 - [ -z "$reenter" -a -n "$RUNKS" -a -z "$PORTNO" ] || \ - [ -n "${cardtype//OSD_*/}" ] || do_portno - fi - do_layer2 - # set device online to know the device name - # and to know if it's OSD/HiperSockets/GuestLAN BUT do not - # try to ifconfig the device up since that requires - # setting the mac address before (if applicable). - set_device_online || workflow_item_menu noredo - # MAC address handling is not part of - # https://bugzilla.redhat.com/show_bug.cgi?id=233376 - # Instead the additions come from - # https://bugzilla.redhat.com/show_bug.cgi?id=248049 - # The new parms VSWITCH and MACADDR are described in - # the RHEL 5.1 release notes. - if isLayer2; then - if [ -z "$VSWITCH" -o "$VSWITCH" == 0 ]; then - do_macaddr - fi - fi - elif [ "$NETTYPE" = "ctc" ]; then - [ -z "$reenter" -a -n "$RUNKS" -a -z "$CTCPROT" ] || do_ctcprot - set_device_online || workflow_item_menu noredo - elif [ "$NETTYPE" = "lcs" ]; then - [ -n "$RUNKS" -a -z "$PORTNAME" ] && PORTNAME=0 - do_lcs_portno - set_device_online || workflow_item_menu noredo - fi - - # device needs to be up before configuring with ifconfig/ip in - # configure_ipv6_address/configure_ipv4_address/configure_ipv4_address - set_device_up || workflow_item_menu noredo - - [ "$HOSTNAME" = "(none)" ] && unset HOSTNAME - do_hostname - - # Note: The workflow_item_menu does a rollback_config on restart - # dialog, i.e. hardware config has been reset and it is impossible to - # only restart halfway at IPADDR. - do_ipaddr - if [ "$ipv6" ]; then - # this branch is all IPv6 and at the same time also NETTYPE==qeth - do_netmask_v6 - handle_mtu - configure_ipv6_address || workflow_item_menu noredo - do_gateway_v6 - else - # Consider IPv4 as default, even for unknown IP versions - # due to invalid input for IPADDR ignored by the user previously - # (neither ipv6 nor ipv4 is set). - # Otherwise we would skip things like NETMASK or GATEWAY - # and jump forward to DNS which is probably not what we want. - if [ "$NETTYPE" = "qeth" ] || [ "$NETTYPE" = "lcs" ]; then - do_netmask - handle_mtu - configure_ipv4_address || workflow_item_menu noredo - do_gateway - else # ctc0 - if [ -z "$NETMASK" ]; then - # If the user did not supply netmask, we add the right one. - # Netmask MUST be present, - # or pumpSetupInterface() blows routes. - NETMASK="255.255.255.255" - fi - # don't ask for MTU, but use it if set in the parm file - # don't overwrite MMTU if it has been set for CTC - [ "$NETTYPE" = "ctc" -a -z "$MTU" -a -z "$MMTU" ] && \ - MMTU="mtu 1500" - do_ptp_gateway - configure_ipv4_ptp || workflow_item_menu noredo - fi - fi - - do_dns - [ -n "$DNS" ] && do_searchdns - - do_dasd - - echo $"Initial configuration completed." - final_check && break - rollback_config - reenter="yes" - -done # outer dialog loop - -if [ -z "$testing" ]; then - - # convert to space-separated lists - if [ -n "$SEARCHDNS" ]; then - SEARCHDNS=$(echo $SEARCHDNS |sed -e 's/:/ /g') - for i in "$SEARCHDNS"; do echo "search $i"; done >> /etc/resolv.conf - fi - if [ -n "$DNS" ]; then - if [ "$ipv6" ]; then - RESOLVDNS=$(echo $DNS |sed -e 's/,/ /g') - else - RESOLVDNS=$(echo $DNS |sed -e 's/:/ /g') - fi - for i in $RESOLVDNS; do echo "nameserver $i"; done >> /etc/resolv.conf - fi - - # make sure we have an /etc/hosts file (originally required for telnetd, - # which is no longer included) - if [ ! -z "$HOSTNAME" -a ! -z "$IPADDR" ]; then - echo -e "$IPADDR\t$HOSTNAME $(echo $HOSTNAME | cut -d '.' -f 1)" >> /etc/hosts - fi - -fi # testing - -# syntax check to give user early feedback on parameters provided in parm file -# (he probably won't notice the logs written by anaconda later on) -syntax_check_fcp -# currently we ignore failed syntax checks since FCP parms are non-interactive -for i in ${!FCP_*}; do - echo "${!i}" >> /etc/zfcp.conf -done -# cio_ignore handling for FCP should happen when the content of /etc/zfcp.conf -# will actually be processed which is in anaconda's zfcp.py ZFCP::readConfig() - -# TODO/FIXME: also need to pass IPv6 decision to loader/anaconda -# [ "$ipv6" ] && echo "IPV6=yes" - -# transfer options into install environment -# loader now uses ifcfg instead of install.cfg to receive our network config - -# additionally, loader's readNetInfo needs to know our DEVICE name -echo $DEVICE > /tmp/s390net - -if [ "$ipv6" ]; then - DNS1=$(echo $DNS | cut -d ',' -f 1) - DNS2=$(echo $DNS | cut -d ',' -f 2) -else - DNS1=$(echo $DNS | cut -d ':' -f 1) - DNS2=$(echo $DNS | cut -d ':' -f 2) -fi - -NETSCRIPTS="/etc/sysconfig/network-scripts" -IFCFGFILE="$NETSCRIPTS/ifcfg-$DEVICE" -if [ ! -d "$NETSCRIPTS" ]; then - mkdir -p $NETSCRIPTS -fi - -# to please NetworkManager on startup in loader before loader reconfigures net -cat > /etc/sysconfig/network << EOF -HOSTNAME=$HOSTNAME -EOF -if [ "$ipv6" ]; then - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network -else - echo "NETWORKING=yes" >> /etc/sysconfig/network -fi - -cat > $IFCFGFILE << EOF -DEVICE=$DEVICE -ONBOOT=yes -BOOTPROTO=static -MTU=$MTU -SUBCHANNELS=$SUBCHANNELS -EOF -if [ "$ipv6" ]; then - cat >> $IFCFGFILE << EOF -IPV6INIT=yes -IPV6_AUTOCONF=no -IPV6ADDR=$IPADDR/$NETMASK -IPV6_DEFAULTGW=$GATEWAY -EOF -else - cat >> $IFCFGFILE << EOF -IPADDR=$IPADDR -NETMASK=$NETMASK -BROADCAST=$BROADCAST -GATEWAY=$GATEWAY -EOF -fi -# real DNS config for NetworkManager to generate /etc/resolv.conf -[ "$DNS1" != "" ] && echo "DNS1=$DNS1" >> $IFCFGFILE -[ "$DNS2" != "" ] && echo "DNS2=$DNS2" >> $IFCFGFILE -# just to please loader's readNetInfo && writeEnabledNetInfo -# which eats DNS1,DNS2,... and generates it themselves based on DNS -if [ "$ipv6" ]; then - [ "$DNS" != "" ] && echo "DNS=\"$DNS\"" >> $IFCFGFILE -else - [ "$DNS" != "" ] && echo "DNS=\"$(echo $DNS|sed -e 's/:/,/g')\"" >> $IFCFGFILE -fi -# colons in SEARCHDNS already replaced with spaces above for /etc/resolv.conf -[ "$SEARCHDNS" != "" ] && echo "DOMAIN=\"$SEARCHDNS\"" >> $IFCFGFILE -[ "$NETTYPE" != "" ] && echo "NETTYPE=$NETTYPE" >> $IFCFGFILE -[ "$PEERID" != "" ] && echo "PEERID=$PEERID" >> $IFCFGFILE -[ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> $IFCFGFILE -[ "$CTCPROT" != "" ] && echo "CTCPROT=$CTCPROT" >> $IFCFGFILE -[ "$MACADDR" != "" ] && echo "MACADDR=$MACADDR" >> $IFCFGFILE -optstr="" -for option in LAYER2 PORTNO; do - [ -z "${!option}" ] && continue - [ -n "$optstr" ] && optstr=${optstr}" " - optstr=${optstr}$(echo ${option} | tr [[:upper:]] [[:lower:]])"="${!option} -done -# write single quotes since network.py removes double quotes but we need quotes -echo "OPTIONS='$optstr'" >> $IFCFGFILE -unset option -unset optstr - -if [ -z "$testing" ]; then - - # so that the vars get propagated into the sshd shells - mkdir /.ssh - cat >> /.ssh/environment <<EOF -LD_LIBRARY_PATH=$LD_LIBRARY_PATH -PATH=$PATH -HOME=$HOME -PYTHONPATH=$PYTHONPATH -EOF - - cat >> /etc/profile <<EOF -LD_LIBRARY_PATH=$LD_LIBRARY_PATH -PATH=$PATH -HOME=$HOME -PYTHONPATH=$PYTHONPATH -export LD_LIBRARY_PATH PATH HOME PYTHONPATH -EOF - - if [ -n "$DISPLAY" ]; then - echo "export DISPLAY=$DISPLAY" >> /etc/profile - fi - - # I'm tired of typing this out... - echo "loader" >> /.bash_history - - echo -n $$ > /var/run/init.pid - - # shutdown (halt) on SIGUSR1 - trap doshutdown SIGUSR1 - # reboot on SIGUSR2 - trap doreboot SIGUSR2 - - startinetd - - if [ -n "$RUNKS" ]; then - /sbin/loader - fi - - doshutdown - -fi # testing - -# ;;; Local Variables: *** -# ;;; mode: sh *** -# ;;; end: *** -- 1.7.11.2

2 1

[PATCH] dracut: add README
by Will Woods 16 Aug '12

16 Aug '12

Add a README containing some notes that should cover a lot of the common questions people ask about how this thing works. --- dracut/README | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 dracut/README diff --git a/dracut/README b/dracut/README new file mode 100644 index 0000000..bb234c3 --- /dev/null +++ b/dracut/README @@ -0,0 +1,90 @@ +SOME IMPORTANT NOTES ABOUT HOW DRACUT WORKS +=========================================== +Will Woods <wwoods(a)redhat.com> +v1.0, August 15 2012 + + + +File locations / installation +----------------------------- + +The files are installed into the initramfs according to the instructions in +`module-setup.sh`. So this line: + + inst_hook cmdline 25 "$moddir/parse-anaconda-options.sh" + +means that the file `parse-anaconda-options.sh` will be installed at priority +`25` in the `cmdline` hook. In practice, this means that it will be located at + + /lib/dracut/hooks/cmdline/25-parse-anaconda-options.sh + +inside the initramfs. + + + +Hooks and script ordering +------------------------- + +The hooks run in the following order: + +cmdline:: + This is where you parse (and _only_ parse) the boot commandline. Just + set up config files and do sanity checks; the real action is later. + +pre-udev:: + This is where you write out udev rules (before udev starts). + +pre-trigger:: + At this point udev is running but *kernel modules haven't been loaded*. + If you need to set udev environment variables, set them here. + +initqueue:: + This is the mainloop, where initramfs tries to find/fetch rootfs. + Scripts in this hook will run _repeatedly_ until finished or timeout (see + below). + +initqueue/settled:: + This part of the mainloop only runs once _udev is settled_, i.e. once all + devices have been found. + +initqueue/online:: + This hook runs _every time a network device goes online_. + +initqueue/finished:: + If all the scripts here return success dracut exits the mainloop, _even if + some initqueue scripts have not yet run_. + To put it another way, if you want dracut to wait for something to happen, + you need a script in `initqueue/finished` that returns non-zero _until_ + the thing you're waiting for happens. + +pre-mount:: + Runs _once_ before trying to mount rootfs. + +mount:: + Each script in this hook runs in order, until one of them mounts rootfs at + `$NEWROOT`. May run multiple times. + +pre-pivot:: + This is where you (e.g.) copy files into `$NEWROOT` before switching over. + +cleanup:: + Clean up after your other hooks. + +The scripts _within_ each hook run according to the numeric priority given in +the `inst_hook` lines in `module-setup.sh`. + + + +Variable scope / sharing data between scripts +--------------------------------------------- + +Each script in a hook gets sourced by the same `bash` interpreter. If you +define a function or variable in a script, each subsequent script _in the same +hook_ can see and use it, but *it won't be visible to other hooks.* + +If you export a variable, it will be available to all subsequent scripts. You +can, of course, also share data by writing files to /tmp. + +*NOTE:* You can break _other_ modules by accidentally overwriting their +variables. Avoid the following variable names in your own code: +`root netroot updates fstype resume splash` -- 1.7.11.2

2 1

[PATCH] Source in url-lib.sh if we don't have it (#847831)
by Jesse Keating 16 Aug '12

16 Aug '12

We're going to be playing whack-a-mole here for a bit. Because each stage of dracut is now a new shell we don't have access to things sourced in previous stages. --- dracut/anaconda-ks-sendheaders.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dracut/anaconda-ks-sendheaders.sh b/dracut/anaconda-ks-sendheaders.sh index aa178ce..7bc9739 100755 --- a/dracut/anaconda-ks-sendheaders.sh +++ b/dracut/anaconda-ks-sendheaders.sh @@ -2,6 +2,7 @@ # anaconda-ks-sendheaders.sh - set various HTTP headers for kickstarting [ -f /tmp/.ks_sendheaders ] && return +command -v set_http_header >/dev/null || . /lib/url-lib.sh # inst.ks.sendmac: send MAC addresses in HTTP headers if getargbool 0 kssendmac inst.ks.sendmac; then -- 1.7.11.2

2 1

[PATCH] parse-kickstart: add proc_cmdline (fix init_logger())
by Will Woods 16 Aug '12

16 Aug '12

commit c1da5cd was originally part of an attempt to fix something else, but the other patch (which introduced proc_cmdline) was rejected on review. This adds proc_cmdline so init_logger() won't traceback. --- dracut/parse-kickstart | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index e5c9770..3c3a1ff 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -32,6 +32,22 @@ def readsysfile(f): val = "" return val +def read_cmdline(f): + '''Returns an OrderedDict containing key-value pairs from a file with + boot arguments (e.g. /proc/cmdline).''' + args = OrderedDict() + try: + lines = open(f).readlines() + except IOError: + lines = [] + for line in lines: + for arg in line.split(): + k,e,v = arg.partition("=") + args[k] = v + return args + +proc_cmdline = read_cmdline("/proc/cmdline") + # Here are the kickstart commands we care about: class Method(commands.method.F14_Method): -- 1.7.11.2

2 1

[PATCH] Remove the data/bootdisk directory tree.
by Chris Lumens 16 Aug '12

16 Aug '12

This is all handled by lorax now, and having it in two places is confusing. --- configure.ac | 6 -- data/Makefile.am | 2 +- data/bootdisk/Makefile.am | 22 ----- data/bootdisk/i386/Makefile.am | 25 ------ data/bootdisk/i386/boot.msg | 5 -- data/bootdisk/i386/grub.conf | 8 -- data/bootdisk/i386/syslinux.cfg | 33 -------- data/bootdisk/ppc/Makefile.am | 26 ------ data/bootdisk/ppc/bootinfo.txt | 169 ------------------------------------- data/bootdisk/ppc/magic | 81 ------------------ data/bootdisk/ppc/mapping | 27 ------ data/bootdisk/ppc/ofboot.b | 74 ---------------- data/bootdisk/ppc/yaboot.conf.3264 | 14 --- data/bootdisk/ppc/yaboot.conf.in | 8 -- data/bootdisk/s390x/Makefile.am | 25 ------ data/bootdisk/s390x/generic.ins | 5 -- data/bootdisk/s390x/generic.prm | 1 - data/bootdisk/s390x/redhat.exec | 9 -- data/bootdisk/sparc/Makefile.am | 25 ------ data/bootdisk/sparc/boot.msg | 9 -- data/bootdisk/sparc/silo.conf | 17 ---- data/bootdisk/x86_64/Makefile.am | 25 ------ data/bootdisk/x86_64/boot.msg | 5 -- data/bootdisk/x86_64/grub.conf | 8 -- data/bootdisk/x86_64/syslinux.cfg | 33 -------- scripts/makeupdates | 2 +- 26 files changed, 2 insertions(+), 662 deletions(-) delete mode 100644 data/bootdisk/Makefile.am delete mode 100644 data/bootdisk/i386/Makefile.am delete mode 100644 data/bootdisk/i386/boot.msg delete mode 100644 data/bootdisk/i386/grub.conf delete mode 100644 data/bootdisk/i386/syslinux.cfg delete mode 100644 data/bootdisk/ppc/Makefile.am delete mode 100644 data/bootdisk/ppc/bootinfo.txt delete mode 100644 data/bootdisk/ppc/magic delete mode 100644 data/bootdisk/ppc/mapping delete mode 100644 data/bootdisk/ppc/ofboot.b delete mode 100644 data/bootdisk/ppc/yaboot.conf.3264 delete mode 100644 data/bootdisk/ppc/yaboot.conf.in delete mode 100644 data/bootdisk/s390x/Makefile.am delete mode 100644 data/bootdisk/s390x/generic.ins delete mode 100644 data/bootdisk/s390x/generic.prm delete mode 100644 data/bootdisk/s390x/redhat.exec delete mode 100644 data/bootdisk/sparc/Makefile.am delete mode 100644 data/bootdisk/sparc/boot.msg delete mode 100644 data/bootdisk/sparc/silo.conf delete mode 100644 data/bootdisk/x86_64/Makefile.am delete mode 100644 data/bootdisk/x86_64/boot.msg delete mode 100644 data/bootdisk/x86_64/grub.conf delete mode 100644 data/bootdisk/x86_64/syslinux.cfg diff --git a/configure.ac b/configure.ac index a39a168..a31d480 100644 --- a/configure.ac +++ b/configure.ac @@ -250,12 +250,6 @@ AC_CONFIG_SUBDIRS([widgets]) AC_CONFIG_FILES([Makefile data/Makefile - data/bootdisk/Makefile - data/bootdisk/i386/Makefile - data/bootdisk/ppc/Makefile - data/bootdisk/sparc/Makefile - data/bootdisk/s390x/Makefile - data/bootdisk/x86_64/Makefile data/command-stubs/Makefile docs/Makefile dracut/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 18e165f..deca2e4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,7 +17,7 @@ # # Author: Martin Sivak <msivak(a)redhat.com> -SUBDIRS = bootdisk command-stubs icons liveinst pixmaps systemd post-scripts +SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts EXTRA_DIST = lang-table CLEANFILES = *~ lang-names diff --git a/data/bootdisk/Makefile.am b/data/bootdisk/Makefile.am deleted file mode 100644 index e6ba4bd..0000000 --- a/data/bootdisk/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# bootdisk/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: David Cantrell <dcantrell(a)redhat.com> - -SUBDIRS = i386 ppc sparc s390x x86_64 - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/i386/Makefile.am b/data/bootdisk/i386/Makefile.am deleted file mode 100644 index 030b8d5..0000000 --- a/data/bootdisk/i386/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# bootdisk/i386/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: David Cantrell <dcantrell(a)redhat.com> - -if IS_I386 -bootdir = $(datadir)/$(PACKAGE_NAME)/boot -dist_boot_DATA = boot.msg grub.conf syslinux.cfg -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/i386/boot.msg b/data/bootdisk/i386/boot.msg deleted file mode 100644 index ff54899..0000000 --- a/data/bootdisk/i386/boot.msg +++ /dev/null @@ -1,5 +0,0 @@ - -splash.lss - - - Press the 01<ENTER>07 key to begin the installation process. - diff --git a/data/bootdisk/i386/grub.conf b/data/bootdisk/i386/grub.conf deleted file mode 100644 index 6e94d05..0000000 --- a/data/bootdisk/i386/grub.conf +++ /dev/null @@ -1,8 +0,0 @@ -#debug --graphics -default=0 -splashimage=@SPLASHPATH@ -timeout 5 -hiddenmenu -title @PRODUCT@ @VERSION@ - kernel @KERNELPATH@ - initrd @INITRDPATH@ diff --git a/data/bootdisk/i386/syslinux.cfg b/data/bootdisk/i386/syslinux.cfg deleted file mode 100644 index 5421484..0000000 --- a/data/bootdisk/i386/syslinux.cfg +++ /dev/null @@ -1,33 +0,0 @@ -default linux -prompt 1 -timeout 600 - -display boot.msg - -menu background splash.jpg -menu title Welcome to @PRODUCT@ @VERSION@! -menu color border 0 #ffffffff #00000000 -menu color sel 7 #ffffffff #ff000000 -menu color title 0 #ffffffff #00000000 -menu color tabmsg 0 #ffffffff #00000000 -menu color unsel 0 #ffffffff #00000000 -menu color hotsel 0 #ff000000 #ffffffff -menu color hotkey 7 #ffffffff #ff000000 -menu color scrollbar 0 #ffffffff #00000000 - -label linux - menu label ^Install a new system or upgrade an existing system - menu default - kernel vmlinuz - append initrd=initrd.img quiet -label vesa - menu label Install system with ^basic video driver - kernel vmlinuz - append initrd=initrd.img xdriver=vesa nomodeset quiet -label rescue - menu label ^Rescue installed system - kernel vmlinuz - append initrd=initrd.img rescue quiet -label local - menu label Boot from ^local drive - localboot 0xffff diff --git a/data/bootdisk/ppc/Makefile.am b/data/bootdisk/ppc/Makefile.am deleted file mode 100644 index 4f6e298..0000000 --- a/data/bootdisk/ppc/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# bootdisk/ppc/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: David Cantrell <dcantrell(a)redhat.com> - -if IS_PPC -bootdir = $(datadir)/$(PACKAGE_NAME)/boot -dist_boot_DATA = magic ofboot.b yaboot.conf.in bootinfo.txt mapping \ - yaboot.conf.3264 -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/ppc/bootinfo.txt b/data/bootdisk/ppc/bootinfo.txt deleted file mode 100644 index ac766d4..0000000 --- a/data/bootdisk/ppc/bootinfo.txt +++ /dev/null @@ -1,169 +0,0 @@ -<chrp-boot> <description>Linux</description> -<os-name>Linux</os-name> -<boot-script>boot &device;:\ppc\chrp\yaboot</boot-script> -<icon size=64,64 color-space=3,3,2> -<bitmap> FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 </bitmap> </icon> </chrp-boot> diff --git a/data/bootdisk/ppc/magic b/data/bootdisk/ppc/magic deleted file mode 100644 index 387727c..0000000 --- a/data/bootdisk/ppc/magic +++ /dev/null @@ -1,81 +0,0 @@ -# -# Example magic file for mkhybrid -# -# The "message" for the offset MUST be 4 characters for the CREATOR -# and 4 characters for the TYPE - white space is optional between them. -# Any other characters on this line are ignored. Continuation lines (starting -# with '>') are also ignored i.e. only the initial offset lines are used. -# -# The continuation lines are given here, but they do not need to exist. - -# -# James Pearson 20/5/98 - -# off type test message - -# GIF -0 string GIF8 8BIM GIFf ->4 string 7a \b, version 8%s, ->4 string 9a \b, version 8%s, ->6 leshort >0 %hd x ->8 leshort >0 %hd, -#>10 byte &0x80 color mapped, -#>10 byte&0x07 =0x00 2 colors -#>10 byte&0x07 =0x01 4 colors -#>10 byte&0x07 =0x02 8 colors -#>10 byte&0x07 =0x03 16 colors -#>10 byte&0x07 =0x04 32 colors -#>10 byte&0x07 =0x05 64 colors -#>10 byte&0x07 =0x06 128 colors -#>10 byte&0x07 =0x07 256 colors - -# JPEG images -# -0 ubeshort 0xffd8 8BIM JPEG image data - -# StuffIt -# -0 string SIT! SIT!SIT! - -# standard unix compress -0 string \037\235 LZIV ZIVU ->2 byte&0x80 >0 block compressed ->2 byte&0x1f x %d bits - -# gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver) -0 string \037\213 GNUz ZIVU gzip compressed data ->2 byte <8 \b, reserved method, ->2 byte 8 \b, deflated, ->3 byte &0x01 ASCII, ->3 byte &0x02 continuation, ->3 byte &0x04 extra field, ->3 byte &0x08 original filename, ->3 byte &0x10 comment, ->3 byte &0x20 encrypted, ->4 ledate x last modified: %s, ->8 byte 2 max compression, ->8 byte 4 max speed, ->9 byte =0x00 os: MS-DOS ->9 byte =0x01 os: Amiga ->9 byte =0x02 os: VMS ->9 byte =0x03 os: Unix ->9 byte =0x05 os: Atari ->9 byte =0x06 os: OS/2 ->9 byte =0x07 os: MacOS ->9 byte =0x0A os: Tops/20 ->9 byte =0x0B os: Win/32 - -# Postscript -0 string %! ASPSTEXT ->2 string PS-Adobe- conforming ->>11 string >\0 at level %.3s ->>>15 string EPS - type %s ->>>15 string Query - type %s ->>>15 string ExitServer - type %s -# Some PCs have the annoying habit of adding a ^D as a document separator -0 string \004%! ASPS TEXT PostScript document text ->3 string PS-Adobe- conforming ->>12 string >\0 at level %.3s ->>>16 string EPS - type %s ->>>16 string Query - type %s ->>>16 string ExitServer - type %s diff --git a/data/bootdisk/ppc/mapping b/data/bootdisk/ppc/mapping deleted file mode 100644 index cf83076..0000000 --- a/data/bootdisk/ppc/mapping +++ /dev/null @@ -1,27 +0,0 @@ -# Example filename mapping file -# -# yaboot Raw 'UNIX' 'boot' "Bootstrap" -# vmlinux Raw 'UNIX' 'boot' "Bootstrap" -# -# EXTN XLate CREATOR TYPE Comment -COPYING Ascii 'ttxt' 'ttro' "Text File" -CREDITS Ascii 'ttxt' 'ttro' "Text File" -README Ascii 'ttxt' 'ttro' "Text File" -RPM-GPG-KEY Ascii 'ttxt' 'ttro' "Text File" -RELEASE_NOTES Ascii 'ttxt' 'ttro' "Text File" -.b Raw 'chrp' 'tbxi' "Macintosh Toolbox ROM file" -.gif Raw '8BIM' 'GIFf' "Gif File" -.jpg Raw '8BIM' 'JPEG' "Jpeg File" -.tif Raw '8BIM' 'TIFF' "Photoshop TIFF image" -.hqx Ascii 'BnHq' 'TEXT' "BinHex file" -.doc Raw 'MSWD' 'WDBN' "Word file" -.mov Raw 'TVOD' 'MooV' "QuickTime Movie" -.html Ascii 'MOSS' 'TEXT' "HTML File" -.htm Ascii 'MOSS' 'TEXT' "HTML File" -.conf Ascii 'ttxt' 'TEXT' "config file" -.txt Ascii 'ttxt' 'TEXT' "Text File" -.tbxi Raw 'chrp' 'tbxi' "Macintosh Toolbox ROM file" -.sea Raw 'aust' 'APPL' "Self Expanding Archive" -.sit Raw 'SIT!' 'SITD' "Stuffit Expander file" -* Raw '????' '????' "Unknown" - diff --git a/data/bootdisk/ppc/ofboot.b b/data/bootdisk/ppc/ofboot.b deleted file mode 100644 index c811894..0000000 --- a/data/bootdisk/ppc/ofboot.b +++ /dev/null @@ -1,74 +0,0 @@ -<CHRP-BOOT> -<COMPATIBLE> -MacRISC MacRISC3 MacRISC4 -</COMPATIBLE> - -<DESCRIPTION> -Boot Chooser -</DESCRIPTION> - -<BOOT-SCRIPT> -" screen" output -load-base release-load-area -" /cpus/@0" find-package if - " 64-bit" rot get-package-property 0= if - 2drop - " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc64\yaboot.conf" eval - else - " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc32\yaboot.conf" eval - then -then -</BOOT-SCRIPT> - -<OS-BADGE-ICONS> -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 -</OS-BADGE-ICONS> -</CHRP-BOOT> diff --git a/data/bootdisk/ppc/yaboot.conf.3264 b/data/bootdisk/ppc/yaboot.conf.3264 deleted file mode 100644 index 8b5af08..0000000 --- a/data/bootdisk/ppc/yaboot.conf.3264 +++ /dev/null @@ -1,14 +0,0 @@ -init-message = "\nWelcome to the %PRODUCT% %VERSION% installer!\nUse 'linux32' for 32-bit kernel.\n\n" -timeout=6000 -default=linux - -image=/ppc/ppc64/vmlinuz - label=linux64 - alias=linux - initrd=/ppc/ppc64/ramdisk.image.gz - read-only - -image=/ppc/ppc32/vmlinuz - label=linux32 - initrd=/ppc/ppc32/ramdisk.image.gz - read-only diff --git a/data/bootdisk/ppc/yaboot.conf.in b/data/bootdisk/ppc/yaboot.conf.in deleted file mode 100644 index d06768a..0000000 --- a/data/bootdisk/ppc/yaboot.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -init-message = "\nWelcome to the %BITS%-bit %PRODUCT% %VERSION% installer!\nHit <TAB> for boot options.\n\n" -timeout=6000 -default=linux - -image=/ppc/ppc%BITS%/vmlinuz - label=linux - initrd=/ppc/ppc%BITS%/ramdisk.image.gz - read-only diff --git a/data/bootdisk/s390x/Makefile.am b/data/bootdisk/s390x/Makefile.am deleted file mode 100644 index c75ccbe..0000000 --- a/data/bootdisk/s390x/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# bootdisk/s390x/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: David Cantrell <dcantrell(a)redhat.com> - -if IS_S390 -bootdir = $(datadir)/$(PACKAGE_NAME)/boot -dist_boot_DATA = generic.ins generic.prm redhat.exec -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/s390x/generic.ins b/data/bootdisk/s390x/generic.ins deleted file mode 100644 index a690f2e..0000000 --- a/data/bootdisk/s390x/generic.ins +++ /dev/null @@ -1,5 +0,0 @@ -* minimal lpar ins file -images/kernel.img 0x00000000 -images/initrd.img @INITRD_LOAD_ADDRESS@ -images/generic.prm 0x00010480 -images/initrd.addrsize 0x00010408 diff --git a/data/bootdisk/s390x/generic.prm b/data/bootdisk/s390x/generic.prm deleted file mode 100644 index e953ce2..0000000 --- a/data/bootdisk/s390x/generic.prm +++ /dev/null @@ -1 +0,0 @@ -root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009 diff --git a/data/bootdisk/s390x/redhat.exec b/data/bootdisk/s390x/redhat.exec deleted file mode 100644 index f1e5931..0000000 --- a/data/bootdisk/s390x/redhat.exec +++ /dev/null @@ -1,9 +0,0 @@ -/* */ -'CL RDR' -'PURGE RDR ALL' -'SPOOL PUNCH * RDR' -'PUNCH KERNEL IMG A (NOH' -'PUNCH GENERIC PRM A (NOH' -'PUNCH INITRD IMG A (NOH' -'CH RDR ALL KEEP NOHOLD' -'I 00C' diff --git a/data/bootdisk/sparc/Makefile.am b/data/bootdisk/sparc/Makefile.am deleted file mode 100644 index 4d2c3f2..0000000 --- a/data/bootdisk/sparc/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# bootdisk/sparc/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: Dennis Gilmore <dgilmore(a)redhat.com> - -if IS_SPARC -bootdir = $(datadir)/$(PACKAGE_NAME)/boot -dist_boot_DATA = boot.msg silo.conf -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/sparc/boot.msg b/data/bootdisk/sparc/boot.msg deleted file mode 100644 index b28310e..0000000 --- a/data/bootdisk/sparc/boot.msg +++ /dev/null @@ -1,9 +0,0 @@ -[H[J - Welcome to Fedora SPARC Linux! - - - To install or upgrade in graphical mode, press the [7m<ENTER>[m key. - - - To install or upgrade in text mode, type: [7mlinux text <ENTER>[m. - - - To enter rescue mode] type: [7mlinux resuce <ENTER>[m. - diff --git a/data/bootdisk/sparc/silo.conf b/data/bootdisk/sparc/silo.conf deleted file mode 100644 index 285546f..0000000 --- a/data/bootdisk/sparc/silo.conf +++ /dev/null @@ -1,17 +0,0 @@ -partition=1 -default=linux -read-write -timeout=100 -message=/boot/boot.msg -image[sun4u]=/boot/vmlinuz - label=linux - alias=install - initrd=/boot/initrd.img -image[sun4u]=/boot/vmlinuz - label=text - append=text - initrd=/boot/initrd.img -image[sun4u]=/boot/vmlinuz - label=ks - append=ks - initrd=/boot/initrd.img diff --git a/data/bootdisk/x86_64/Makefile.am b/data/bootdisk/x86_64/Makefile.am deleted file mode 100644 index a4012c5..0000000 --- a/data/bootdisk/x86_64/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# bootdisk/x86_64/Makefile.am for anaconda -# -# Copyright (C) 2009 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author: David Cantrell <dcantrell(a)redhat.com> - -if IS_X86_64 -bootdir = $(datadir)/$(PACKAGE_NAME)/boot -dist_boot_DATA = boot.msg grub.conf syslinux.cfg -endif - -MAINTAINERCLEANFILES = Makefile.in diff --git a/data/bootdisk/x86_64/boot.msg b/data/bootdisk/x86_64/boot.msg deleted file mode 100644 index ff54899..0000000 --- a/data/bootdisk/x86_64/boot.msg +++ /dev/null @@ -1,5 +0,0 @@ - -splash.lss - - - Press the 01<ENTER>07 key to begin the installation process. - diff --git a/data/bootdisk/x86_64/grub.conf b/data/bootdisk/x86_64/grub.conf deleted file mode 100644 index 6e94d05..0000000 --- a/data/bootdisk/x86_64/grub.conf +++ /dev/null @@ -1,8 +0,0 @@ -#debug --graphics -default=0 -splashimage=@SPLASHPATH@ -timeout 5 -hiddenmenu -title @PRODUCT@ @VERSION@ - kernel @KERNELPATH@ - initrd @INITRDPATH@ diff --git a/data/bootdisk/x86_64/syslinux.cfg b/data/bootdisk/x86_64/syslinux.cfg deleted file mode 100644 index 5421484..0000000 --- a/data/bootdisk/x86_64/syslinux.cfg +++ /dev/null @@ -1,33 +0,0 @@ -default linux -prompt 1 -timeout 600 - -display boot.msg - -menu background splash.jpg -menu title Welcome to @PRODUCT@ @VERSION@! -menu color border 0 #ffffffff #00000000 -menu color sel 7 #ffffffff #ff000000 -menu color title 0 #ffffffff #00000000 -menu color tabmsg 0 #ffffffff #00000000 -menu color unsel 0 #ffffffff #00000000 -menu color hotsel 0 #ff000000 #ffffffff -menu color hotkey 7 #ffffffff #ff000000 -menu color scrollbar 0 #ffffffff #00000000 - -label linux - menu label ^Install a new system or upgrade an existing system - menu default - kernel vmlinuz - append initrd=initrd.img quiet -label vesa - menu label Install system with ^basic video driver - kernel vmlinuz - append initrd=initrd.img xdriver=vesa nomodeset quiet -label rescue - menu label ^Rescue installed system - kernel vmlinuz - append initrd=initrd.img rescue quiet -label local - menu label Boot from ^local drive - localboot 0xffff diff --git a/scripts/makeupdates b/scripts/makeupdates index 8145fb1..0d5ccea 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -166,7 +166,7 @@ def copyUpdatedFiles(tag, updates, cwd): fields = file.split('/') subdir = fields[0] if subdir in ['po', 'scripts','command-stubs', 'tests', - 'bootdisk', 'docs', 'fonts', 'utils', + 'docs', 'fonts', 'utils', 'liveinst', 'dracut', 'data']: continue else: -- 1.7.11.2

2 1

[PATCH] Load anaconda-lib.sh if necessary
by Jesse Keating 16 Aug '12

16 Aug '12

For some reason right now this library is not being imported at the time repo-genrules.sh is being ran, so add a stub that forces the import since we need the $rulesfile variable. --- dracut/repo-genrules.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dracut/repo-genrules.sh b/dracut/repo-genrules.sh index 558435c..56ce928 100755 --- a/dracut/repo-genrules.sh +++ b/dracut/repo-genrules.sh @@ -2,6 +2,9 @@ # generate udev rules for handling anaconda-specific root devices # (just the disk-based ones - the network ones are done by netroot) +# see if we need anaconda-lib.sh +command -v unpack_updates_img >/dev/null || . /lib/anaconda-lib.sh + case "$root" in anaconda-disk:*) # anaconda-disk:<device>[:<path>] -- 1.7.11.2

3 2

[PATCH 1/2] Force authconfig to be installed on the target system (#848803).
by Chris Lumens 16 Aug '12

16 Aug '12

--- pyanaconda/install.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 805a5c5..a2f54c3 100644 --- a/pyanaconda/install.py +++ b/pyanaconda/install.py @@ -62,7 +62,12 @@ def doInstall(storage, payload, ksdata, instClass): turnOnFilesystems(storage) # Do packaging. - payload.preInstall(packages=storage.packages, groups=payload.languageGroups(ksdata.lang.lang)) + + # anaconda requires storage packages in order to make sure the target + # system is bootable and configurable, and some other packages in order + # to finish setting up the system. + packages = storage.packages + ["authconfig", "system-config-firewall-base"] + payload.preInstall(packages=packages, groups=payload.languageGroups(ksdata.lang.lang)) payload.install() with progress_report(_("Performing post-install setup tasks")): -- 1.7.11.2

2 2

[PATCH] remove cleanup of some essential libraries
by Brian C. Lane 16 Aug '12

16 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> Gtk uses a number of the xcb-* libraries, and libXxf86vm. libpcre is needed by grep ldd is useful in figuring out what libraries are missing. --- share/runtime-cleanup.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 06d7425..9f34133 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -58,7 +58,7 @@ removefrom isomd5sum --allbut /usr/bin/checkisomd5 ## various other things we remove to save space removepkg avahi-autoipd coreutils-libs curl dash db4-utils diffutils file removepkg fipscheck genisoimage gnome-python2 info iptables -removepkg jasper-libs libIDL libXt libXxf86misc libXxf86vm +removepkg jasper-libs libXt libXxf86misc removepkg libasyncns libdaemon libhbaapi libhbalinux removepkg libmcpp libpcap libtiff libutempter linux-atm-libs removepkg lvm2-libs m4 mailx makebootfat mcpp @@ -203,7 +203,7 @@ removefrom glibc /${libdir}/libnss_hesiod* /${libdir}/libnss_nis* removefrom glibc /${libdir}/libthread* /${libdir}/rtkaio* /sbin/* removefrom glibc /usr/libexec/* /usr/sbin/* removefrom glibc-common /etc/* /usr/bin/catchsegv /usr/bin/gencat -removefrom glibc-common /usr/bin/getconf /usr/bin/getent /usr/bin/ldd +removefrom glibc-common /usr/bin/getconf /usr/bin/getent removefrom glibc-common /usr/bin/locale /usr/bin/rpcgen /usr/bin/sprof removefrom glibc-common /usr/bin/tzselect /usr/bin/localedef removefrom glibc-common /usr/libexec/* /usr/sbin/* @@ -255,7 +255,6 @@ removefrom libstdc++ /usr/share/* removefrom libthai /usr/share/libthai/* removefrom libuser /usr/bin/* /usr/sbin/* /usr/share/locale/* removefrom libvorbis /usr/${libdir}/libvorbisenc.* -removefrom libxcb /usr/${libdir}/libxcb-* removefrom libxml2 /usr/bin/* removefrom libxml2-python /usr/${libdir}/python?.?/site-packages/libxml2mod.a removefrom libxml2-python /usr/${libdir}/python?.?/site-packages/libxml2mod.la @@ -299,7 +298,6 @@ removefrom openssh-server /etc/ssh/* /usr/${libdir}/* /usr/libexec/* removefrom openssl /etc/pki/* /usr/bin/* /usr/${libdir}/openssl/* removefrom pam /usr/sbin/* /usr/share/locale/* removefrom pciutils /usr/sbin/* -removefrom pcre /usr/bin/* /usr/${libdir}/* removefrom policycoreutils /etc/* /usr/bin/* /usr/share/locale/* removefrom polkit /usr/bin/* removefrom polkit-desktop-policy /var/lib/* -- 1.7.11.2

2 1

[master] Two little tweaks
by Vratislav Podzimek 16 Aug '12

16 Aug '12

PATCH 1/2 is a simple patch that prevents a traceback that can hardly be seen. PATCH 2/2 removes one unneeded dependency (not tested). Vratislav Podzimek (2): Don't rely on having some network devices available Remove isomd5sum-static from build requires anaconda.spec.in | 2 -- configure.ac | 4 ---- pyanaconda/ui/gui/spokes/network.py | 4 +++- 3 files changed, 3 insertions(+), 7 deletions(-) -- 1.7.11.2

2 3

[PATCH] check the armPlatform flag before we initialise the anaconda object otherwise the running system is used
by Dennis Gilmore 15 Aug '12

15 Aug '12

--- anaconda | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anaconda b/anaconda index a6bb720..a4baa53 100755 --- a/anaconda +++ b/anaconda @@ -703,6 +703,11 @@ if __name__ == "__main__": import gettext _ = lambda x: gettext.ldgettext("anaconda", x) + # we need to ensure that we set the flag for overriding the arm platform + # before we initialise Anaconda and detect the running system + if opts.armPlatform: + flags.armPlatform = opts.armPlatform + from pyanaconda import Anaconda anaconda = Anaconda() iutil.setup_translations(gettext) @@ -781,9 +786,6 @@ if __name__ == "__main__": if opts.targetArch: flags.targetarch = opts.targetArch - if opts.armPlatform: - flags.armPlatform = opts.armPlatform - # set flags flags.dmraid = opts.dmraid flags.mpath = opts.mpath -- 1.7.11.2

3 3

[PATCH lorax/master] Add a command line option to override the ARM platform.
by d.marlin 15 Aug '12

15 Aug '12

From: "d.marlin" <dmarlin(a)redhat.com> Passed on to anaconda to make ARM images where the compose hardware does not match the target hardware. This patch from Dennis Gilmore was rebased to current lorax master and the option name changed to match the option in Anaconda. I have applied this to lorax-17.26 and successfully tested it using livemedia-creator. Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- src/sbin/livemedia-creator | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 4a37b59..e781b8e 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -577,6 +577,9 @@ if __name__ == '__main__': parser.add_argument( "--anaconda-arg", action="append", dest="anaconda_args", help="Additional argument to pass to anaconda (no-virt " "mode). Pass once for each argument" ) + parser.add_argument( "--armplatform", + help="the platform to use when creating images for ARM, " + "i.e., highbank, mvebu, omap, tegra, etc." ) parser.add_argument( "--logfile", default="./livemedia.log", type=os.path.abspath, @@ -742,6 +745,8 @@ if __name__ == '__main__': anaconda_args += arg.split(" ", 1) if opts.proxy: anaconda_args += [ "--proxy", opts.proxy ] + if opts.armplatform: + anaconda_args += [ "--armplatform", opts.armplatform ] # Use anaconda's image install install_error = anaconda_install( disk_img, disk_size, opts.ks[0], -- 1.7.10.2

2 1

[PATCH] don't set armMachine in class definition
by Brian C. Lane 15 Aug '12

15 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> armMachine can be set from the cmdline, via flags.armPlatform, so it needs to wait until instantiated before calling iutil.getARMMachine --- pyanaconda/platform.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index 6ec0037..127844e 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -335,7 +335,7 @@ class Sparc(Platform): return start+1 class ARM(Platform): - _armMachine = iutil.getARMMachine() + _armMachine = None _bootloaderClass = bootloader.GRUB2 _boot_stage1_device_types = ["disk"] _boot_mbr_description = N_("Master Boot Record") @@ -346,6 +346,8 @@ class ARM(Platform): @property def armMachine(self): + if not self._armMachine: + self._armMachine = iutil.getARMMachine() return self._armMachine def getPlatform(): -- 1.7.11.2

1 0

[rhel6/master] verify package checksums against metadata (#681224)
by Brian C. Lane 15 Aug '12

15 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> Anaconda uses yum's getPackage() function to grab packages. It needs to have a function passed to it in order to verify the package checksum against the metadata. Resolves: rhbz#681224 --- yuminstall.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yuminstall.py b/yuminstall.py index 61a0b65..57f826a 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -177,7 +177,8 @@ class AnacondaCallback: while self.openfile is None: trynumber += 1 try: - fn = repo.getPackage(po) + checkfunc = (self.ayum.verifyPkg, (po, 1), {}) + fn = repo.getPackage(po, checkfunc=checkfunc) f = open(fn, 'r') self.openfile = f @@ -185,6 +186,9 @@ class AnacondaCallback: self.ayum._handleFailure(po, trynumber) except IOError: self.ayum._handleFailure(po, trynumber) + except URLGrabError as e: + log.error("URLGrabError: %s" % (e,)) + self.ayum._handleFailure(po, trynumber) except yum.Errors.RepoError, e: continue self.inProgressPo = po -- 1.7.11.2

3 4

[PATCH] Update soname for libudev
by Jesse Keating 15 Aug '12

15 Aug '12

Why is this hard coded? Anyway without bumping this to 1 we get a traceback when trying to import pyudev. --- pyanaconda/pyudev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/pyudev.py b/pyanaconda/pyudev.py index 4b5d586..d5e5ece 100644 --- a/pyanaconda/pyudev.py +++ b/pyanaconda/pyudev.py @@ -31,7 +31,7 @@ def find_library(name, somajor=0): return None # find the udev library -libudev = find_library(name="udev", somajor=0) +libudev = find_library(name="udev", somajor=1) if not libudev or not os.path.exists(libudev): raise ImportError, "No library named %s" % libudev -- 1.7.11.2

2 1

[lorax] Don't remove krb5-libs (#848227)
by Martin Gracik 15 Aug '12

15 Aug '12

Anaconda needs it. --- share/runtime-cleanup.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 15d1e32..06d7425 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -230,7 +230,6 @@ removefrom initscripts /etc/ppp/* /usr/sbin/* /usr/share/locale/* removefrom iproute --allbut /usr/sbin/{ip,routef,routel,rtpr} removefrom iscsi-initiator-utils /etc/rc.d/* removefrom kbd --allbut */bin/{dumpkeys,kbd_mode,loadkeys,setfont,unicode_*,chvt} -removefrom krb5-libs /etc/* /${libdir}/libgssrpc* /usr/${libdir}/* removefrom less /etc/* removefrom libX11-common /usr/share/X11/XErrorDB removefrom libbonobo /etc/* /usr/bin/* /usr/sbin/* /usr/share/locale/* -- 1.7.9.5

2 1

Text mode patches, take 2
by Jesse Keating 14 Aug '12

14 Aug '12

A couple of these patches you've already seen, this time they add entries to POTFILES.in. Patch 3 corrects the completed property for the timezone spoke. Patch 4 prevents the summery hub from continuing on until all the spokes are considered "complete". Patch 5 updates the prompt so that users know that "c" is for continue. Patch 6 enables text mode once again, by passing "text" or "cmdline" at the boot prompt. cmdline is still not hooked into the noprompt thing, and I don't know what happens if you try to kickstart install in text mode. But this gets us partly to a real text mode for F18. -jlk

2 7

[PATCH] Use shell code to work around missing basename
by Jesse Keating 14 Aug '12

14 Aug '12

Basename got removed from dracut land. This was our only use of it so use shell built ins to accomplish the same thing. Sadly you cannot strip both prefix and suffix at the same time, so take a two step approach. --- dracut/anaconda-modprobe.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dracut/anaconda-modprobe.sh b/dracut/anaconda-modprobe.sh index 20f173f..a14d27a 100644 --- a/dracut/anaconda-modprobe.sh +++ b/dracut/anaconda-modprobe.sh @@ -7,7 +7,10 @@ MODULE_LIST="cramfs squashfs iscsi_tcp " SCSI_MODULES=/lib/modules/$KERNEL/kernel/drivers/scsi/device_handler/ for m in $SCSI_MODULES/*.ko; do - MODULE_LIST+=" `basename $m .ko` " + # Shell spew to work around not having basename + # Trim the paths off the prefix, then the . suffix + a="${m##*/}" + MODULE_LIST+=" ${a%*.}" done if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then -- 1.7.11.2

2 1

[PATCH 1/5] Add the user-agent to urlgrabber from the old yuminstall.py.
by Chris Lumens 14 Aug '12

14 Aug '12

--- pyanaconda/packaging/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 4d56bfa..4dee79e 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -53,6 +53,10 @@ log = logging.getLogger("packaging") from pyanaconda.errors import * #from pyanaconda.progress import progress +from pyanaconda.product import productName, productVersion +import urlgrabber +urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(productName, productVersion) + ### ### ERROR HANDLING ### -- 1.7.11.2

3 8

Text mode patches
by Jesse Keating 14 Aug '12

14 Aug '12

Patch 1 adds a storage spoke. I've tested it in kvm and it mostly works. It sets completed or not based on existence of errors from the sanity check, but right now the text summary hub doesn't seem to care about continuation when there are incomplete spokes. That will be fixed soon. Second patch is a progress hub to actually do the install. Also tested in kvm, surely some errors are hidden but it mostly works. -jlk

2 4

[PATCH] Prevent yum messages from showing on tty
by Jesse Keating 14 Aug '12

14 Aug '12

This is a hammer. A more subtle fix could be done to tie into yum's logging infrastructure and do something sensible with it. --- pyanaconda/packaging/yumpayload.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index f6f940a..7695bad 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -182,6 +182,12 @@ class YumPayload(PackagePayload): # set this now to the best default we've got ; we'll update it if/when # we get a base repo set up self._yum.preconf.releasever = self._getReleaseVersion(None) + # Hammer the yum logs to nothing, we log around yum. This is + # to prevent stuff from leaking to the screen. Need a less hammer + # approach to this so that we could have rich yum logs but clean + # screens + self._yum.preconf.debuglevel = 0 + self._yum.preconf.errorlevel = 0 self.txID = None -- 1.7.11.2

2 1

[PATCH] Deprecate the 'cmdline' command
by Jesse Keating 14 Aug '12

14 Aug '12

For now make it set text mode instead of erroring. --- pykickstart/commands/displaymode.py | 33 +++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 12 ++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/pykickstart/commands/displaymode.py b/pykickstart/commands/displaymode.py index 6a12d58..fc8fb12 100644 --- a/pykickstart/commands/displaymode.py +++ b/pykickstart/commands/displaymode.py @@ -66,3 +66,36 @@ class FC3_DisplayMode(KickstartCommand): self.displayMode = DISPLAY_MODE_TEXT return self + +class F18_DisplayMode(FC3_DisplayMode): + removedKeywords = FC3_DisplayMode.removedKeywords + removedAttrs = FC3_DisplayMode.removedAttrs + + def __str__(self): + retval = KickstartCommand.__str__(self) + + if self.displayMode is None: + return retval + + if self.displayMode in [DISPLAY_MODE_CMDLINE, DISPLAY_MODE_TEXT]: + retval += "# Use text mode install\ntext\n" + elif self.displayMode == DISPLAY_MODE_GRAPHICAL: + retval += "# Use graphical install\ngraphical\n" + + return retval + + def parse(self, args): + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + + if len(extra) > 0: + raise KickstartParseError, formatErrorMsg(self.lineno, msg=_("Kickstart command %s does not take any arguments") % self.currentCmd) + + if self.currentCmd == "cmdline": + warnings.warn(_("Deprecated option on line %s: The cmdline is deprecated, text mode will be used. In future releases, this will result in a fatal error from kickstart. Please modify your kickstart file to remove any options.") % self.lineno, DeprecationWarning) + self.displayMode = DISPLAY_MODE_TEXT + elif self.currentCmd == "graphical": + self.displayMode = DISPLAY_MODE_GRAPHICAL + elif self.currentCmd == "text": + self.displayMode = DISPLAY_MODE_TEXT + + return self diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 6ffaff0..e9c40ac 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -894,7 +894,7 @@ commandMap = { "btrfs": btrfs.F17_BTRFS, "cdrom": method.F14_Method, "clearpart": clearpart.F17_ClearPart, - "cmdline": displaymode.FC3_DisplayMode, + "cmdline": displaymode.F18_DisplayMode, "device": device.F8_Device, "deviceprobe": deviceprobe.FC3_DeviceProbe, "dmraid": dmraid.FC6_DmRaid, @@ -902,7 +902,7 @@ commandMap = { "fcoe": fcoe.F13_Fcoe, "firewall": firewall.F14_Firewall, "firstboot": firstboot.FC3_Firstboot, - "graphical": displaymode.FC3_DisplayMode, + "graphical": displaymode.F18_DisplayMode, "group": group.F12_Group, "halt": reboot.F18_Reboot, "harddrive": method.F14_Method, @@ -931,7 +931,7 @@ commandMap = { "shutdown": reboot.F18_Reboot, "skipx": skipx.FC3_SkipX, "sshpw": sshpw.F13_SshPw, - "text": displaymode.FC3_DisplayMode, + "text": displaymode.F18_DisplayMode, "timezone": timezone.F18_Timezone, "updates": updates.F7_Updates, "upgrade": upgrade.F11_Upgrade, @@ -1173,7 +1173,7 @@ commandMap = { "bootloader": bootloader.F17_Bootloader, "cdrom": method.F14_Method, "clearpart": clearpart.FC3_ClearPart, - "cmdline": displaymode.FC3_DisplayMode, + "cmdline": displaymode.F18_DisplayMode, "device": device.F8_Device, "deviceprobe": deviceprobe.FC3_DeviceProbe, "dmraid": dmraid.FC6_DmRaid, @@ -1181,7 +1181,7 @@ commandMap = { "fcoe": fcoe.F13_Fcoe, "firewall": firewall.F14_Firewall, "firstboot": firstboot.FC3_Firstboot, - "graphical": displaymode.FC3_DisplayMode, + "graphical": displaymode.F18_DisplayMode, "group": group.F12_Group, "halt": reboot.FC6_Reboot, "harddrive": method.F14_Method, @@ -1210,7 +1210,7 @@ commandMap = { "shutdown": reboot.FC6_Reboot, "skipx": skipx.FC3_SkipX, "sshpw": sshpw.F13_SshPw, - "text": displaymode.FC3_DisplayMode, + "text": displaymode.F18_DisplayMode, "timezone": timezone.FC6_Timezone, "updates": updates.F7_Updates, "upgrade": upgrade.F11_Upgrade, -- 1.7.11.2

3 4

[PATCH] Only setup python-meh when doing graphical installs
by Jesse Keating 14 Aug '12

14 Aug '12

Exception handling in text mode is a "maybe" in the far future, but for now we want to actually see the traceback so that the user has some clue what happened. --- anaconda | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anaconda b/anaconda index 1ad68a6..a6bb720 100755 --- a/anaconda +++ b/anaconda @@ -916,9 +916,11 @@ if __name__ == "__main__": anaconda.storage.setupDiskImages() anaconda.simpleFilter = True - # comment out the next line to make exceptions non-fatal - from pyanaconda.exception import initExceptionHandling - anaconda.mehConfig = initExceptionHandling(anaconda) + + if anaconda.displayMode == 'g': + # comment out the next line to make exceptions non-fatal + from pyanaconda.exception import initExceptionHandling + anaconda.mehConfig = initExceptionHandling(anaconda) # add our own additional signal handlers signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState()) -- 1.7.11.2

2 2

[PATCH] Add text entry and completion to the city combobox
by Vratislav Podzimek 14 Aug '12

14 Aug '12

This patch modifies the city combobox on the DatetimeSpoke to facilitate timezone selection in the regions with many cities (timezones). Video preview can be seen at: http://vpodzime.fedorapeople.org/DatetimeSpoke-city_completion.webm Problem I see is that there are two comboboxes with different look. We could: a) setup the region combobox to use noneditable text entry (same look as the city combobox, but no additional code needed) b) implement the whole functionality also for the region combobox Though being a bit confusing I think a) would be appropriate, because there are only few regions. Please refer to the commit message for some additional details. Vratislav Podzimek (1): Add entry with completion to the cities combobox (DatetimeSpoke) pyanaconda/ui/gui/spokes/datetime_spoke.glade | 90 ++++++++++++++++----------- pyanaconda/ui/gui/spokes/datetime_spoke.py | 40 +++++++++++- 2 files changed, 93 insertions(+), 37 deletions(-) -- 1.7.11.2

2 3

[PATCH] Honor displayMode from kickstart files
by Jesse Keating 13 Aug '12

13 Aug '12

Loader used to handle this, but it was lost when we moved to dracut. This adds back the functionality to set cmdline, text, or graphical based on kickstart contents. --- dracut/parse-kickstart | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 13a0e8f..4a62274 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -92,6 +92,15 @@ class Network(commands.network.F16_Network): netline = ksnet_to_dracut(args, lineno, net, bootdev=True) return netline +class DisplayMode(commands.displaymode.FC3_DisplayMode): + def dracut_args(self, args, lineno, obj): + if self.displayMode == DISPLAY_MODE_CMDLINE: + return "inst.cmdline" + elif self.displayMode == DISPLAY_MODE_TEXT: + return "inst.text" + elif self.displayMode == DISPLAY_MODE_GRAPHICAL: + return "inst.graphical" + # TODO: keymap, lang... device? upgrade? selinux? dracutCmds = { @@ -103,6 +112,9 @@ dracutCmds = { 'mediacheck': MediaCheck, 'driverdisk': DriverDisk, 'network': Network, + 'cmdline': DisplayMode, + 'graphical': DisplayMode, + 'text': DisplayMode, } handlerclass = returnClassForVersion() class DracutHandler(handlerclass): -- 1.7.11.2

2 1

[PATCH] dracut: fix inst.ks.sendmac (#826657)
by Will Woods 13 Aug '12

13 Aug '12

Originally, parsing inst.ks.{sendmac,sendsn} happened in parse-anaconda-kickstart.sh. But it turned out that sendmac needed to happen after the modules were loaded, so commit 4fcc157 tried to fix this by making it a function, and using initqueue to run that function in the 'initqueue/settled' hook. Well, it turns out initqueue doesn't like adding jobs that are function names - the job ends up empty and nothing happens. So instead, let's handle these two arguments directly in a script that runs in initqueue/settled. --- dracut/Makefile.am | 1 + dracut/anaconda-ks-sendheaders.sh | 32 ++++++++++++++++++++++++++++++++ dracut/module-setup.sh | 1 + dracut/parse-anaconda-kickstart.sh | 30 ------------------------------ 4 files changed, 34 insertions(+), 30 deletions(-) create mode 100755 dracut/anaconda-ks-sendheaders.sh diff --git a/dracut/Makefile.am b/dracut/Makefile.am index 0324766..8c56bf3 100644 --- a/dracut/Makefile.am +++ b/dracut/Makefile.am @@ -29,6 +29,7 @@ dist_dracut_SCRIPTS = module-setup.sh \ kickstart-genrules.sh \ updates-genrules.sh \ anaconda-udevprop.sh \ + anaconda-ks-sendheaders.sh \ anaconda-netroot.sh \ anaconda-diskroot \ anaconda-copy-ks.sh \ diff --git a/dracut/anaconda-ks-sendheaders.sh b/dracut/anaconda-ks-sendheaders.sh new file mode 100755 index 0000000..aa178ce --- /dev/null +++ b/dracut/anaconda-ks-sendheaders.sh @@ -0,0 +1,32 @@ +#/bin/sh +# anaconda-ks-sendheaders.sh - set various HTTP headers for kickstarting + +[ -f /tmp/.ks_sendheaders ] && return + +# inst.ks.sendmac: send MAC addresses in HTTP headers +if getargbool 0 kssendmac inst.ks.sendmac; then + ifnum=0 + for ifname in /sys/class/net/*; do + [ -e "$ifname/address" ] || continue + mac=$(cat $ifname/address) + ifname=${ifname#/sys/class/net/} + # TODO: might need to choose devices better + if [ "$ifname" != "lo" ] && [ -n "$mac" ]; then + # set_http_header is from url-lib.sh, sourced earlier + set_http_header "X-RHN-Provisioning-MAC-$ifnum" "$ifname $mac" + ifnum=$(($ifnum+1)) + fi + done +fi + +# inst.ks.sendsn: send system serial number in HTTP headers +if getargbool 0 kssendsn inst.ks.sendsn; then + system_serial=$(cat /sys/class/dmi/id/product_serial 2>/dev/null) + if [ -z "$system_serial" ]; then + warn "inst.ks.sendsn: can't find system serial number" + else + set_http_header "X-System-Serial-Number" "$system_serial" + fi +fi + +> /tmp/.ks_sendheaders diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index 39ecc58..78da002 100755 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -26,6 +26,7 @@ install() { inst_hook pre-udev 40 "$moddir/kickstart-genrules.sh" inst_hook pre-udev 40 "$moddir/updates-genrules.sh" inst_hook pre-trigger 40 "$moddir/anaconda-udevprop.sh" + inst_hook initqueue/settled 00 "$moddir/anaconda-ks-sendheaders.sh" inst_hook initqueue/online 80 "$moddir/anaconda-netroot.sh" inst "$moddir/anaconda-diskroot" "/sbin/anaconda-diskroot" inst_hook pre-pivot 99 "$moddir/anaconda-copy-ks.sh" diff --git a/dracut/parse-anaconda-kickstart.sh b/dracut/parse-anaconda-kickstart.sh index afc3d63..d445e27 100755 --- a/dracut/parse-anaconda-kickstart.sh +++ b/dracut/parse-anaconda-kickstart.sh @@ -31,33 +31,3 @@ case "${kickstart%%:*}" in ;; esac export kickstart - -# inst.ks.sendmac: send MAC addresses in HTTP headers -set_ks_sendmac() { - local ifnum=0 mac="" ifname="" - for ifname in /sys/class/net/*; do - [ -e "$ifname/address" ] || continue - mac=$(cat $ifname/address) - ifname=${ifname#/sys/class/net/} - # TODO: might need to choose devices better - if [ "$ifname" != "lo" ] && [ -n "$mac" ]; then - set_http_header "X-RHN-Provisioning-MAC-$ifnum" "$ifname $mac" - ifnum=$(($ifnum+1)) - fi - done -} -if getargbool 0 kssendmac inst.ks.sendmac; then - # needs to run in mainloop (after modules load etc.) - initqueue --unique --settled --onetime --name "01-sendmac" set_ks_sendmac -fi - -# inst.ks.sendsn: send system serial number as HTTP header -if getargbool 0 kssendsn inst.ks.sendsn; then - # doesn't need to wait - dmi is builtin - system_serial=$(cat /sys/class/dmi/id/product_serial 2>/dev/null) - if [ -z "$system_serial" ]; then - warn "inst.ks.sendsn: can't find system serial number" - else - set_http_header "X-System-Serial-Number" "$system_serial" - fi -fi -- 1.7.11.2

2 1

[PATCH] dracut: suppress ks errors from missing %include
by Will Woods 13 Aug '12

13 Aug '12

The kickstart parsing that happens in dracut is the "early" parsing - it doesn't run %pre and it might not be connected to the network, so it's possible we'll have %include lines that aren't yet valid. KickstartParser has a 'missingIncludeIsFatal' attribute for this reason. Set it to False (like loader did) to turn off these errors. --- dracut/parse-kickstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 169ed23..b472067 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -301,7 +301,7 @@ def ksnet_to_ifcfg(net, filename=None): def process_kickstart(ksfile): handler = DracutHandler() handler.ksdevice = os.environ.get('ksdevice') - parser = KickstartParser(handler) + parser = KickstartParser(handler, missingIncludeIsFatal=False) log.info("processing kickstart file %s", ksfile) processed_file = preprocessKickstart(ksfile) try: -- 1.7.11.2

2 1

[PATCH 1/3] Make parents of hidden devices appear to be leaves.
by David Lehman 13 Aug '12

13 Aug '12

--- pyanaconda/storage/devicetree.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py index 267014c..49fb174 100644 --- a/pyanaconda/storage/devicetree.py +++ b/pyanaconda/storage/devicetree.py @@ -1742,6 +1742,8 @@ class DeviceTree(object): self._devices.remove(device) self._hidden.append(device) lvm.lvm_cc_addFilterRejectRegexp(device.name) + for parent in device.parents: + parent.removeChild() def unhide(self, device): # the hidden list should be in leaves-first order @@ -1753,6 +1755,8 @@ class DeviceTree(object): self._hidden.remove(hidden) self._devices.append(hidden) lvm.lvm_cc_removeFilterRejectRegexp(hidden.name) + for parent in device.parents: + parent.addChild() def _setupLvs(self): ret = False -- 1.7.7.6

2 3

[newui] [PATCH] Check that Gtk.main is not already running before starting another one
by Vratislav Podzimek 13 Aug '12

13 Aug '12

If python-meh catches an exception from a different thread before GraphicalUserInterface's Gtk main loop is running, it runs its own loop. Running another one from a different thread would cause Gtk crash. So lets juts wait for the reboot. --- pyanaconda/exception.py | 3 +++ pyanaconda/ui/gui/__init__.py | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 70deed5..00c1696 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -131,6 +131,9 @@ class AnacondaExceptionHandler(ExceptionHandler): except SystemError: pass + def runQuit(self, *args): + os.system("systemctl --no-wall reboot") + def initExceptionHandling(anaconda): fileList = [ "/tmp/anaconda.log", "/tmp/program.log", "/tmp/storage.log", "/tmp/ifcfg.log", diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 5887047..f130470 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -18,11 +18,12 @@ # # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # -import importlib, inspect, os, sys +import importlib, inspect, os, sys, time import meh.ui.gui from pyanaconda.ui import UserInterface from pyanaconda.ui.gui.utils import enlightbox +from pyanaconda.threads import threadMgr import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -87,6 +88,13 @@ class GraphicalUserInterface(UserInterface): def run(self): from gi.repository import Gtk + if Gtk.main_level() > 0: + # Gtk main loop running. That means python-meh caught exception + # and runs its main loop. Do not crash Gtk by running another one + # from a different thread and just wait for the reboot. + while True: + time.sleep(10000) + from pyanaconda.product import isFinal, productName, productVersion # If we set these values on the very first window shown, they will get -- 1.7.11.2

2 11

[PATCH] Honor displayMode from kickstart files
by Jesse Keating 10 Aug '12

10 Aug '12

Loader used to handle this, but it was lost when we moved to dracut. This adds back the functionality to set either text or graphical based on kickstart contents. --- dracut/parse-kickstart | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 13a0e8f..0a429c1 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -92,6 +92,13 @@ class Network(commands.network.F16_Network): netline = ksnet_to_dracut(args, lineno, net, bootdev=True) return netline +class DisplayMode(commands.displaymode.F18_DisplayMode): + def dracut_args(self, args, lineno, obj): + if self.displayMode in [DISPLAY_MODE_CMDLINE, DISPLAY_MODE_TEXT]: + return "inst.text" + elif self.displayMode == DISPLAY_MODE_GRAPHICAL: + return "inst.graphical" + # TODO: keymap, lang... device? upgrade? selinux? dracutCmds = { @@ -103,6 +110,9 @@ dracutCmds = { 'mediacheck': MediaCheck, 'driverdisk': DriverDisk, 'network': Network, + 'cmdline': DisplayMode, + 'graphical': DisplayMode, + 'text': DisplayMode, } handlerclass = returnClassForVersion() class DracutHandler(handlerclass): -- 1.7.11.2

2 2

Third diff of new text UI
by Jesse Keating 10 Aug '12

10 Aug '12

This is the full diff, as opposed to a bunch of individual patches. The tree has the patches, but it's getting rather difficult to try and squash them into a cohesive set :/ I've attached it because I can't get my email client to not screw up the newlines :/ -- Jesse Keating Fedora -- Freedom² is a feature!

1 1

custom partitioning backend
by David Lehman 10 Aug '12

10 Aug '12

Here's your stinking pony. I hope you like it, because I worked really hard to get it for you. These get us the basic framework we need to do custom partitioning the way we decided to do it for newui. There are several TODO and FIXME items in here, but if I sit on these until they are perfect we won't have custom partitioning for F18. Some of the highlights: - the custom ui uses a copy of the main Storage instance to track devices, actions, and do test partition allocations (mostly patches 7 and 11) - adds Storage.newDevice to enable creating devices based on a top-down specification, eg: "create 20 GB ext4 / on lvm using disks sda and sdb" Slightly less important, but significant IMO: - auto-generated device names now include the product name instead of a prefix indicating device type, so if your system would normally end up with "vg-testhost-lv_root", you'll now end up with "fedora_testhost-root" - SizeSet classes enable us to manage growth across a set of partition requests to ensure that all members of a RAID set end up with the same size Of course there are a whole bunch of other little things that either fix bugs or clean stuff up.

3 26

Second version (squashed) of TUI patch
by Martin Sivak 10 Aug '12

10 Aug '12

Here is the complete patch against current master. Doing this using format patch is hard as the merges got in the way. diff --git a/Makefile.am b/Makefile.am index 9470447..733a575 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,6 +126,21 @@ runhub: GI_TYPELIB_PATH=widgets/src/ \ pyanaconda/ui/gui/tools/run-hub.py ${HUB_MODULE} ${HUB_CLASS} +runtextspoke: + ANACONDA_DATA=${PWD}/data \ + ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses \ + PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ \ + LD_LIBRARY_PATH=widgets/src/.libs \ + pyanaconda/ui/tui/tools/run-text-spoke.py ${SPOKE_MODULE} ${SPOKE_CLASS} + +runtexthub: + ANACONDA_DATA=${PWD}/data \ + ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses \ + PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ \ + LD_LIBRARY_PATH=widgets/src/.libs \ + pyanaconda/ui/tui/tools/run-text-hub.py ${HUB_MODULE} ${HUB_CLASS} + + runglade: ANACONDA_DATA=${PWD}/data \ ANACONDA_WIDGETS_OVERRIDES=${PWD}/widgets/python \ diff --git a/configure.ac b/configure.ac index 8e7bbc2..530dd67 100644 --- a/configure.ac +++ b/configure.ac @@ -295,6 +295,11 @@ AC_CONFIG_FILES([Makefile pyanaconda/ui/gui/spokes/lib/Makefile pyanaconda/ui/gui/tools/Makefile pyanaconda/ui/gui/Makefile + pyanaconda/ui/tui/hubs/Makefile + pyanaconda/ui/tui/simpleline/Makefile + pyanaconda/ui/tui/spokes/Makefile + pyanaconda/ui/tui/tools/Makefile + pyanaconda/ui/tui/Makefile tests/Makefile tests/mock/Makefile tests/kickstart_test/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 55a6d2a..3525093 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -55,6 +55,22 @@ pyanaconda/storage/iscsi.py pyanaconda/storage/partitioning.py pyanaconda/storage/zfcp.py +# Interfaces +pyanaconda/ui/common.py +pyanaconda/ui/__init__.py + +# Text interface +pyanaconda/ui/tui/hubs/summary.py +pyanaconda/ui/tui/hubs/__init__.py +pyanaconda/ui/tui/tuiobject.py +pyanaconda/ui/tui/simpleline/widgets.py +pyanaconda/ui/tui/simpleline/base.py +pyanaconda/ui/tui/simpleline/__init__.py +pyanaconda/ui/tui/spokes/password.py +pyanaconda/ui/tui/spokes/time.py +pyanaconda/ui/tui/spokes/__init__.py +pyanaconda/ui/tui/__init__.py + # Graphical interface pyanaconda/ui/gui/__init__.py pyanaconda/ui/gui/categories/__init__.py diff --git a/pyanaconda/ui/Makefile.am b/pyanaconda/ui/Makefile.am index 970fc82..cff34cc 100644 --- a/pyanaconda/ui/Makefile.am +++ b/pyanaconda/ui/Makefile.am @@ -15,7 +15,7 @@ # # Author: Chris Lumens <clumens(a)redhat.com> -SUBDIRS = gui +SUBDIRS = gui tui MAINTAINERCLEANFILES = Makefile.in diff --git a/pyanaconda/ui/__init__.py b/pyanaconda/ui/__init__.py index 3cf3eb6..4cf5f5e1 100644 --- a/pyanaconda/ui/__init__.py +++ b/pyanaconda/ui/__init__.py @@ -19,6 +19,11 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # +__all__ = ["UserInterface", "collect"] + +import os +from common import collect + class UserInterface(object): """This is the base class for all kinds of install UIs. It primarily defines what kinds of dialogs and entry widgets every interface must @@ -93,6 +98,39 @@ class UserInterface(object): """ raise NotImplementedError + def getActionClasses(self, module_pattern, path, hubs, standalone_class): + """Collect all the Hub and Spoke classes which should be enqueued for + processing and order them according to their pre/post dependencies. + + :param module_pattern: the full name pattern (pyanaconda.ui.gui.spokes.%s) + of modules we about to import from path + :type module_pattern: string + + :param path: the directory we are picking up modules from + :type path: string + + :param hubs: the list of Hub classes we check to be in pre/postForHub + attribute of Spokes to pick up + :type hubs: common.Hub based types + + :param standalone_class: the parent type of Spokes we want to pick up + :type standalone_class: common.StandaloneSpoke based types + """ + + + standalones = collect(module_pattern, path, lambda obj: issubclass(obj, standalone_class) and \ + getattr(obj, "preForHub", False) or getattr(obj, "postForHub", False)) + + actionClasses = [] + for hub in hubs: + actionClasses.extend(sorted(filter(lambda obj: getattr(obj, "preForHub", None) == hub, standalones), + key=lambda obj: obj.priority)) + actionClasses.append(hub) + actionClasses.extend(sorted(filter(lambda obj: getattr(obj, "postForHub", None) == hub, standalones), + key=lambda obj: obj.priority)) + + return actionClasses + def mainExceptionWindow(self, text, exn_file): """Return window with the exception and buttons for debugging, bug reporting and exitting the installer. diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py new file mode 100644 index 0000000..8f6c4b7 --- /dev/null +++ b/pyanaconda/ui/common.py @@ -0,0 +1,389 @@ +import os +import importlib +import inspect + +class UIObject(object): + """This is the base class from which all other UI classes are derived. It + thus contains only attributes and methods that are common to everything + else. It should not be directly instantiated. + """ + + def __init__(self, data): + """Create a new UIObject instance, including loading its uiFile and + all UI-related objects. + + Instance attributes: + + data -- An instance of a pykickstart Handler object. The Hub + never directly uses this instance. Instead, it passes + it down into Spokes when they are created and applied. + The Hub simply stores this instance so it doesn't need + to be passed by the user. + """ + if self.__class__ is UIObject: + raise TypeError("UIObject is an abstract class") + + self.skipTo = None + self._data = data + + def initialize(self): + """Perform whatever actions are necessary to pre-fill the UI with + values. This method is called only once, after the object is + created. The difference between this method and __init__ is that + this method may take a long time (especially for NormalSpokes) and + thus may be run in its own thread. + """ + pass + + def retranslate(self): + """This method should be called when the current language is changed + in order to update the UI for the new language. Since we don't get + any toolkit help for this, it is largely a manual process. + """ + pass + + def refresh(self): + """Perform whatever actions are necessary to reset the UI immediately + before it is displayed. This method is called every time a screen + is shown, which could potentially be several times in the case of a + NormalSpoke. Thus, it's important to not do things like populate + stores (which could result in the store having duplicate entries) or + anything that takes a long time (as that will result in a delay + between the user's action and showing the results). + + For anything potentially long-lived, use the initialize method. + """ + pass + + @property + def showable(self): + """Should this object even be shown? This method is useful for checking + some precondition before this screen is shown. If False is returned, + the screen will be skipped and the object destroyed. + """ + return True + + def teardown(self): + """Perform whatever actions are necessary to clean up after this object + is done. It's not necessary for every subclass to have an instance + of this method. + + NOTE: It is important for this method to not destroy self.window if + you are making a Spoke or Hub subclass. It is assumed that once + these are instantiated, they live until the program terminates. This + is required for various status notifications. + """ + pass + + @property + def window(self): + """Return an object with show_all and hide methods that is to be used + to display this UI object. + """ + raise TypeError("UIObject.window has to be overriden") + + @property + def data(self): + return self._data + +class Spoke(UIObject): + """A Spoke is a single configuration screen. There are several different + places where a Spoke can be displayed, each of which will have its own + unique class. A Spoke is typically used when an element in the Hub is + selected but can also be displayed before a Hub or between multiple + Hubs. + + What amount of the UI layout a Spoke provides depends upon where it is + to be shown. Regardless, the UI of a Spoke should be given by an + interface description file like glade as often as possible, though this + is not a strict requirement. + + Class attributes: + + category -- Under which SpokeCategory shall this Spoke be displayed + in the Hub? This is a reference to a Hub subclass (not an + object, but the class itself). If no category is given, + this Spoke will not be displayed. Note that category is + not required for any Spokes appearing before or after a + Hub. + icon -- The name of the icon to be displayed in the SpokeSelector + widget corresponding to this Spoke instance. If no icon + is given, the default from SpokeSelector will be used. + title -- The title to be displayed in the SpokeSelector widget + corresponding to this Spoke instance. If no title is + given, the default from SpokeSelector will be used. + """ + category = None + icon = None + title = None + + def __init__(self, data, storage, payload, instclass): + """Create a new Spoke instance. + + The arguments this base class accepts defines the API that spokes + have to work with. A Spoke does not get free reign over everything + in the anaconda class, as that would be a big mess. Instead, a + Spoke may count on the following: + + data -- An instance of a pykickstart Handler object. The + Spoke uses this to populate its UI with defaults + and to pass results back after it has run. + storage -- An instance of storage.Storage. This is useful for + determining what storage devices are present and how + they are configured. + payload -- An instance of a packaging.Payload subclass. This + is useful for displaying and selecting packages to + install, and in carrying out the actual installation. + instclass -- An instance of a BaseInstallClass subclass. This + is useful for determining distribution-specific + installation information like default package + selections and default partitioning. + """ + if self.__class__ is Spoke: + raise TypeError("Spoke is an abstract class") + + UIObject.__init__(self, data) + self.storage = storage + self.payload = payload + self.instclass = instclass + self.applyOnSkip = False + + def apply(self): + """Apply the selections made on this Spoke to the object's preset + data object. This method must be provided by every subclass. + """ + raise NotImplementedError + + @property + def completed(self): + """Has this spoke been visited and completed? If not, a special warning + icon will be shown on the Hub beside the spoke, and a highlighted + message will be shown at the bottom of the Hub. Installation will not + be allowed to proceed until all spokes are complete. + """ + return False + + def execute(self): + """Cause the data object to take effect on the target system. This will + usually be as simple as calling one or more of the execute methods on + the data object. This method does not need to be provided by all + subclasses. + + This method will be called in two different places: (1) Immediately + after initialize on kickstart installs. (2) Immediately after apply + in all cases. + """ + pass + + def initialize(self): + UIObject.initialize(self) + + @property + def status(self): + """Given the current status of whatever this Spoke configures, return + a very brief string. The purpose of this is to display something + on the Hub under the Spoke's title so the user can tell at a glance + how things are configured. + + A spoke's status line on the Hub can also be overloaded to provide + information about why a Spoke is not yet ready, or if an error has + occurred when setting it up. This can be done by calling + send_message from pyanaconda.ui.gui.communication with the target + Spoke's class name and the message to be displayed. + + If the Spoke was not yet ready when send_message was called, the + message will be overwritten with the value of this status property + when the Spoke becomes ready. + """ + raise NotImplementedError + +class NormalSpoke(Spoke): + priority = 100 + + """A NormalSpoke is a Spoke subclass that is displayed when the user + selects something on a Hub. This is what most Spokes in anaconda will + be based on. + + From a layout perspective, a NormalSpoke takes up the entire screen + therefore hiding the Hub and its action area. The NormalSpoke also + provides some basic navigation information (where you are, what you're + installing, how to get back to the Hub) at the top of the screen. + """ + def __init__(self, data, storage, payload, instclass): + """Create a NormalSpoke instance.""" + if self.__class__ is NormalSpoke: + raise TypeError("NormalSpoke is an abstract class") + + Spoke.__init__(self, data, storage, payload, instclass) + self.selector = None + + @property + def indirect(self): + """If this property returns True, then this spoke is considered indirect. + An indirect spoke is one that can only be reached through another spoke + instead of directly through the hub. One example of this is the + custom partitioning spoke, which may only be accessed through the + install destination spoke. + + Indirect spokes do not need to provide a completed or status property. + + For most spokes, overriding this property is unnecessary. + """ + return False + + @property + def ready(self): + """Returns True if the Spoke has all the information required to be + displayed. Almost all spokes should keep the default value here. + Only override this method if the Spoke requires some potentially + long-lived process (like storage probing) before it's ready. + + A Spoke may be marked as ready or not by calling send_ready or + send_not_ready from pyanaconda.ui.gui.communication with the + target Spoke's class name. + + While a Spoke is not ready, a progress message may be shown to + give the user some feedback. See the status property for details. + """ + return True + +class StandaloneSpoke(NormalSpoke): + """A StandaloneSpoke is a Spoke subclass that is displayed apart from any + Hub. It is suitable to be used as a Welcome screen. + + From a layout perspective, a StandaloneSpoke provides a full screen + interface. However, it also provides navigation information at the top + and bottom of the screen that makes it look like the StandaloneSpoke + fits into some other UI element. + + Class attributes: + + preForHub/postForHub -- A reference to a Hub subclass this Spoke is + either a pre or post action for. Only one of + these may be set at a time. Note that all + post actions will be run for one hub before + any pre actions for the next. + priority -- This value is used to sort pre and post + actions. The lower a value, the earlier it + will be run. So a value of 0 for a post action + ensures it will run immediately after a Hub, + while a value of 0 for a pre actions means + it will run as the first thing. + """ + preForHub = None + postForHub = None + + def __init__(self, data, storage, payload, instclass): + """Create a StandaloneSpoke instance.""" + if self.__class__ is StandaloneSpoke: + raise TypeError("StandaloneSpoke is an abstract class") + + if self.preForHub and self.postForHub: + raise AttributeError("StandaloneSpoke instance %s may not have both preForHub and postForHub set" % self) + + Spoke.__init__(self, data, storage, payload, instclass) + + + +class PersonalizationSpoke(Spoke): + """A PersonalizationSpoke is a Spoke subclass that is displayed when the + user selects something on the Hub during package installation. + + From a layout perspective, a PersonalizationSpoke takes up the middle + of the screen therefore hiding the Hub but leaving its action area + displayed. This allows the user to continue seeing package installation + progress being made. The PersonalizationSpoke also provides the same + basic navigation information at the top of the screen as a NormalSpoke. + """ + def __init__(self, data, storage, payload, instclass): + """Create a PersonalizationSpoke instance.""" + if self.__class__ is PersonalizationSpoke: + raise TypeError("PersonalizationSpoke is an abstract class") + + Spoke.__init__(self, data, storage, payload, instclass) + +class Hub(UIObject): + """A Hub is an overview UI screen. A Hub consists of one or more grids of + configuration options that the user may choose from. Each grid is + provided by a SpokeCategory, and each option is provided by a Spoke. + When the user dives down into a Spoke and is finished interacting with + it, they are returned to the Hub. + + Some Spokes are required. The user must interact with all required + Spokes before they are allowed to proceed to the next stage of + installation. + + From a layout perspective, a Hub is the entirety of the screen, though + the screen itself can be roughly divided into thirds. The top third is + some basic navigation information (where you are, what you're + installing). The middle third is the grid of Spokes. The bottom third + is an action area providing additional buttons (quit, continue) or + progress information (during package installation). + + Installation may consist of multiple chained Hubs, or Hubs with + additional standalone screens either before or after them. + """ + + def __init__(self, data, storage, payload, instclass): + """Create a new Hub instance. + + The arguments this base class accepts defines the API that Hubs + have to work with. A Hub does not get free reign over everything + in the anaconda class, as that would be a big mess. Instead, a + Hub may count on the following: + + data -- An instance of a pykickstart Handler object. The + Hub uses this to populate its UI with defaults + and to pass results back after it has run. + storage -- An instance of storage.Storage. This is useful for + determining what storage devices are present and how + they are configured. + payload -- An instance of a packaging.Payload subclass. This + is useful for displaying and selecting packages to + install, and in carrying out the actual installation. + instclass -- An instance of a BaseInstallClass subclass. This + is useful for determining distribution-specific + installation information like default package + selections and default partitioning. + """ + UIObject.__init__(self, data) + + self._spokes = {} + self.storage = storage + self.payload = payload + self.instclass = instclass + +def collect(module_pattern, path, pred): + """Traverse the directory (given by path), import all files as a module + module_pattern % filename and find all classes withing that match + the given predicate. This is then returned as a list of classes. + + It is suggested you use collect_categories or collect_spokes instead of + this lower-level method. + + :param module_pattern: the full name pattern (pyanaconda.ui.gui.spokes.%s) + of modules we about to import from path + :type module_pattern: string + + :param path: the directory we are picking up modules from + :type path: string + + + :param pred: function which marks classes as good to import + :type pred: function with one argument returning True or False + """ + + retval = [] + for module_file in os.listdir(path): + if not module_file.endswith(".py") or module_file == "__init__.py": + continue + + mod_name = module_file[:-3] + module = importlib.import_module(module_pattern % mod_name) + + p = lambda obj: inspect.isclass(obj) and pred(obj) + + for (name, val) in inspect.getmembers(module, p): + retval.append(val) + + return retval diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 5887047..5ebb53d 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -21,7 +21,7 @@ import importlib, inspect, os, sys import meh.ui.gui -from pyanaconda.ui import UserInterface +from pyanaconda.ui import UserInterface, common, collect from pyanaconda.ui.gui.utils import enlightbox import gettext @@ -54,16 +54,8 @@ class GraphicalUserInterface(UserInterface): self._hubs.extend([SummaryHub, ProgressHub]) # First, grab a list of all the standalone spokes. - standalones = collect("spokes", lambda obj: issubclass(obj, StandaloneSpoke) and \ - getattr(obj, "preForHub", False) or getattr(obj, "postForHub", False)) - - actionClasses = [] - for hub in self._hubs: - actionClasses.extend(sorted(filter(lambda obj: getattr(obj, "preForHub", None) == hub, standalones), - key=lambda obj: obj.priority)) - actionClasses.append(hub) - actionClasses.extend(sorted(filter(lambda obj: getattr(obj, "postForHub", None) == hub, standalones), - key=lambda obj: obj.priority)) + path = os.path.join(os.path.dirname(__file__), "spokes") + actionClasses = self.getActionClasses("pyanaconda.ui.gui.spokes.%s", path, self._hubs, StandaloneSpoke) # Instantiate all hubs and their pre/post standalone spokes, passing # the arguments defining our spoke API and setting up continue/quit @@ -195,8 +187,8 @@ class GraphicalUserInterface(UserInterface): if rc == 1: sys.exit(0) -class UIObject(object): - """This is the base class from which all other UI classes are derived. It +class GUIObject(common.UIObject): + """This is the base class from which all other GUI classes are derived. It thus contains only attributes and methods that are common to everything else. It should not be directly instantiated. @@ -251,8 +243,10 @@ class UIObject(object): spoke off a hub. They can only skip to the hub itself. """ - if self.__class__ is UIObject: - raise TypeError("UIObject is an abstract class") + common.UIObject.__init__(self, data) + + if self.__class__ is GUIObject: + raise TypeError("GUIObject is an abstract class") # This couldn't possibly be a bigger hack job. This structure holds the # untranslated strings out of each widget. retranslate works by taking the @@ -262,7 +256,6 @@ class UIObject(object): # original English, so we'd be looking up translations by translations. self._origStrings = {} - self.data = data self.skipTo = None self.applyOnSkip = False @@ -311,15 +304,6 @@ class UIObject(object): _screenshotIndex += 1 - def initialize(self): - """Perform whatever actions are necessary to pre-fill the UI with - values. This method is called only once, after the object is - created. The difference between this method and __init__ is that - this method may take a long time (especially for NormalSpokes) and - thus may be run in its own thread. - """ - pass - def retranslate(self): """This method should be called when the current language is changed in order to update the UI for the new language. Since we don't get @@ -353,39 +337,6 @@ class UIObject(object): xlated = _(before) getattr(obj, funcs[1])(xlated) - def refresh(self): - """Perform whatever actions are necessary to reset the UI immediately - before it is displayed. This method is called every time a screen - is shown, which could potentially be several times in the case of a - NormalSpoke. Thus, it's important to not do things like populate - stores (which could result in the store having duplicate entries) or - anything that takes a long time (as that will result in a delay - between the user's action and showing the results). - - For anything potentially long-lived, use the initialize method. - """ - pass - - @property - def showable(self): - """Should this object even be shown? This method is useful for checking - some precondition before this screen is shown. If False is returned, - the screen will be skipped and the object destroyed. - """ - return True - - def teardown(self): - """Perform whatever actions are necessary to clean up after this object - is done. It's not necessary for every subclass to have an instance - of this method. - - NOTE: It is important for this method to not destroy self.window if - you are making a Spoke or Hub subclass. It is assumed that once - these are instantiated, they live until the program terminates. This - is required for various status notifications. - """ - pass - @property def window(self): """Return the top-level object out of the GtkBuilder representation @@ -399,7 +350,7 @@ class UIObject(object): return self._window -class QuitDialog(UIObject): +class QuitDialog(GUIObject): builderObjects = ["quitDialog"] mainWidgetName = "quitDialog" uiFile = "main.glade" @@ -407,27 +358,3 @@ class QuitDialog(UIObject): def run(self): rc = self.window.run() return rc - -def collect(subpath, pred): - """Traverse the subdirectory (given by subpath) of this module's current - directory and find all classes that math the given category. This is - then returned as a list of classes. If category is None, this method - will return a list of all matching subclasses. - - It is suggested you use collect_categories or collect_spokes instead of - this lower-level method. - """ - retval = [] - for module_file in os.listdir(os.path.dirname(__file__) + "/" + subpath): - if not module_file.endswith(".py") or module_file in [__file__, "__init__.py"]: - continue - - mod_name = module_file[:-3] - module = importlib.import_module("pyanaconda.ui.gui.%s.%s" % (subpath, mod_name)) - - p = lambda obj: inspect.isclass(obj) and pred(obj) - - for (name, val) in inspect.getmembers(module, p): - retval.append(val) - - return retval diff --git a/pyanaconda/ui/gui/categories/__init__.py b/pyanaconda/ui/gui/categories/__init__.py index 31739d7..1e43148 100644 --- a/pyanaconda/ui/gui/categories/__init__.py +++ b/pyanaconda/ui/gui/categories/__init__.py @@ -21,6 +21,7 @@ N_ = lambda x: x +import os.path from pyanaconda.ui.gui import collect __all__ = ["SpokeCategory", "collect_categories"] @@ -72,4 +73,4 @@ class SpokeCategory(object): def collect_categories(): """Return a list of all category subclasses.""" - return collect("categories", lambda obj: getattr(obj, "displayOnHub", None) != None) + return collect("pyanaconda.ui.gui.categories.%s", os.path.dirname(__file__), lambda obj: getattr(obj, "displayOnHub", None) != None) diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 110f150..f5e211f 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -26,11 +26,12 @@ from gi.repository import GLib from pyanaconda.flags import flags -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui import common +from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.categories import collect_categories from pyanaconda.ui.gui.spokes import StandaloneSpoke, collect_spokes -class Hub(UIObject): +class Hub(GUIObject, common.Hub): """A Hub is an overview UI screen. A Hub consists of one or more grids of configuration options that the user may choose from. Each grid is provided by a SpokeCategory, and each option is provided by a Spoke. @@ -74,7 +75,8 @@ class Hub(UIObject): installation information like default package selections and default partitioning. """ - UIObject.__init__(self, data) + GUIObject.__init__(self, data) + common.Hub.__init__(self, data, storage, payload, instclass) self._autoContinue = False self._incompleteSpokes = [] @@ -82,10 +84,6 @@ class Hub(UIObject): self._notReadySpokes = [] self._spokes = {} - self.storage = storage - self.payload = payload - self.instclass = instclass - def _runSpoke(self, action): from gi.repository import Gtk @@ -287,7 +285,7 @@ class Hub(UIObject): return True def refresh(self): - UIObject.refresh(self) + GUIObject.refresh(self) self._createBox() self._update_spoke_id = GLib.timeout_add_seconds(1, self._update_spokes) diff --git a/pyanaconda/ui/gui/spokes/__init__.py b/pyanaconda/ui/gui/spokes/__init__.py index 2cd3d1b..61aea5c 100644 --- a/pyanaconda/ui/gui/spokes/__init__.py +++ b/pyanaconda/ui/gui/spokes/__init__.py @@ -19,79 +19,17 @@ # Red Hat Author(s): Chris Lumens <clumens(a)redhat.com> # -from pyanaconda.ui.gui import UIObject, collect +from pyanaconda.ui import collect, common +from pyanaconda.ui.gui import GUIObject +import os.path __all__ = ["Spoke", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke", "collect_spokes"] -class Spoke(UIObject): - """A Spoke is a single configuration screen. There are several different - places where a Spoke can be displayed, each of which will have its own - unique class. A Spoke is typically used when an element in the Hub is - selected but can also be displayed before a Hub or between multiple - Hubs. - - What amount of the UI layout a Spoke provides depends upon where it is - to be shown. Regardless, the UI of a Spoke should be given by an - interface description file like glade as often as possible, though this - is not a strict requirement. - - Class attributes: - - category -- Under which SpokeCategory shall this Spoke be displayed - in the Hub? This is a reference to a Hub subclass (not an - object, but the class itself). If no category is given, - this Spoke will not be displayed. Note that category is - not required for any Spokes appearing before or after a - Hub. - icon -- The name of the icon to be displayed in the SpokeSelector - widget corresponding to this Spoke instance. If no icon - is given, the default from SpokeSelector will be used. - title -- The title to be displayed in the SpokeSelector widget - corresponding to this Spoke instance. If no title is - given, the default from SpokeSelector will be used. - """ - category = None - icon = None - title = None - +class Spoke(GUIObject, common.Spoke): def __init__(self, data, storage, payload, instclass): - """Create a new Spoke instance. - - The arguments this base class accepts defines the API that spokes - have to work with. A Spoke does not get free reign over everything - in the anaconda class, as that would be a big mess. Instead, a - Spoke may count on the following: - - ksdata -- An instance of a pykickstart Handler object. The - Spoke uses this to populate its UI with defaults - and to pass results back after it has run. - storage -- An instance of storage.Storage. This is useful for - determining what storage devices are present and how - they are configured. - payload -- An instance of a packaging.Payload subclass. This - is useful for displaying and selecting packages to - install, and in carrying out the actual installation. - instclass -- An instance of a BaseInstallClass subclass. This - is useful for determining distribution-specific - installation information like default package - selections and default partitioning. - - applyOnSkip -- Run the apply method, even in the case where skipTo - is set. You usually don't want this set to True, since - the skipTo attribute means to jump to another spoke - right away. However, there are instances where running - apply anyway can be useful. - """ - if self.__class__ is Spoke: - raise TypeError("Spoke is an abstract class") - - UIObject.__init__(self, data) - self.storage = storage - self.payload = payload - self.instclass = instclass - - self.applyOnSkip = False + GUIObject.__init__(self, data) + common.Spoke.__init__(self, data, storage, payload, instclass) def apply(self): """Apply the selections made on this Spoke to the object's preset @@ -121,67 +59,11 @@ class Spoke(UIObject): pass def initialize(self): - UIObject.initialize(self) + GUIObject.initialize(self) self.window.set_property("window-name", self.title or "") - @property - def status(self): - """Given the current status of whatever this Spoke configures, return - a very brief string. The purpose of this is to display something - on the Hub under the Spoke's title so the user can tell at a glance - how things are configured. - - A spoke's status line on the Hub can also be overloaded to provide - information about why a Spoke is not yet ready, or if an error has - occurred when setting it up. This can be done by calling - send_message from pyanaconda.ui.gui.communication with the target - Spoke's class name and the message to be displayed. - - If the Spoke was not yet ready when send_message was called, the - message will be overwritten with the value of this status property - when the Spoke becomes ready. - """ - raise NotImplementedError - -class StandaloneSpoke(Spoke): - """A StandaloneSpoke is a Spoke subclass that is displayed apart from any - Hub. It is suitable to be used as a Welcome screen. - - From a layout perspective, a StandaloneSpoke provides a full screen - interface. However, it also provides navigation information at the top - and bottom of the screen that makes it look like the StandaloneSpoke - fits into some other UI element. - - Class attributes: - - preForHub/postForHub -- A reference to a Hub subclass this Spoke is - either a pre or post action for. Only one of - these may be set at a time. Note that all - post actions will be run for one hub before - any pre actions for the next. - priority -- This value is used to sort pre and post - actions. The lower a value, the earlier it - will be run. So a value of 0 for a post action - ensures it will run immediately after a Hub, - while a value of 0 for a pre actions means - it will run as the first thing. - """ - preForHub = None - postForHub = None - - priority = 100 - - def __init__(self, data, storage, payload, instclass): - """Create a StandaloneSpoke instance.""" - if self.__class__ is StandaloneSpoke: - raise TypeError("StandaloneSpoke is an abstract class") - - if self.preForHub and self.postForHub: - raise AttributeError("StandaloneSpoke instance %s may not have both preForHub and postForHub set" % self) - - Spoke.__init__(self, data, storage, payload, instclass) - +class StandaloneSpoke(Spoke, common.StandaloneSpoke): def _on_continue_clicked(self, cb): self.apply() cb() @@ -192,79 +74,18 @@ class StandaloneSpoke(Spoke): elif event == "quit": self.window.connect("quit-clicked", lambda *args: cb()) -class NormalSpoke(Spoke): - """A NormalSpoke is a Spoke subclass that is displayed when the user - selects something on a Hub. This is what most Spokes in anaconda will - be based on. - - From a layout perspective, a NormalSpoke takes up the entire screen - therefore hiding the Hub and its action area. The NormalSpoke also - provides some basic navigation information (where you are, what you're - installing, how to get back to the Hub) at the top of the screen. - """ - def __init__(self, data, storage, payload, instclass): - """Create a NormalSpoke instance.""" - if self.__class__ is NormalSpoke: - raise TypeError("NormalSpoke is an abstract class") - - Spoke.__init__(self, data, storage, payload, instclass) - self.selector = None - - @property - def indirect(self): - """If this property returns True, then this spoke is considered indirect. - An indirect spoke is one that can only be reached through another spoke - instead of directly through the hub. One example of this is the - custom partitioning spoke, which may only be accessed through the - install destination spoke. - - Indirect spokes do not need to provide a completed or status property. - - For most spokes, overriding this property is unnecessary. - """ - return False - - @property - def ready(self): - """Returns True if the Spoke has all the information required to be - displayed. Almost all spokes should keep the default value here. - Only override this method if the Spoke requires some potentially - long-lived process (like storage probing) before it's ready. - - A Spoke may be marked as ready or not by calling send_ready or - send_not_ready from pyanaconda.ui.gui.communication with the - target Spoke's class name. - - While a Spoke is not ready, a progress message may be shown to - give the user some feedback. See the status property for details. - """ - return True - +class NormalSpoke(Spoke, common.NormalSpoke): def on_back_clicked(self, window): from gi.repository import Gtk self.window.hide() Gtk.main_quit() -class PersonalizationSpoke(Spoke): - """A PersonalizationSpoke is a Spoke subclass that is displayed when the - user selects something on the Hub during package installation. - - From a layout perspective, a PersonalizationSpoke takes up the middle - of the screen therefore hiding the Hub but leaving its action area - displayed. This allows the user to continue seeing package installation - progress being made. The PersonalizationSpoke also provides the same - basic navigation information at the top of the screen as a NormalSpoke. - """ - def __init__(self, data, storage, payload, instclass): - """Create a PersonalizationSpoke instance.""" - if self.__class__ is PersonalizationSpoke: - raise TypeError("PersonalizationSpoke is an abstract class") - - Spoke.__init__(self, data, storage, payload, instclass) +class PersonalizationSpoke(Spoke, common.PersonalizationSpoke): + pass def collect_spokes(category): """Return a list of all spoke subclasses that should appear for a given category. """ - return collect("spokes", lambda obj: hasattr(obj, "category") and obj.category != None and obj.category.__name__ == category) + return collect("pyanaconda.ui.gui.spokes.%s", os.path.dirname(__file__), lambda obj: hasattr(obj, "category") and obj.category != None and obj.category.__name__ == category) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 2793957..c76146a 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -41,7 +41,7 @@ from pyanaconda.storage import Root from pyanaconda.storage.partitioning import doPartitioning from pyanaconda.storage.errors import StorageError -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.spokes.storage import StorageChecker from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog @@ -55,13 +55,13 @@ __all__ = ["CustomPartitioningSpoke"] new_install_name = _("New %s %s Installation") % (productName, productVersion) -class AddDialog(UIObject): +class AddDialog(GUIObject): builderObjects = ["addDialog"] mainWidgetName = "addDialog" uiFile = "spokes/custom.glade" def __init__(self, *args, **kwargs): - UIObject.__init__(self, *args, **kwargs) + GUIObject.__init__(self, *args, **kwargs) self.size = Size(bytes=0) self.mountpoint = "" @@ -80,12 +80,12 @@ class AddDialog(UIObject): self.window.destroy() def refresh(self): - UIObject.refresh(self) + GUIObject.refresh(self) def run(self): return self.window.run() -class ConfirmDeleteDialog(UIObject): +class ConfirmDeleteDialog(GUIObject): builderObjects = ["confirmDeleteDialog"] mainWidgetName = "confirmDeleteDialog" uiFile = "spokes/custom.glade" @@ -97,7 +97,7 @@ class ConfirmDeleteDialog(UIObject): self.window.destroy() def refresh(self, mountpoint, device): - UIObject.refresh(self) + GUIObject.refresh(self) label = self.builder.get_object("confirmLabel") if mountpoint: diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 314a886..0e2ca77 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -25,7 +25,7 @@ N_ = lambda x: x from gi.repository import AnacondaWidgets, GLib, Gtk -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.categories.localization import LocalizationCategory from pyanaconda.ui.gui.utils import enlightbox @@ -43,13 +43,13 @@ SERVER_QUERY = 2 POOL_SERVERS_NOTE = _("Note: pool servers may not be available all the time") -class NTPconfigDialog(UIObject): +class NTPconfigDialog(GUIObject): builderObjects = ["ntpConfigDialog", "addImage", "serversStore"] mainWidgetName = "ntpConfigDialog" uiFile = "spokes/datetime_spoke.glade" def __init__(self, *args): - UIObject.__init__(self, *args) + GUIObject.__init__(self, *args) #used to ensure uniqueness of the threads' names self._threads_counter = 0 diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 48d8f8c..0de562b 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -26,7 +26,7 @@ N_ = lambda x: x from gi.repository import GLib, Gkbd, Gtk -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.categories.localization import LocalizationCategory from pyanaconda.ui.gui.utils import enlightbox @@ -38,14 +38,14 @@ def _show_layout(column, renderer, model, itr, wrapper): value = wrapper.name_to_show_str[model[itr][0]] renderer.set_property("text", value) -class AddLayoutDialog(UIObject): +class AddLayoutDialog(GUIObject): builderObjects = ["addLayoutDialog", "newLayoutStore", "newLayoutStoreFilter", "newLayoutStoreSort"] mainWidgetName = "addLayoutDialog" uiFile = "spokes/keyboard.glade" def __init__(self, *args): - UIObject.__init__(self, *args) + GUIObject.__init__(self, *args) self._xkl_wrapper = keyboard.XklWrapper.get_instance() def matches_entry(self, model, itr, user_data=None): @@ -363,4 +363,3 @@ class KeyboardSpoke(NormalSpoke): layouts_list.append(row[0]) self._xkl_wrapper.replace_layouts(layouts_list) - diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index c40b7f5..3e77a36 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -21,7 +21,7 @@ from gi.repository import Gtk -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui.gui import GUIObject from pyanaconda.storage.size import Size import gettext @@ -39,7 +39,7 @@ def size_str(mb): return str(Size(spec=spec)).upper() -class SelectedDisksDialog(UIObject): +class SelectedDisksDialog(GUIObject): builderObjects = ["selected_disks_dialog", "disk_store"] mainWidgetName = "selected_disks_dialog" uiFile = "spokes/lib/cart.glade" diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index e0f3792..9142ad0 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -34,7 +34,7 @@ from gi.repository import Gtk, AnacondaWidgets -from pyanaconda.ui.gui import UIObject +from pyanaconda.ui.gui import GUIObject from pyanaconda.ui.gui.spokes import NormalSpoke, StandaloneSpoke from pyanaconda.ui.gui.categories.software import SoftwareCategory from pyanaconda.ui.gui.hubs.summary import SummaryHub diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 4474052..fd40b5c 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -32,7 +32,7 @@ import os.path from gi.repository import AnacondaWidgets, GLib, Gtk from pyanaconda.image import opticalInstallMedia, potentialHdisoSources -from pyanaconda.ui.gui import UIObject, communication +from pyanaconda.ui.gui import GUIObject, communication from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.categories.software import SoftwareCategory from pyanaconda.ui.gui.utils import enlightbox, gdk_threaded @@ -45,7 +45,7 @@ MOUNTPOINT = "/mnt/install/isodir" METADATA_DOWNLOAD_MESSAGE = _("Downloading package metadata...") METADATA_ERROR_MESSAGE = _("Error downloading package metadata...") -class ProxyDialog(UIObject): +class ProxyDialog(GUIObject): builderObjects = ["proxyDialog"] mainWidgetName = "proxyDialog" uiFile = "spokes/source.glade" @@ -89,7 +89,7 @@ class ProxyDialog(UIObject): def refresh(self): import re - UIObject.refresh(self) + GUIObject.refresh(self) self._proxyCheck = self.builder.get_object("enableProxyCheck") self._proxyInfoBox = self.builder.get_object("proxyInfoBox") @@ -126,7 +126,7 @@ class ProxyDialog(UIObject): def run(self): self.window.run() -class MediaCheckDialog(UIObject): +class MediaCheckDialog(GUIObject): builderObjects = ["mediaCheckDialog"] mainWidgetName = "mediaCheckDialog" uiFile = "spokes/source.glade" @@ -193,13 +193,13 @@ class MediaCheckDialog(UIObject): # result from run(), the file path you use is relative to the root of the # mounted partition. In other words, it will not contain the # "/mnt/isodir/install" part. This is consistent with the rest of anaconda. -class IsoChooser(UIObject): +class IsoChooser(GUIObject): builderObjects = ["isoChooserDialog", "isoFilter"] mainWidgetName = "isoChooserDialog" uiFile = "spokes/source.glade" def refresh(self, currentFile=""): - UIObject.refresh(self) + GUIObject.refresh(self) self._chooser = self.builder.get_object("isoChooser") self._chooser.connect("current-folder-changed", self.on_folder_changed) self._chooser.set_filename(MOUNTPOINT + "/" + currentFile) @@ -235,7 +235,7 @@ class IsoChooser(UIObject): if not d.startswith(MOUNTPOINT): chooser.set_current_folder(MOUNTPOINT) -class AdditionalReposDialog(UIObject): +class AdditionalReposDialog(GUIObject): builderObjects = ["additionalReposDialog", "peopleRepositories", "peopleRepositoriesFilter"] mainWidgetName = "additionalReposDialog" uiFile = "spokes/source.glade" @@ -243,7 +243,7 @@ class AdditionalReposDialog(UIObject): typingTimeout = 1 def __init__(self, *args, **kwargs): - UIObject.__init__(self, *args, **kwargs) + GUIObject.__init__(self, *args, **kwargs) self._filterTimer = None self._urlTimer = None @@ -279,7 +279,7 @@ class AdditionalReposDialog(UIObject): self._sourceSelectionUrl = self.builder.get_object("addRepositorySelectUrl") def refresh(self, currentFile=""): - UIObject.refresh(self) + GUIObject.refresh(self) def run(self): retval = None diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 6e5df44..d8cccd8 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -41,7 +41,7 @@ from gi.repository import Gdk, Gtk from gi.repository import AnacondaWidgets -from pyanaconda.ui.gui import UIObject, communication +from pyanaconda.ui.gui import GUIObject, communication from pyanaconda.ui.gui.spokes import NormalSpoke from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog from pyanaconda.ui.gui.categories.storage import StorageCategory @@ -110,7 +110,7 @@ def size_str(mb): return str(Size(spec=spec)).upper() -class InstallOptions1Dialog(UIObject): +class InstallOptions1Dialog(GUIObject): builderObjects = ["options1_dialog"] mainWidgetName = "options1_dialog" uiFile = "spokes/storage.glade" diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index 5f5a44a..afddbd1 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -44,13 +44,13 @@ initThreading() # And get the name of the module which represents it if os.path.basename(sys.argv[0]) == "run-spoke.py": spokeModuleName = "pyanaconda.ui.gui.spokes.%s" % sys.argv[1] - from pyanaconda.ui.gui.spokes import Spoke + from pyanaconda.ui.common import Spoke spokeBaseClass = Spoke spokeText = "spoke" SpokeText = "Spoke" elif os.path.basename(sys.argv[0]) == "run-hub.py": spokeModuleName = "pyanaconda.ui.gui.hubs.%s" % sys.argv[1] - from pyanaconda.ui.gui.hubs import Hub + from pyanaconda.ui.common import Hub spokeBaseClass = Hub spokeText = "hub" SpokeText = "Hub" @@ -76,10 +76,9 @@ except IndexError: if issubclass(v, spokeBaseClass) and v != spokeBaseClass: spokeClassName = k spokeClass = v - break except TypeError: pass - + if not spokeClass: try: spokeClass = getattr(spokeModule, spokeClassName) diff --git a/pyanaconda/ui/tui/Makefile.am b/pyanaconda/ui/tui/Makefile.am new file mode 100644 index 0000000..9cc0ba1 --- /dev/null +++ b/pyanaconda/ui/tui/Makefile.am @@ -0,0 +1,24 @@ +# 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 Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Chris Lumens <clumens(a)redhat.com> + +SUBDIRS = hubs spokes simpleline tools + +MAINTAINERCLEANFILES = Makefile.in + +pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME) +tuidir = $(pkgpyexecdir)/ui/tui +tui_PYTHON = *.py diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py new file mode 100644 index 0000000..845a4a2 --- /dev/null +++ b/pyanaconda/ui/tui/__init__.py @@ -0,0 +1,182 @@ +# The main file for anaconda TUI interface +# +# Copyright (C) (2012) 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# + +from pyanaconda import ui +from pyanaconda.ui import common +import simpleline as tui +from hubs.summary import SummaryHub +from spokes import StandaloneSpoke + +class ErrorDialog(tui.UIScreen): + """Dialog screen for reporting errors to user.""" + + title = u"Error" + + def __init__(self, app, message): + """ + :param app: the running application reference + :type app: instance of App class + + :param message: the message to show to the user + :type message: unicode + """ + + tui.UIScreen.__init__(self, app) + self._message = message + + def refresh(self, args = None): + tui.UIScreen.refresh(self, args) + text = tui.TextWidget(self._message) + self._window.append(tui.CenterWidget(text)) + + def prompt(self, args = None): + return u"Press enter to exit." + + def input(self, args, key): + """This dialog is closed by any input.""" + self.close() + +class YesNoDialog(tui.UIScreen): + """Dialog screen for Yes - No questions.""" + + title = u"Question" + + def __init__(self, app, message): + """ + :param app: the running application reference + :type app: instance of App class + + :param message: the message to show to the user + :type message: unicode + """ + + tui.UIScreen.__init__(self, app) + self._message = message + self._response = None + + def refresh(self, args = None): + tui.UIScreen.refresh(self, args) + text = tui.TextWidget(self._message) + self._window.append(tui.CenterWidget(text)) + self._window.append(u"") + return True + + def prompt(self, args): + return u"Please respond 'yes' or 'no': " + + def input(self, args, key): + if key == "yes": + self._response = True + self.close() + return None + + elif key == "no": + self._response = False + self.close() + return None + + else: + return False + + @property + def answer(self): + """The response can be True (yes), False (no) or None (no response).""" + return self._response + +class TextUserInterface(ui.UserInterface): + """This is the main class for Text user interface.""" + + def __init__(self, storage, payload, instclass): + """ + For detailed description of the arguments see + the parent class. + + :param storage: storage backend reference + :type storage: instance of pyanaconda.Storage + + :param payload: payload (usually yum) reference + :type payload: instance of payload handler + + :param instclass: install class reference + :type instclass: instance of install class + """ + + ui.UserInterface.__init__(self, storage, payload, instclass) + self._app = None + + def setup(self, data): + """Construct all the objects required to implement this interface. + This method must be provided by all subclasses. + """ + self._app = tui.App(u"Anaconda", yes_or_no_question = YesNoDialog) + self._hubs = [SummaryHub] + + # First, grab a list of all the standalone spokes. + path = os.path.join(os.path.dirname(__file__), "spokes") + actionClasses = self.getActionClasses("pyanaconda.ui.tui.spokes.%s", path, self._hubs, StandaloneSpoke) + + for klass in actionClasses: + obj = klass(self._app, data, self.storage, self.payload, self.instclass) + + # If we are doing a kickstart install, some standalone spokes + # could already be filled out. In taht case, we do not want + # to display them. + if isinstance(obj, StandaloneSpoke) and obj.completed: + del(obj) + continue + + self._app.schedule_window(obj) + + def run(self): + """Run the interface. This should do little more than just pass + through to something else's run method, but is provided here in + case more is needed. This method must be provided by all subclasses. + """ + self._app.run() + + ### + ### MESSAGE HANDLING METHODS + ### + def showError(self, message): + """Display an error dialog with the given message. After this dialog + is displayed, anaconda will quit. There is no return value. This + method must be implemented by all UserInterface subclasses. + + In the code, this method should be used sparingly and only for + critical errors that anaconda cannot figure out how to recover from. + """ + error_window = ErrorDialog(self._app, message) + self._app.switch_window(error_window) + + def showYesNoQuestion(self, message): + """Display a dialog with the given message that presents the user a yes + or no choice. This method returns True if the yes choice is selected, + and False if the no choice is selected. From here, anaconda can + figure out what to do next. This method must be implemented by all + UserInterface subclasses. + + In the code, this method should be used sparingly and only for those + times where anaconda cannot make a reasonable decision. We don't + want to overwhelm the user with choices. + """ + question_window = YesNoDialog(self._app, message) + self._app.switch_window_modal(question_window) + return question_window.answer diff --git a/pyanaconda/ui/tui/hubs/Makefile.am b/pyanaconda/ui/tui/hubs/Makefile.am new file mode 100644 index 0000000..f099b76 --- /dev/null +++ b/pyanaconda/ui/tui/hubs/Makefile.am @@ -0,0 +1,24 @@ +# 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 Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Chris Lumens <clumens(a)redhat.com> + +SUBDIRS = + +MAINTAINERCLEANFILES = Makefile.in + +pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME) +hubsdir = $(pkgpyexecdir)/ui/tui/hubs +hubs_PYTHON = *.py diff --git a/pyanaconda/ui/tui/hubs/__init__.py b/pyanaconda/ui/tui/hubs/__init__.py new file mode 100644 index 0000000..87e9460 --- /dev/null +++ b/pyanaconda/ui/tui/hubs/__init__.py @@ -0,0 +1,96 @@ +# The base classes for Anaconda TUI Hubs +# +# Copyright (C) (2012) 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# +from .. import simpleline as tui +from pyanaconda.ui.tui.tuiobject import TUIObject +from pyanaconda.ui.tui.spokes import collect_spokes +from pyanaconda.ui import common + +class TUIHub(TUIObject, common.Hub): + """Base Hub class implementing the pyanaconda.ui.common.Hub interface. + It uses text based categories to look for relevant Spokes and manages + all the spokes it finds to have the proper category. + + :param categories: list all the spoke categories to be displayed in this Hub + :type categories: list of strings + + :param title: title for this Hub + :type title: unicode + + """ + + categories = [] + title = "Default HUB title" + + def __init__(self, app, data, storage, payload, instclass): + TUIObject.__init__(self, app, data) + common.Hub.__init__(self, data, storage, payload, instclass) + + self._spokes = {} # holds spokes referenced by their class name + self._keys = {} # holds spokes referenced by their user input key + self._spoke_count = 0 + + # look for spokes having category present in self.categories + for c in self.categories: + spokes = collect_spokes(c) + + # sort them according to their priority + for s in sorted(spokes, key = lambda s: s.priority): + spoke = s(app, data, storage, payload, instclass) + spoke.initialize() + + if not spoke.showable: + spoke.teardown() + del spoke + continue + + self._spoke_count += 1 + self._keys[self._spoke_count] = spoke + self._spokes[spoke.__class__.__name__] = spoke + + + def refresh(self, args = None): + """This methods fills the self._window list by all the objects + we want shown on this screen. Title and Spokes mostly.""" + TUIObject.refresh(self, args) + + def _prep(i, w): + number = tui.TextWidget("%2d)" % i) + return tui.ColumnWidget([(3, [number]), (None, [w])], 1) + + # split spokes to two columns + left = [_prep(i, w) for i,w in self._keys.iteritems() if i % 2 == 1] + right = [_prep(i, w) for i,w in self._keys.iteritems() if i % 2 == 0] + + c = tui.ColumnWidget([(39, left), (39, right)], 2) + self._window.append(c) + + return True + + def input(self, args, key): + """Handle user input. Numbers are used to show a spoke, the rest is passed + to the higher level for processing.""" + try: + number = int(key) + self.app.switch_screen_with_return(self._keys[number]) + return None + + except (ValueError, KeyError): + return key diff --git a/pyanaconda/ui/tui/hubs/summary.py b/pyanaconda/ui/tui/hubs/summary.py new file mode 100644 index 0000000..25d33f2 --- /dev/null +++ b/pyanaconda/ui/tui/hubs/summary.py @@ -0,0 +1,8 @@ +from pyanaconda.ui.tui.hubs import TUIHub + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + +class SummaryHub(TUIHub): + title = _("Install hub") + categories = ["source", "localization", "destination", "password"] diff --git a/pyanaconda/ui/tui/simpleline/Makefile.am b/pyanaconda/ui/tui/simpleline/Makefile.am new file mode 100644 index 0000000..555931b --- /dev/null +++ b/pyanaconda/ui/tui/simpleline/Makefile.am @@ -0,0 +1,24 @@ +# 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 Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Chris Lumens <clumens(a)redhat.com> + +SUBDIRS = + +MAINTAINERCLEANFILES = Makefile.in + +pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME) +simplelinedir = $(pkgpyexecdir)/ui/tui/simpleline +simpleline_PYTHON = *.py diff --git a/pyanaconda/ui/tui/simpleline/__init__.py b/pyanaconda/ui/tui/simpleline/__init__.py new file mode 100644 index 0000000..e290e4a --- /dev/null +++ b/pyanaconda/ui/tui/simpleline/__init__.py @@ -0,0 +1,23 @@ +# Library containing the TUI framework for Anaconda installer. +# +# Copyright (C) 2012 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# + +from base import * +from widgets import * diff --git a/pyanaconda/ui/tui/simpleline/base.py b/pyanaconda/ui/tui/simpleline/base.py new file mode 100644 index 0000000..edcb08f --- /dev/null +++ b/pyanaconda/ui/tui/simpleline/base.py @@ -0,0 +1,608 @@ +# Base classes for the Anaconda TUI framework. +# +# Copyright (C) 2012 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# + +__all__ = ["App", "UIScreen", "Widget"] + +import readline + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + +class ExitAllMainLoops(Exception): + """This exception ends the whole App mainloop structure. App.run() quits + after it is processed.""" + pass + +class ExitMainLoop(Exception): + """This exception ends the outermost mainloop. Used internally when dialogs + close.""" + pass + + +class App(object): + """This is the main class for TUI screen handling. It is responsible for + mainloop control and keeping track of the screen stack. + + Screens are organized in stack structure so it is possible to return + to caller when dialog or sub-screen closes. + + It supports four window transitions: + - show new screen replacing the current one (linear progression) + - show new screen keeping the current one in stack (hub & spoke) + - show new screen and wait for it to end (dialog) + - close current window and return to the next one in stack + """ + + START_MAINLOOP = True + STOP_MAINLOOP = False + NOP = None + + def __init__(self, title, yes_or_no_question = None, width = 80): + """ + :param title: application title for whenever we need to display app name + :type title: unicode + + :param yes_or_no_question: UIScreen object class used for Quit dialog + :type yes_or_no_question: class UIScreen accepting additional message arg + + :param width: screen width for rendering purposes + :type width: int + """ + + self._header = title + self._spacer = "\n".join(2*[width*"="]) + self._width = width + self.quit_question = yes_or_no_question + + # screen stack contains triplets + # UIScreen to show + # arguments for it's show method + # value indicating whether new mainloop is needed + # - None = do nothing + # - True = execute new loop + # - False = already running loop, exit when window closes + self._screens = [] + + def switch_screen(self, ui, args = None): + """Schedules a screen to replace the current one. + + :param ui: screen to show + :type ui: instance of UIScreen + + :param args: optional argument to pass to ui's refresh method (can be used to select what item should be displayed or so) + :type args: anything + + """ + + oldscr, oldattr, oldloop = self._screens.pop() + + # we have to keep the oldloop value so we stop + # dialog's mainloop if it ever uses switch_screen + self._screens.append((ui, args, oldloop)) + self.redraw() + + def switch_screen_with_return(self, ui, args = None): + """Schedules a screen to show, but keeps the current one in stack + to return to, when the new one is closed. + + :param ui: screen to show + :type ui: UIScreen instance + + :param args: optional argument, please see switch_screen for details + :type args: anything + """ + + self._screens.append((ui, args, self.NOP)) + self.redraw() + + def switch_screen_modal(self, ui, args = None): + """Starts a new screen right away, so the caller can collect data back. + When the new screen is closed, the caller is redisplayed. + + This method does not return until the new screen is closed. + + :param ui: screen to show + :type ui: UIScreen instance + + :param args: optional argument, please see switch_screen for details + :type args: anything + """ + + # set the third item to True so new loop gets started + self._screens.append((ui, args, self.START_MAINLOOP)) + self._do_redraw() + + def schedule_screen(self, ui, args = None): + """Add screen to the bottom of the stack. This is mostly usefull + at the beginning to prepare the first screen hierarchy to display. + + :param ui: screen to show + :type ui: UIScreen instance + + :param args: optional argument, please see switch_screen for details + :type args: anything + """ + self._screens.insert(0, (ui, args, self.NOP)) + + def close_screen(self, scr = None): + """Close the currently displayed screen and exit it's main loop + if necessary. Next screen from the stack is then displayed. + + :param scr: if an UIScreen instance is passed it is checked to be the screen we are trying to close. + :type scr: UIScreen instance + """ + + oldscr, oldattr, oldloop = self._screens.pop() + if scr is not None: + assert oldscr == scr + + # this cannot happen, if we are closing the window, + # the loop must have been running or not be there at all + assert oldloop != self.START_MAINLOOP + + # we are in modal window, end it's loop + if oldloop == self.STOP_MAINLOOP: + raise ExitMainLoop() + + if self._screens: + self.redraw() + else: + raise ExitMainLoop() + + def _do_redraw(self): + """Draws the current screen and returns True if user input is requested. + If modal screen is requested, starts a new loop and initiates redraw after it ends. + + :return: this method returns True if user input processing is requested + :rtype: bool + """ + + # there is nothing to display, exit + if not self._screens: + raise ExitMainLoop() + + # get the screen from the top of the stack + screen, args, newloop = self._screens[-1] + + # new mainloop is requested + if newloop == self.START_MAINLOOP: + # change the record to indicate mainloop is running + self._screens.pop() + self._screens.append((screen, args, self.STOP_MAINLOOP)) + # start the mainloop + self._mainloop() + # after the mainloop ends, set the redraw flag + # and skip the input processing once, to redisplay the screen first + self.redraw() + input_needed = False + else: + # get the widget tree from the screen and show it in the screen + input_needed = screen.refresh(args) + screen.window.show_all() + self._redraw = False + + return input_needed + + def run(self): + """This methods starts the application. Do not use self.mainloop() directly + as run() handles all the required exceptions needed to keep nested mainloops + working.""" + + try: + self._mainloop() + except ExitAllMainLoops: + pass + + def _mainloop(self): + """Single mainloop. Do not use directly, start the application using run().""" + + # ask for redraw by default + self._redraw = True + + # inital state + last_screen = None + error_counter = 0 + + # run until there is nothing else to display + while self._screens: + # if redraw is needed, separate the content on the screen from the + # stuff we are about to display now + if self._redraw: + print self._spacer + + try: + # draw the screen if redraw is needed or the screen changed + # (unlikely to happen separately, but just be sure) + if self._redraw or last_screen != self._screens[-1]: + # we have fresh screen, reset error counter + error_counter = 0 + if not self._do_redraw(): + # if no input processing is requested, go for another cycle + continue + + last_screen = self._screens[-1][0] + + # get the screen's prompt + prompt = last_screen.prompt(self._screens[-1][1]) + + # None means prompt handled the input by itself + # ask for redraw and continue + if prompt is None: + self.redraw() + continue + + # get the input from user + c = self.raw_input(prompt) + + # process the input, if it wasn't processed (valid) + # increment the error counter + if not self.input(self._screens[-1][1], c): + error_counter += 1 + + # redraw the screen after 5 bad inputs + if error_counter >= 5: + self.redraw() + + # end just this loop + except ExitMainLoop: + break + + # propagate higher to end all loops + # not really needed here, but we might need + # more processing in the future + except ExitAllMainLoops: + raise + + def raw_input(self, prompt): + """This method reads one input from user. Its basic form has only one line, + but we might need to override it for more complex apps or testing.""" + return raw_input(prompt) + + def input(self, args, key): + """Method called internally to process unhandled input key presses. + Also handles the main quit and close commands. + + :param args: optional argument passed from switch_screen calls + :type args: anything + + :param key: the string entered by user + :type key: unicode + + :return: True if key was processed, False if it was not recognized + :rtype: True|False + + """ + + # delegate the handling to active screen first + if self._screens: + key = self._screens[-1][0].input(args, key) + if key is None: + return True + + # global close command + if self._screens and (key == _('c')): + self.close_screen() + return True + + # global quit command + elif self._screens and (key == _('q')): + if self.quit_question: + d = self.quit_question(self, _(u"Do you really want to quit?")) + self.switch_screen_modal(d) + if d.answer: + raise ExitAllMainLoops() + return True + + return False + + def redraw(self): + """Set the redraw flag so the screen is refreshed as soon as possible.""" + self._redraw = True + + @property + def header(self): + return self._header + + @property + def width(self): + """Return the total width of screen space we have available.""" + return self._width + +class UIScreen(object): + """Base class representing one TUI Screen. Shares some API with anaconda's GUI + to make it easy for devs to create similar UI with the familiar API.""" + + # title line of the screen + title = u"Screen.." + + def __init__(self, app): + """ + :param app: reference to application main class + :type app: instance of class App + """ + + self._app = app + + # list that holds the content to be printed out + self._window = [] + + def refresh(self, args = None): + """Method which prepares the content desired on the screen to self._window. + + :param args: optional argument passed from switch_screen calls + :type args: anything + + :return: has to return True if input processing is requested, otherwise + the screen will get printed and the main loop will continue + :rtype: True|False + """ + + self._window = [self.title, u""] + return True + + @property + def window(self): + """Return reference to the window instance. In TUI, just return self.""" + return self + + def show_all(self): + """Prepares all elements of self._window for output and then prints + them on the screen.""" + + for w in self._window: + if hasattr(w, "render"): + w.render(self.app.width) + print unicode(w) + + show = show_all + + def hide(self): + """This does nothing in TUI, it is here to make API similar.""" + pass + + def input(self, args, key): + """Method called to process input. If the input is not handled here, return it. + + :param key: input string to process + :type key: unicode + + :param args: optional argument passed from switch_screen calls + :type args: anything + + :return: return True or None if key was handled, False if the screen should not + process input on the App and key if you want it to. + :rtype: True|False|None|unicode + """ + + return key + + def prompt(self, args = None): + """Return the text to be shown as prompt or handle the prompt and return None. + + :param args: optional argument passed from switch_screen calls + :type args: anything + + :return: returns text to be shown next to the prompt for input or None + to skip further input processing + :rtype: unicode|None + """ + return _(u"\tPlease make your choice from above ['q' to quit]: ") + + @property + def app(self): + """The reference to this Screen's assigned App instance.""" + return self._app + + def close(self): + """Close the current screen.""" + self.app.close_screen(self) + +class Widget(object): + def __init__(self, max_width = None, default = None): + """Initializes base Widgets buffer. + + :param max_width: server as a hint about screen size to write method with default arguments + :type max_width: int + + :param default: string containing the default content to fill the buffer with + :type default: string + """ + + self._buffer = [] + if default: + self._buffer = [[c for c in l] for l in default.split("\n")] + self._max_width = max_width + self._cursor = (0, 0) # row, col + + @property + def height(self): + """The current height of the internal buffer.""" + return len(self._buffer) + + @property + def width(self): + """The current width of the internal buffer + (id of the first empty column).""" + return reduce(lambda acc,l: max(acc, len(l)), self._buffer, 0) + + def clear(self): + """Clears this widgets buffer and resets cursor.""" + self._buffer = list() + self._cursor = (0, 0) + + @property + def content(self): + """This has to return list (rows) of lists (columns) with one character elements.""" + return self._buffer + + def render(self, width = None): + """This method has to redraw the widget's self._buffer. + + :param width: the width of buffer requested by the caller + :type width: int + + This method will commonly call render of child widgets and then draw and write + methods to copy their contents to self._buffer + """ + self.clear() + + def __unicode__(self): + """Method to render the screen when printing as unicode string.""" + return u"\n".join([u"".join(l) for l in self._buffer]) + + def setxy(self, row, col): + """Sets cursor position. + + :param row: row id, starts with 0 at the top of the screen + :type row: int + + :param col: column id, starts with 0 on the left side of the screen + :type col: int + """ + self._cursor = (row, col) + + @property + def cursor(self): + return self._cursor + + def setend(self): + """Sets the cursor to first column in new line at the end.""" + self._cursor = (self.height, 0) + + def draw(self, w, row = None, col = None, block = False): + """This method copies w widget's content to this widget's buffer at row, col position. + + :param w: widget to take content from + :type w: class Widget + + :param row: row number to start at (default is at the cursor position) + :type row: int + + :param col: column number to start at (default is at the cursor position) + :type col: int + + :param block: when printing newline, start at column col (True) or at column 0 (False) + :type block: boolean + """ + + # if the starting row is not present, start at the cursor position + if row is None: + row = self._cursor[0] + + # if the starting column is not present, start at the cursor position + if col is None: + col = self._cursor[1] + + # fill up rows to accomodate for w.height + if self.height < row + w.height: + for i in range(row + w.height - self.height): + self._buffer.append(list()) + + # append columns to accomodate for w.width + for l in range(row, row + w.height): + l_len = len(self._buffer[l]) + w_len = len(w.content[l - row]) + if l_len < col + w_len: + self._buffer[l] += ((col + w_len - l_len) * list(u" ")) + self._buffer[l][col:col + w_len] = w.content[l - row][:] + + # move the cursor to new spot + if block: + self._cursor = (row + w.height, col) + else: + self._cursor = (row + w.height, 0) + + def write(self, text, row = None, col = None, width = None, block = False): + """This method emulates typing machine writing to this widget's buffer. + + :param text: text to type + :type text: unicode + + :param row: row number to start at (default is at the cursor position) + :type row: int + + :param col: column number to start at (default is at the cursor position) + :type col: int + + :param width: wrap at "col" + "width" column (default is at self._max_width) + :type width: int + + :param block: when printing newline, start at column col (True) or at column 0 (False) + :type block: boolean + """ + + if row is None: + row = self._cursor[0] + + if col is None: + col = self._cursor[1] + + if width is None and self._max_width: + width = self._max_width - col + + x = row + y = col + + # emulate typing machine + for c in text: + # process newline + if c == "\n": + x += 1 + if block: + y = col + else: + y = 0 + continue + + # if the line is not in buffer, create it + if x >= len(self._buffer): + for i in range(x - len(self._buffer) + 1): + self._buffer.append(list()) + + # if the line's length is not enough, fill it with spaces + if y >= len(self._buffer[x]): + self._buffer[x] += ((y - len(self._buffer[x]) + 1) * list(u" ")) + + + # "type" character + self._buffer[x][y] = c + + # shift to the next char + y += 1 + if not width is None and y >= col + width: + x += 1 + if block: + y = col + else: + y = 0 + + self._cursor = (x, y) + +if __name__ == "__main__": + class HelloWorld(UIScreen): + def show(self, args = None): + print """Hello World\nquit by typing 'quit'""" + return True + + a = App("Hello World") + s = HelloWorld(a, None) + a.schedule_screen(s) + a.run() diff --git a/pyanaconda/ui/tui/simpleline/base_test.py b/pyanaconda/ui/tui/simpleline/base_test.py new file mode 100644 index 0000000..e5d8e44 --- /dev/null +++ b/pyanaconda/ui/tui/simpleline/base_test.py @@ -0,0 +1,122 @@ +# Test routines for the simpleline framework +# +# Copyright (C) (2012) 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# +import base +import unittest + +### dummy translation +def _(t): + return t +__builtins__._ = _ + + +class DummyScreen(base.UIScreen): + def refresh(self, args): + self._window = [] + return True + +class TestApp(base.App): + def __init__(self, *args, **kwargs): + self.simulate_input = [] + base.App.__init__(self, *args, **kwargs) + + def simulate(self, input): + self.simulate_input.append(input) + + def raw_input(self, prompt): + if not self.simulate_input: + raise Exception("No further input, the app probably failed the test") + return self.simulate_input.pop(0) + +class OKException(Exception): + pass + +def raiseOK(): + raise OKException() + +class AppTests(unittest.TestCase): + def setUp(self): + self.app = TestApp("title") + self.screen = DummyScreen(self.app) + + def test_schedule_adds_to_beginning_when_empty(self): + self.app.schedule_screen(base.UIScreen(self.app)) + assert len(self.app._screens) == 1 + + def test_schedule_adds_to_beginning_when_not_empty(self): + self.app.schedule_screen(None) + self.app.schedule_screen(base.UIScreen(self.app)) + assert len(self.app._screens) == 2 + assert self.app._screens[0][0] is not None + + def test_modal_starts_mainloop(self): + self.app._mainloop = raiseOK + self.assertRaises(OKException, self.app.switch_screen_modal, (self.screen,)) + + def test_exits_modal_screen(self): + self.app.simulate("c") + self.app.switch_screen_modal(self.screen) + +class WidgetTests(unittest.TestCase): + TEXT = u"test1\ntesting line\nte" + BLOCK = u"xxy\nxxx\nxxx" + BLOCK_TEXT = u"test1xxy\ntestixxxline\nte xxx" + + def setUp(self): + self.widget = base.Widget(default = self.TEXT) + + def test_height(self): + self.assertEquals(self.widget.height, 3) + + def test_width(self): + self.assertEquals(self.widget.width, 12) + + def test_clear(self): + self.widget.clear() + self.assertEquals(self.widget.content, []) + self.assertEquals(self.widget.cursor, (0, 0)) + + def test_rendering(self): + self.assertEqual(unicode(self.widget), self.TEXT) + + def test_draw(self): + target = base.Widget() + target.draw(self.widget) + self.assertEqual(unicode(target), self.TEXT) + + def test_write(self): + self.widget.clear() + self.widget.write(self.TEXT) + self.assertEqual(unicode(self.widget), self.TEXT) + + def test_block_write(self): + self.widget.setxy(0, 5) + self.widget.write(self.BLOCK, block = True) + self.assertEqual(unicode(self.widget), self.BLOCK_TEXT) + + def test_block_draw(self): + source = base.Widget() + source.write(self.BLOCK) + self.widget.draw(source, row = 0, col = 5) + self.assertEqual(unicode(self.widget), self.BLOCK_TEXT) + + +if __name__ == '__main__': + unittest.main() diff --git a/pyanaconda/ui/tui/simpleline/widgets.py b/pyanaconda/ui/tui/simpleline/widgets.py new file mode 100644 index 0000000..d6ef5c6 --- /dev/null +++ b/pyanaconda/ui/tui/simpleline/widgets.py @@ -0,0 +1,213 @@ +# encoding: utf-8 +# +# Widgets for Anaconda TUI. +# +# Copyright (C) 2012 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# + +__all__ = ["TextWidget", "ColumnWidget", "CheckboxWidget", "CenterWidget"] + +import base + +class TextWidget(base.Widget): + """Class to handle wrapped text output.""" + + def __init__(self, text): + """ + :param text: text to format + :type text: unicode + """ + + base.Widget.__init__(self) + self._text = text + + def render(self, width): + """Renders the text widget limited to width number of columns + (wraps to the next line when the text is longer). + + :param width: maximum width allocated to the string + :type width: int + + :raises + """ + + base.Widget.render(self, width) + self.write(self._text, width = width) + +class CenterWidget(base.Widget): + """Class to handle horizontal centering of content.""" + + def __init__(self, w): + """ + :param w: widget to center + :type w: base.Widget + """ + base.Widget.__init__(self) + self._w = w + + def render(self, width): + """ + Render the centered widget to internal buffer. + + :param width: maximum width the widget should use + :type width: int + """ + + base.Widget.render(self, width) + self._w.render(width) + self.draw(self._w, col = (width - self._w.width) / 2) + +class ColumnWidget(base.Widget): + def __init__(self, columns, spacing = 0): + """Create text columns + + :param columns: list containing (column width, [list of widgets to put into this column]) + :type columns: [(int, [...]), ...] + + :param spacing: number of spaces to use between columns + :type spacing: int + """ + + base.Widget.__init__(self) + self._spacing = spacing + self._columns = columns + + def render(self, width): + """Render the widget to it's internal buffer + + :param width: the maximum width the widget can use + :type width: int + + :return: nothing + :rtype: None + """ + + base.Widget.render(self, width) + + # the lefmost empty column + x = 0 + + # iterate over tuples (column width, column content) + for col_width,col in self._columns: + + # set cursor to first line and leftmost empty column + self.setxy(0, x) + + # if requested width is None, limit the maximum to width + # and set minimum to 0 + if col_width is None: + col_max_width = width - self.cursor[1] + col_width = 0 + else: + col_max_width = col_width + + # render and draw contents of column + for item in col: + item.render(col_max_width) + self.draw(item, block = True) + + # recompute the leftmost empty column + x = max((x + col_width), self.width) + self._spacing + +class CheckboxWidget(base.Widget): + """Widget to show checkbox with (un)checked box, name and description.""" + + def __init__(self, key = "x", title = None, text = None, completed = None): + """ + :param key: tick character to be used inside [ ] + :type key: character + + :param title: the title next to the [ ] box + :type title: unicode + + :param text: the description text to be shown on the second row in () + :type text: unicode + + :param completed: is the checkbox ticked or not? + :type completed: True|False + """ + + base.Widget.__init__(self) + self._key = key + self._title = title + self._text = text + self._completed = completed + + def render(self, width): + """Render the widget to internal buffer. It should be max width + characters wide.""" + base.Widget.render(self, width) + + if self.completed: + checkchar = self._key + else: + checkchar = " " + + # prepare the checkbox + checkbox = TextWidget("[%s]" % checkchar) + + data = [] + + # append lines + if self.title: + data.append(TextWidget(self.title)) + + if self.text: + data.append(TextWidget("(%s)" % self.text)) + + # the checkbox has two columns + # [x] is one and is 3 chars wide + # text is second and can occupy width - 3 - 1 (for space) chars + cols = ColumnWidget([(3, [checkbox]), (width - 4, data)], 1) + cols.render(width) + + # transfer the column widget rendered stuff to internal buffer + self.draw(cols) + + @property + def title(self): + """Returns the first line (main title) of the checkbox.""" + return self._title + + @property + def completed(self): + """Returns the state of the checkbox, checked is True.""" + return self._completed + + @property + def text(self): + """Contains the description text from the second line.""" + return self._text + +if __name__ == "__main__": + t1 = TextWidget(u"Můj krásný dlouhý text") + t2 = TextWidget(u"Test") + t3 = TextWidget(u"Test 2") + t4 = TextWidget(u"Krásný dlouhý text podruhé") + t5 = TextWidget(u"Test 3") + + c = ColumnWidget([(15, [t1, t2, t3]), (10, [t4, t5])], spacing = 1) + c.render(80) + print unicode(c) + + print 80*"-" + + c = ColumnWidget([(20, [t1, t2, t3]), (25, [t4, t5]), (15, [t1, t2, t3])], spacing = 3) + c.render(80) + print unicode(c) diff --git a/pyanaconda/ui/tui/spokes/Makefile.am b/pyanaconda/ui/tui/spokes/Makefile.am new file mode 100644 index 0000000..96cdff9 --- /dev/null +++ b/pyanaconda/ui/tui/spokes/Makefile.am @@ -0,0 +1,24 @@ +# 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 Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Chris Lumens <clumens(a)redhat.com> + +SUBDIRS = + +MAINTAINERCLEANFILES = Makefile.in + +pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME) +spokesdir = $(pkgpyexecdir)/ui/tui/spokes +spokes_PYTHON = *.py diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py new file mode 100644 index 0000000..ea85727 --- /dev/null +++ b/pyanaconda/ui/tui/spokes/__init__.py @@ -0,0 +1,90 @@ +# The base classes for Anaconda TUI Spokes +# +# Copyright (C) (2012) 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# +from .. import simpleline as tui +from pyanaconda.ui.tui.tuiobject import TUIObject +from pyanaconda.ui.common import Spoke, StandaloneSpoke, NormalSpoke, PersonalizationSpoke, collect +import os + +__all__ = ["TUISpoke", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke", + "collect_spokes", "collect_categories"] + +class TUISpoke(TUIObject, tui.Widget, Spoke): + """Base TUI Spoke class implementing the pyanaconda.ui.common.Spoke API. + It also acts as a Widget so we can easily add it to Hub, where is shows + as a summary box with title, description and completed checkbox. + + :param title: title of this spoke + :type title: unicode + + :param category: category this spoke belongs to + :type category: string + """ + + title = u"Default spoke title" + category = u"" + + def __init__(self, app, data, storage, payload, instclass): + TUIObject.__init__(self, app, data) + tui.Widget.__init__(self) + Spoke.__init__(self, data, storage, payload, instclass) + + @property + def status(self): + return "testing status..." + + @property + def completed(self): + return True + + def refresh(self, args = None): + TUIObject.refresh(self, args) + return True + + def input(self, args, key): + """Handle the input, the base class just forwards it to the App level.""" + return key + + def render(self, width): + """Render the summary representation for Hub to internal buffer.""" + tui.Widget.render(self, width) + c = tui.CheckboxWidget(completed = self.completed, title = self.title, text = self.status) + c.render(width) + self.draw(c) + +class StandaloneTUISpoke(TUISpoke, StandaloneSpoke): + pass + +class NormalTUISpoke(TUISpoke, NormalSpoke): + pass + +class PersonalizationTUISpoke(TUISpoke, PersonalizationSpoke): + pass + +def collect_spokes(category): + """Return a list of all spoke subclasses that should appear for a given + category. + """ + return collect("pyanaconda.ui.tui.spokes.%s", os.path.dirname(__file__), lambda obj: hasattr(obj, "category") and obj.category != None and obj.category == category) + +def collect_categories(): + classes = collect("pyanaconda.ui.tui.spokes.%s", os.path.dirname(__file__), lambda obj: hasattr(obj, "category") and obj.category != None and obj.category != "") + categories = set([c.category for c in classes]) + return categories diff --git a/pyanaconda/ui/tui/spokes/password.py b/pyanaconda/ui/tui/spokes/password.py new file mode 100644 index 0000000..7f0bdce --- /dev/null +++ b/pyanaconda/ui/tui/spokes/password.py @@ -0,0 +1,51 @@ +from pyanaconda.ui.tui.spokes import NormalTUISpoke +from pyanaconda.ui.tui.simpleline import TextWidget +import getpass + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + + +class PasswordSpoke(NormalTUISpoke): + title = _("Set root password") + category = "password" + + def __init__(self, app, data, storage, payload, instclass): + NormalTUISpoke.__init__(self, app, data, storage, payload, instclass) + self._password = None + + @property + def completed(self): + return self._password is not None + + @property + def status(self): + if self._password is None: + return _("Password is not set.") + else: + return _("Password is set.") + + def refresh(self, args = None): + NormalTUISpoke.refresh(self, args) + + self._window += [TextWidget(_("Please select new root password. You will have to type it twice.")), ""] + + return True + + def prompt(self, args = None): + """Overriden prompt as password typing is special.""" + p1 = getpass.getpass(_("Password: ")) + p2 = getpass.getpass(_("Password (confirm): ")) + + if p1 != p2: + print _("Passwords do not match!") + else: + self._password = p1 + self.apply() + + self.close() + #return None + + def apply(self): + self.data.rootpw.password = self._password + self.data.rootpw.isCrypted = False diff --git a/pyanaconda/ui/tui/spokes/time.py b/pyanaconda/ui/tui/spokes/time.py new file mode 100644 index 0000000..3c083b2 --- /dev/null +++ b/pyanaconda/ui/tui/spokes/time.py @@ -0,0 +1,113 @@ +from pyanaconda.ui.tui.spokes import NormalTUISpoke +from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget +from pyanaconda import localization + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + +class TimeZoneSpoke(NormalTUISpoke): + title = _("Timezone settings") + category = "localization" + + def __init__(self, app, data, storage, payload, instclass): + NormalTUISpoke.__init__(self, app, data, storage, payload, instclass) + + def initialize(self): + self._timezones = dict([(k, sorted(v)) for k,v in localization.get_all_regions_and_timezones().iteritems()]) + self._regions = [r for r in self._timezones] + self._lower_regions = [r.lower() for r in self._timezones] + + self._zones = ["%s/%s" % (region, z) for region in self._timezones for z in self._timezones[region]] + self._lower_zones = [z.lower() for region in self._timezones for z in self._timezones[region]] # for lowercase lookup + + self._selection = "" + + @property + def completed(self): + return self.data.timezone.timezone or self._selection + + @property + def status(self): + if self.data.timezone.timezone: + return _("%s timezone") % self.data.timezone.timezone + elif self._selection: + return _("%s timezone") % self._selection + else: + return _("Timezone is not set.") + + + def refresh(self, args = None): + """args is None if we want a list of zones or "zone" to show all timezones in that zone.""" + NormalTUISpoke.refresh(self, args) + + if args and args in self._timezones: + self._window += [TextWidget(_("Available timezones in region %s") % args)] + displayed = [TextWidget(z) for z in self._timezones[args]] + else: + self._window += [TextWidget(_("Available regions"))] + displayed = [TextWidget(z) for z in self._regions] + + def _prep(i, w): + number = TextWidget("%2d)" % i) + return ColumnWidget([(4, [number]), (None, [w])], 1) + + # split zones to three columns + middle = len(displayed) / 3 + left = [_prep(i, w) for i,w in enumerate(displayed) if i <= middle] + center = [_prep(i, w) for i,w in enumerate(displayed) if i > middle and i <= 2*middle] + right = [_prep(i, w) for i,w in enumerate(displayed) if i > 2*middle] + + c = ColumnWidget([(24, left), (24, center), (24, right)], 3) + self._window.append(c) + + return True + + def input(self, args, key): + try: + keyid = int(key) + if args: + self._selection = "%s/%s" % (args, self._timezones[args][keyid]) + self.apply() + self.close() + else: + if len(self._timezones[self._regions[keyid]]) == 1: + self._selection = "%s/%s" % (self._regions[keyid], + self._timezones[self._regions[keyid]][0]) + self.apply() + self.close() + else: + self.app.switch_screen(self, self._regions[keyid]) + return True + except ValueError: + pass + + if key.lower() in self._lower_zones: + id = self._lower_zones.index(key.lower()) + self._selection = self._zones[id] + self.apply() + self.close() + return True + + elif key.lower() in self._lower_regions: + id = self._lower_regions.index(key.lower()) + if len(self._timezones[self._regions[id]]) == 1: + self._selection = "%s/%s" % (self._regions[id], + self._timezones[self._regions[id]][0]) + self.apply() + self.close() + else: + self.app.switch_screen(self, self._regions[id]) + return True + + elif key.lower() == "b": + self.app.switch_screen(self, None) + return True + + else: + return key + + def prompt(self, args): + return _("Please select the timezone.\nUse numbers or type names directly [b to region list, q to quit]: ") + + def apply(self): + self.data.timezone.timezone = self._selection diff --git a/pyanaconda/ui/tui/tools/Makefile.am b/pyanaconda/ui/tui/tools/Makefile.am new file mode 100644 index 0000000..abd5472 --- /dev/null +++ b/pyanaconda/ui/tui/tools/Makefile.am @@ -0,0 +1,18 @@ +# 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 Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Chris Lumens <clumens(a)redhat.com> + +EXTRA_DIST = run-text-hub.py run-text-spoke.py diff --git a/pyanaconda/ui/tui/tools/run-text-hub.py b/pyanaconda/ui/tui/tools/run-text-hub.py new file mode 120000 index 0000000..506993e --- /dev/null +++ b/pyanaconda/ui/tui/tools/run-text-hub.py @@ -0,0 +1 @@ +run-text-spoke.py \ No newline at end of file diff --git a/pyanaconda/ui/tui/tools/run-text-spoke.py b/pyanaconda/ui/tui/tools/run-text-spoke.py new file mode 100755 index 0000000..b542fcb --- /dev/null +++ b/pyanaconda/ui/tui/tools/run-text-spoke.py @@ -0,0 +1,105 @@ +#!/usr/bin/python + +import sys, os +import os.path + +# Check command line arguments +if len(sys.argv)<2: + print "Usage: $0 <spoke module name> [<spoke widget class>]" + sys.exit(1) + +# Logging always needs to be set up first thing, or there'll be tracebacks. +from pyanaconda import anaconda_log +anaconda_log.init() + +from pyanaconda.installclass import DefaultInstall +from pyanaconda.storage import Storage +from pyanaconda.threads import initThreading +from pyanaconda.packaging.yumpayload import YumPayload +from pyanaconda.platform import getPlatform +from pykickstart.version import makeVersion +from pyanaconda.ui.tui.simpleline import App +from pyanaconda.ui.tui import YesNoDialog + +# Don't worry with fcoe, iscsi, dasd, any of that crud. +from pyanaconda.flags import flags +flags.imageInstall = True +flags.testing = True + +initThreading() + +# Figure out the part we are about to show: hub/spoke? +# And get the name of the module which represents it +if os.path.basename(sys.argv[0]) == "run-text-spoke.py": + spokeModuleName = "pyanaconda.ui.tui.spokes.%s" % sys.argv[1] + from pyanaconda.ui.common import Spoke + spokeBaseClass = Spoke + spokeText = "spoke" + SpokeText = "Spoke" +elif os.path.basename(sys.argv[0]) == "run-text-hub.py": + spokeModuleName = "pyanaconda.ui.tui.hubs.%s" % sys.argv[1] + from pyanaconda.ui.common import Hub + spokeBaseClass = Hub + spokeText = "hub" + SpokeText = "Hub" +else: + print "You have to run this command as run-spoke.py or run-hub.py." + sys.exit(1) + +# Set default spoke class +spokeClass = None +spokeClassName = None + +# Load spoke specified on the command line +# If the spoke module was specified, but the spoke class was not, +# try to find it using class hierarchy +try: + spokeClassName = sys.argv[2] + __import__(spokeModuleName, fromlist = [spokeClassName]) + spokeModule = sys.modules[spokeModuleName] +except IndexError: + __import__(spokeModuleName) + spokeModule = sys.modules[spokeModuleName] + for k,v in vars(spokeModule).iteritems(): + try: + print k,v + if issubclass(v, spokeBaseClass) and v != spokeBaseClass: + spokeClassName = k + spokeClass = v + except TypeError: + pass + +if not spokeClass: + try: + spokeClass = getattr(spokeModule, spokeClassName) + except KeyError: + print "%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName) + sys.exit(1) + + +print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule) + +platform = getPlatform() +ksdata = makeVersion() +storage = Storage(data=ksdata, platform=platform) +storage.reset() +instclass = DefaultInstall() +app = App("TEST HARNESS", yes_or_no_question = YesNoDialog) + +payload = YumPayload(ksdata) +payload.setup(storage) +payload.install_log = sys.stdout + +spoke = spokeClass(app, ksdata, storage, payload, instclass) + +if not spoke.showable: + print "This %s is not showable, but I'll continue anyway." % spokeText + +app.schedule_screen(spoke) +app.run() + +if hasattr(spoke, "status"): + print "%s status:\n%s\n" % (SpokeText, spoke.status) +if hasattr(spoke, "completed"): + print "%s completed:\n%s\n" % (SpokeText, spoke.completed) +print "%s kickstart fragment:\n%s" % (SpokeText, ksdata) diff --git a/pyanaconda/ui/tui/tuiobject.py b/pyanaconda/ui/tui/tuiobject.py new file mode 100644 index 0000000..35c920f --- /dev/null +++ b/pyanaconda/ui/tui/tuiobject.py @@ -0,0 +1,59 @@ +# base TUIObject for Anaconda TUI +# +# Copyright (C) 2012 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. +# +# Red Hat Author(s): Martin Sivak <msivak(a)redhat.com> +# + +from pyanaconda.ui import common +import simpleline as tui + +class TUIObject(tui.UIScreen, common.UIObject): + """Base class for Anaconda specific TUI screens. Implements the + common pyanaconda.ui.common.UIObject interface""" + + title = u"Default title" + + def __init__(self, app, data): + tui.UIScreen.__init__(self, app) + common.UIObject.__init__(self, data) + + @property + def showable(self): + return True + + def teardown(self): + pass + + def initialize(self): + """This method gets called whenever Hub or UserInterface prepares + all found objects for use. It is called only once and has no direct + connection to rendering.""" + pass + + def refresh(self, args = None): + """Put everything to display into self.window list.""" + tui.UIScreen.refresh(self, args) + + def retranslate(self): + """After language is changed, this method ensures that all the + texts on screen are translated. It only needs to refresh the + screen in text mode, as translation will happen automatically + and there is no way to change labels on previously displayed content.""" + + # redraw + self.app.switch_screen(self)

2 6

[PATCH] [master] new TUI
by Martin Sivak 10 Aug '12

10 Aug '12

Hi, (I already tried to submit this, but it is still not in the list, so I am consodering the mail to be lost and sending it again.) This patchset adds the TUI framework, summary hub and two spokes. The goal was to prepare API and set of classes which will resemble what we have in GUI - for both developers and users. It is also supposed to work even on dot matrix printer and very old and stupid consoles with no scrolling or cursor movement. Patchset was prepared on the rebased version of my newtui branch and is already merged to current master, so to see it work (or apply it) please checkout from my git repo: http://fedorapeople.org/cgit/msivak/public_git/anaconda.git/ git://fedorapeople.org/msivak/public_git/anaconda.git The documentation and framework tests are added by couple of patches in the second half of this set. The documentation format is the same as used on the python.org website (http://pypi.python.org/pypi/Sphinx/) To test this, you can use the Makefile targets: make runtextspoke SPOKE_MODULE=password SPOKE_CLASS=PasswordSpoke or make runtexthub HUB_MODULE=summary HUB_CLASS=SummaryHub For Jessie: There was a slight change in the API for screen, so please update the input and prompt methods if your work-in-progress spokes. Martin Martin Sivak (13): Text based UI framework core Make collect and part of UserInterface setup more generic Create the base classes for TUI Hub and Spoke model Create common abstract classes usable for all types of UI Fix bits and pieces to make TUI hub and spoke model work + example Hub and Password spoke Add the new Summary hub and Password TUI spokes + tools to test TUI stuff Add documentation to the simpleline library for TUI add documentation and comments to TUI classes add couple of tests and support for them add couple of tests and fix write method of widget (newline added unwanted space) Add automake files for TUI Pass screen args argument to prompt and input methods + fix for run-text-spoke Add elementary timezone spoke

4 49

[PATCH] With tmux, we no longer need to start up a shell during VNC installs.
by Chris Lumens 09 Aug '12

09 Aug '12

--- anaconda | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/anaconda b/anaconda index c9f4a32..1ad68a6 100755 --- a/anaconda +++ b/anaconda @@ -335,30 +335,6 @@ def expandFTPMethod(str): except: return None -def runVNC(vncS): - vncS.startServer() - - child = os.fork() - if child == 0: - for p in ('/tmp/updates/pyrc.py', \ - '/usr/share/anaconda/pyrc.py'): - if os.access(p, os.R_OK|os.X_OK): - os.environ['PYTHONSTARTUP'] = p - break - - while True: - # Not having a virtual terminal or otherwise free console - # are the only places we /really/ need a shell on tty1, - # and everywhere else this just gets in the way of pdb. But we - # don't want to return, because that'll return try to start X - # a second time. - if iutil.isConsoleOnVirtualTerminal() or iutil.isS390(): - time.sleep(10000) - else: - print _("Press <enter> for a shell") - sys.stdin.readline() - iutil.execConsole() - def gtk_warning(title, reason): import gtk dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, @@ -582,7 +558,7 @@ def setupDisplay(anaconda, opts): # if they want us to use VNC do that now if anaconda.displayMode == 'g' and flags.usevnc: - runVNC(vncS) + vncS.startServer() doStartupX11Actions() # with X running we can initialize the UI interface -- 1.7.11.2

2 1

[PATCH 1/2] Remove the last references to isysLoadKeymap.
by Chris Lumens 09 Aug '12

09 Aug '12

--- pyanaconda/isys/isys.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c index 35b2f33..9b9046a 100644 --- a/pyanaconda/isys/isys.c +++ b/pyanaconda/isys/isys.c @@ -92,7 +92,6 @@ static PyObject * doWipeRaidSuperblock(PyObject * s, PyObject * args); static PyObject * doGetRaidChunkSize(PyObject * s, PyObject * args); static PyObject * doDevSpaceFree(PyObject * s, PyObject * args); static PyObject * doResetResolv(PyObject * s, PyObject * args); -static PyObject * doLoadKeymap(PyObject * s, PyObject * args); static PyObject * doExt2Dirty(PyObject * s, PyObject * args); static PyObject * doExt2HasJournal(PyObject * s, PyObject * args); static PyObject * doEjectCdrom(PyObject * s, PyObject * args); @@ -384,23 +383,6 @@ static PyObject * doDevSpaceFree(PyObject * s, PyObject * args) { return PyLong_FromUnsignedLongLong(size>>20); } -static PyObject * doLoadKeymap (PyObject * s, PyObject * args) { - char * keymap; - int ret; - - if (!PyArg_ParseTuple(args, "s", &keymap)) return NULL; - - ret = isysLoadKeymap (keymap); - if (ret) { - errno = -ret; - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - Py_INCREF(Py_None); - return Py_None; -} - static PyObject * doExt2Dirty(PyObject * s, PyObject * args) { char * device; ext2_filsys fsys; -- 1.7.11.2

2 2

[PATCH 0/5] replace lokkit for selinux
by Brian C. Lane 09 Aug '12

09 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> Well, it does a bit more than that :) I decided it was better to make SimpleConfigFile more generally useful, so I did that first. This also removes a whole file, so that's a bonus. I added tests to the simpleconfig tests to cover the new features as well. I've tested this on pre-merge newui and it works. All the simpleconfig tests also pass. Brian C. Lane (5): simpleconfig: rewrite to better support commented config files tests: cleanup whitespace in simpleconfig_test.py tests: Add tests for new SimpleConfigFile features replace lokkit for selinux settings (#815540) remove Security class pyanaconda/__init__.py | 4 +- pyanaconda/install.py | 1 + pyanaconda/kickstart.py | 20 +++ pyanaconda/security.py | 63 -------- pyanaconda/simpleconfig.py | 222 ++++++++++++++++++---------- tests/pyanaconda_test/simpleconfig_test.py | 90 ++++++++---- 6 files changed, 227 insertions(+), 173 deletions(-) delete mode 100644 pyanaconda/security.py -- 1.7.7.6

2 10

[PATCH] Use the UEFI shim to load grub.
by Peter Jones 08 Aug '12

08 Aug '12

For UEFI Secure Boot support, we need to install the shim pre-boot loader, and use it to load grub2. --- pyanaconda/bootloader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index ea4de5e..fc01558 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1749,7 +1749,7 @@ class GRUB2(GRUB): self.stage2_device.format.sync(root=ROOT_PATH) class EFIGRUB(GRUB2): - packages = ["grub2-efi", "efibootmgr"] + packages = ["grub2-efi", "efibootmgr", "shim"] can_dual_boot = False @property @@ -1809,7 +1809,7 @@ class EFIGRUB(GRUB2): rc = self.efibootmgr("-c", "-w", "-L", productName, "-d", boot_disk.path, "-p", boot_part_num, "-l", - self.efi_dir_as_efifs_dir + "\\grubx64.efi", + self.efi_dir_as_efifs_dir + "\\bootx64.efi", root=ROOT_PATH, stdout="/dev/tty5", stderr="/dev/tty5") if rc: -- 1.7.11.2

2 2

[PATCH master] A little fix of newui -> master merge (iscsi offload devices)
by Radek Vykydal 08 Aug '12

08 Aug '12

--- pyanaconda/network.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 22025ff..0f38b5e 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -477,7 +477,7 @@ def waitForConnection(): # get a kernel cmdline string for dracut needed for access to storage host def dracutSetupArgs(networkStorageDevice): - if networkStorageDevice.nic == "default": + if networkStorageDevice.nic == "default" or ":" in networkStorageDevice.nic: nic = ifaceForHostIP(networkStorageDevice.host_address) if not nic: return "" @@ -885,7 +885,7 @@ def usedByRootOnISCSI(iface, storage): for d in storage.devices: if (isinstance(d, iScsiDiskDevice) and rootdev.dependsOn(d)): - if d.nic == "default": + if d.nic == "default" or ":" in d.nic: if iface == ifaceForHostIP(d.host_address): return True elif d.nic == iface: -- 1.7.4

2 1

[PATCH 1/2] add command line option to set the arm platform.
by Dennis Gilmore 07 Aug '12

07 Aug '12

Use case is to create images using livemedia-creator where we wont be running on the target platform. Signed-off-by: Dennis Gilmore <dennis(a)ausil.us> --- anaconda | 4 ++++ pyanaconda/flags.py | 1 + pyanaconda/iutil.py | 3 +++ 3 files changed, 8 insertions(+) diff --git a/anaconda b/anaconda index fc679c9..4bb2399 100755 --- a/anaconda +++ b/anaconda @@ -222,6 +222,7 @@ def parseOptions(argv=None, cmdline=None): op.add_option("--kickstart", dest="ksfile") op.add_option("--rescue", dest="rescue", action="store_true", default=False) op.add_option("--targetarch", "rpmarch", dest="targetArch", type="string") + op.add_option("--armplatform", "armplatform", dest="armPlatform", type="string") op.add_option("-m", "--method", dest="method", default=None) op.add_option("--repo", dest="method", default=None) @@ -803,6 +804,9 @@ if __name__ == "__main__": if opts.targetArch: flags.targetarch = opts.targetArch + if opts.armPlatform: + flags.armPlatform = opts.armPlatform + # set flags flags.dmraid = opts.dmraid flags.mpath = opts.mpath diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py index 92584fd..db5c5ef 100644 --- a/pyanaconda/flags.py +++ b/pyanaconda/flags.py @@ -58,6 +58,7 @@ class Flags(object): self.targetarch = None self.useIPv4 = True self.useIPv6 = True + self.armPlatform = None self.preexisting_x11 = False self.noverifyssl = False self.imageInstall = False diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index ed6d098..a57b643 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -627,6 +627,9 @@ def getARMMachine(): if not isARM(): return 0 + if flags.armPlatform: + return flags.armPlatform + armMachine = os.uname()[2].rpartition('.' )[2] if armMachine.startswith('arm'): -- 1.7.11.2

4 6

[PATCH anaconda/master] Modify kernelPackages to select the right kernel for ARM systems.
by d.marlin 07 Aug '12

07 Aug '12

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- pyanaconda/packaging/__init__.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 8c5a560..0a47ff6 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -600,6 +600,12 @@ class PackagePayload(Payload): def kernelPackages(self): from pyanaconda.isys import isPaeAvailable kernels = ["kernel"] + + # most ARM systems use platform-specific kernels + if iutil.isARM(): + if anaconda.platform.armMachine is not None: + kernels = ["kernel-%s" % anaconda.platform.armMachine] + if isPaeAvailable(): kernels.insert(0, "kernel-PAE") -- 1.7.6.5

2 2

[PATCH] Require new version of python-meh
by Vratislav Podzimek 07 Aug '12

07 Aug '12

--- anaconda.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 86fc57e..bcc59f4 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -40,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define yumutilsver 1.1.11-3 %define iscsiver 6.2.0.870-3 %define pythoncryptsetupver 0.1.1 -%define mehver 0.13-1 +%define mehver 0.14-1 %define sckeyboardver 1.3.1 %define libblkidver 2.17.1-1 %define fcoeutilsver 1.0.12-3.20100323git -- 1.7.11.2

2 1

[PATCH] ARM: add command line option to set the platform.
by Dennis Gilmore 03 Aug '12

03 Aug '12

Use case is to create images using livemedia-creator where we wont be running on the target platform Signed-off-by: Dennis Gilmore <dennis(a)ausil.us> --- anaconda | 4 ++++ pyanaconda/iutil.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/anaconda b/anaconda index fc679c9..c37dd72 100755 --- a/anaconda +++ b/anaconda @@ -222,6 +222,7 @@ def parseOptions(argv=None, cmdline=None): op.add_option("--kickstart", dest="ksfile") op.add_option("--rescue", dest="rescue", action="store_true", default=False) op.add_option("--targetarch", "rpmarch", dest="targetArch", type="string") + op.add_option("--targetplatform", "platform", dest="targetPlatform", type="string") op.add_option("-m", "--method", dest="method", default=None) op.add_option("--repo", dest="method", default=None) @@ -803,6 +804,9 @@ if __name__ == "__main__": if opts.targetArch: flags.targetarch = opts.targetArch + if opts.targetPlatform: + flags.platform = opts.targetPlatform + # set flags flags.dmraid = opts.dmraid flags.mpath = opts.mpath diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index ed6d098..aef4cc6 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -627,6 +627,9 @@ def getARMMachine(): if not isARM(): return 0 + if flags.platform: + return flags.platform + armMachine = os.uname()[2].rpartition('.' )[2] if armMachine.startswith('arm'): -- 1.7.10.4

4 10

[PATCH 1/2] ARM: break out the setup of OMAP systems as they need to have a vfat partition at the start of the disk in order for the SOC to load u-boot from. Signed-off-by: Dennis Gilmore <dennis@ausil.us>
by Dennis Gilmore 03 Aug '12

03 Aug '12

--- pyanaconda/platform.py | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py index 1611797..05a496f 100644 --- a/pyanaconda/platform.py +++ b/pyanaconda/platform.py @@ -348,6 +348,32 @@ class ARM(Platform): def armMachine(self): return self._armMachine +class omapARM(ARM): + _bootloaderClass = bootloader.UBOOTuEnv + _boot_stage1_format_types = ["vfat"] + _boot_stage1_device_types = ["partition"] + _boot_stage1_mountpoints = ["/boot/uboot"] + _boot_mbr_description = N_("Master Boot Record") + _boot_descriptions = {"disk": _boot_mbr_description, + "partition": Platform._boot_partition_description} + + def setDefaultPartitioning(self): + from storage.partspec import PartSpec + ret = Platform.setDefaultPartitioning(self) + ret.append(PartSpec(mountpoint="/boot/uboot", fstype="vfat", size=20, + maxSize=20, + grow=True, weight=self.weight(fstype="vfat"))) + return ret + + def weight(self, fstype=None, mountpoint=None): + score = Platform.weight(self, fstype=fstype, mountpoint=mountpoint) + if score: + return score + elif fstype == "vfat" and mountpoint == "/boot/uboot": + return 6000 + else: + return 0 + def getPlatform(anaconda): """Check the architecture of the system and return an instance of a Platform subclass to match. If the architecture could not be determined, @@ -375,6 +401,11 @@ def getPlatform(anaconda): elif iutil.isX86(): return X86(anaconda) elif iutil.isARM(): - return ARM(anaconda) + armMachine = iutil.getARMMachine() + + if (armMachine == "omap" ): + return omapARM(anaconda) + else: + return ARM(anaconda) else: raise SystemError, "Could not determine system architecture." -- 1.7.10.4

2 6

[PATCH] Do not run Gtk.main() from a separate thread in exception handling
by Vratislav Podzimek 03 Aug '12

03 Aug '12

Multiple threads drawing in a Gtk.main loop cause Gtk crash. To prevent such crashes, we need to run exception handling dialogs in the same thread as the main loop (if running). --- pyanaconda/exception.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 96c2c1a..70deed5 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -31,6 +31,7 @@ from flags import flags import kickstart import storage.errors from pyanaconda.constants import ROOT_PATH +from gi.repository import GLib import logging log = logging.getLogger("anaconda") @@ -41,6 +42,22 @@ _ = lambda x: gettext.ldgettext("anaconda", x) class AnacondaExceptionHandler(ExceptionHandler): def handleException(self, (ty, value, tb), obj): + + def run_handleException_on_idle(args_tuple): + """ + Helper function with one argument only so that it can be registered + with GLib.idle_add() to run on idle. + + @param args_tuple: ((ty, value, tb), obj) + + """ + + trace, obj = args_tuple + ty, value, tb = trace + + super(AnacondaExceptionHandler, self).handleException((ty, value, tb), + obj) + if issubclass(ty, storage.errors.StorageError) and value.hardware_fault: hw_error_msg = _("The installation was stopped due to what " "seems to be a problem with your hardware. " @@ -49,8 +66,14 @@ class AnacondaExceptionHandler(ExceptionHandler): self.intf.showError(hw_error_msg) sys.exit(0) else: - super(AnacondaExceptionHandler, self).handleException((ty, value, tb), - obj) + if GLib.main_depth() > 0: + # main loop is running, don't crash it by running another one + # potentially from a different thread + GLib.idle_add(run_handleException_on_idle, + ((ty, value, tb), obj)) + else: + super(AnacondaExceptionHandler, self).handleException( + (ty, value, tb), obj) def postWriteHook(self, (ty, value, tb), anaconda): # See if /mnt/sysimage is present and put exception there as well -- 1.7.10.4

2 2

[newui] Two fixes for the newui exception handling
by Vratislav Podzimek 03 Aug '12

03 Aug '12

PATCH 1/2 adds two methods needed by python-meh to user interfaces. We had such method in the old UI and the other way to do that would be some getattr hack, which I'd like to avoid. PATCH 2/2 removes the (not needed?) line causing traceback. Vratislav Podzimek (2): Add mainExceptionWindow and saveExceptionWindow methods to the interfaces Do not run __del__() on anaconda interface in runDebug pyanaconda/exception.py | 2 -- pyanaconda/ui/__init__.py | 12 ++++++++++++ pyanaconda/ui/gui/__init__.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) -- 1.7.10.4

2 6

[PATCH rhel6-branch] 802.1q vlan tagging support
by Radek Vykydal 02 Aug '12

02 Aug '12

Adding vlanid boot option and network --vlanid option. This patchset contains only support for configuration of devices activated in installer (which is the requested functionality), not for devices thet are to be only configured and not used in installer. Patch 3/4 - enablement of NM support for vlan and bonding in /etc/sysconfig/network may be temporary (need to discuss with NM guys).

2 8

[PATCH] Enable picking vnc port (#768318)
by Jesse Keating 02 Aug '12

02 Aug '12

This code allows a user to specify a vnc port for the vnc server to run on. Passing "vncport=<port>" as a boot parameter accomplishes this. Later we can wire it up into kickstart too. --- anaconda | 2 ++ pyanaconda/vnc.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index fc679c9..358ab80 100755 --- a/anaconda +++ b/anaconda @@ -240,6 +240,7 @@ def parseOptions(argv=None, cmdline=None): op.add_option("--vnc", action="store_true", default=False) op.add_option("--vncconnect") op.add_option("--vncpassword", default="") + op.add_option("--vncport", default="5901") op.add_option("--xdriver", dest="xdriver", action="store", type="string", default=None) # Language @@ -454,6 +455,7 @@ def setupDisplay(anaconda, opts): flags.usevnc = 1 anaconda.displayMode = 'g' vncS.password = opts.vncpassword + vncS.rfbport = opts.vncport # Only consider vncconnect when vnc is a param if opts.vncconnect: diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py index 2f87650..2798b1f 100644 --- a/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py @@ -51,6 +51,7 @@ class VncServer: self.name = name self.desktop = desktop self.password = password + self.rfbport = "5901" self.vncconnecthost = vncconnecthost self.vncconnectport = vncconnectport self.log_file = log_file @@ -101,10 +102,16 @@ class VncServer: if self.ip.find(':') != -1: ipstr = "[%s]" % (self.ip,) + display = self.display + # We default to 5901, which is :1. But if the port is changed we can't + # know what the shortcut is, so display the whole port. + if self.rfbport != "5901": + display = self.rfbport + if (self.name is not None) and (not self.name.startswith('localhost')) and (ipstr is not None): - self.connxinfo = "%s:%s (%s)" % (socket.getfqdn(name=self.name), self.display, ipstr,) + self.connxinfo = "%s:%s (%s)" % (socket.getfqdn(name=self.name), display, ipstr,) elif ipstr is not None: - self.connxinfo = "%s:%s" % (ipstr, self.display,) + self.connxinfo = "%s:%s" % (ipstr, display,) else: self.connxinfo = None @@ -197,6 +204,7 @@ class VncServer: xvnccommand = [ "Xvnc", ":%s" % self.display, "-depth", "16", "-br", "IdleTimeout=0", "-auth", "/dev/null", "-once", + "-rfbport=%s" % self.rfbport, "DisconnectClients=false", "desktop=%s" % (self.desktop,), "SecurityTypes=%s" % SecurityTypes, "rfbauth=%s" % rfbauth ] -- 1.7.11.2

2 1

[PATCH newui] write method and some hostname cleanup
by Radek Vykydal 02 Aug '12

02 Aug '12

- write networking configuration in doInstall - consolidate the code a bit - add ksdata.network.hostname (anaconda and kickstart patch)

2 15

[newui 1/2] Remove backend_log
by Brian C. Lane 02 Aug '12

02 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> The second instance of rsyslog is not needed, and it interferes with virtio logging. The yum and rpm file io logging will be dealt with in another patch. --- pyanaconda/backend_log.py | 95 ---------------------------------- pyanaconda/packaging/__init__.py | 27 ---------- pyanaconda/packaging/yumpayload.py | 15 +----- pyanaconda/ui/gui/tools/run-spoke.py | 1 - 4 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 pyanaconda/backend_log.py diff --git a/pyanaconda/backend_log.py b/pyanaconda/backend_log.py deleted file mode 100644 index 9125d73..0000000 --- a/pyanaconda/backend_log.py +++ /dev/null @@ -1,95 +0,0 @@ -# backend_log.py -# Logging infrastructure for Anaconda's backend. -# -# 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. -# -# Red Hat Author(s): Ales Kozumplik <akozumpl(a)redhat.com> -# - -import logging -import os -import signal - -import anaconda_log -import iutil - -SYSLOG_PATH = '/sbin/rsyslogd' -SYSLOG_PIDFILE = '/var/run/rsyslog_backend.pid' -SYSLOG_CFGFILE = '/tmp/rsyslog_backend.conf' - -CFG_TEMPLATE = """ -$ModLoad imuxsock -$InputUnixListenSocketHostName sysimage -$AddUnixListenSocket %(socket)s -+sysimage -*.* %(logfile)s;RSYSLOG_TraditionalFileFormat -%(remote_syslog)s -""" - -global_log = logging.getLogger("anaconda") -class BackendSyslog: - def __init__(self): - pass - - def build_cfg(self, root, log): - socket = "%s/dev/log" % (root, ) - remote_syslog = '' - if anaconda_log.logger.remote_syslog: - remote_syslog = "*.* @@%s" % (anaconda_log.logger.remote_syslog, ) - - cfg = CFG_TEMPLATE % { - 'socket' : socket, - 'logfile' : log, - 'remote_syslog' : remote_syslog - } - with open(SYSLOG_CFGFILE, 'w') as cfg_file: - cfg_file.write(cfg) - - def start(self, root, log): - """ Start an rsyslogd instance dedicated for the sysimage. - - Other possibility would be to change configuration and SIGHUP the - existing instance, but it could lose some of its internal queues and - give us problems with remote logging. - """ - self.build_cfg(root, log) - args = ['-c', '4', - '-f', SYSLOG_CFGFILE, - '-i', str(SYSLOG_PIDFILE)] - status = iutil.execWithRedirect(SYSLOG_PATH, args) - if status == 0: - global_log.info("Backend logger started.") - else: - global_log.error("Unable to start backend logger") - - def stop(self): - try: - with open(SYSLOG_PIDFILE, 'r') as pidfile: - pid = int(pidfile.read()) - os.kill(pid, signal.SIGKILL) - except Exception: - pass - else: - global_log.info("Backend logger stopped.") - - try: - os.unlink(SYSLOG_CFGFILE) - except OSError as e: - global_log.error("Failed to unlink backend logger config file: %s" - % e) - -log = BackendSyslog() diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 02a1a5d..19316e3 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -50,8 +50,6 @@ from pykickstart.parser import Group import logging log = logging.getLogger("anaconda") -from pyanaconda.backend_log import log as instlog - from pyanaconda.errors import * #from pyanaconda.progress import progress @@ -472,27 +470,6 @@ class Payload(object): """ Perform pre-installation tasks. """ iutil.mkdirChain(ROOT_PATH + "/root") - if self.data.upgrade.upgrade: - mode = "upgrade" - else: - mode = "install" - - log_file_name = "%s.log" % mode - log_file_path = "%s/root/%s" % (ROOT_PATH, log_file_name) - try: - shutil.rmtree (log_file_path) - except OSError: - pass - - self.install_log = open(log_file_path, "w+") - - syslogname = "%s.syslog" % log_file_path - try: - shutil.rmtree (syslogname) - except OSError: - pass - instlog.start(ROOT_PATH, syslogname) - if packages is not None: map(self.selectPackage, packages) @@ -595,10 +572,6 @@ class Payload(object): self._copyDriverDiskFiles() - # stop logger - instlog.stop() - - class ImagePayload(Payload): """ An ImagePayload installs an OS image to the target system. """ def __init__(self, data): diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 85f534c..0273c1b 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1002,13 +1002,8 @@ reposdir=%s self._yum.ts.order() self._yum.ts.clean() - # set up rpm logging to go to our log - self._yum.ts.ts.scriptFd = self.install_log.fileno() - rpm.setLogFile(self.install_log) - # create the install callback - rpmcb = RPMCallback(self._yum, self.install_log, - upgrade=self.data.upgrade.upgrade) + rpmcb = RPMCallback(self._yum, upgrade=self.data.upgrade.upgrade) if flags.testing: self._yum.ts.setFlags(rpm.RPMTRANS_FLAG_TEST) @@ -1038,10 +1033,8 @@ reposdir=%s raise exn else: log.info("transaction complete") - self.install_log.write("*** FINISHED INSTALLING PACKAGES ***") progress.send_step() finally: - self.install_log.close() self._yum.ts.close() iutil.resetRpmDb() @@ -1069,9 +1062,8 @@ reposdir=%s super(YumPayload, self).postInstall() class RPMCallback(object): - def __init__(self, yb, log, upgrade=False): + def __init__(self, yb, upgrade=False): self._yum = yb # yum.YumBase - self.install_log = log # file instance self.upgrade = upgrade # boolean self.package_file = None # file instance (package file management) @@ -1134,9 +1126,6 @@ class RPMCallback(object): self.completed_actions, self.total_actions) log.info(log_msg) - self.install_log.write("%s %s\n" % (time.strftime("%H:%M:%S"), - log_msg)) - self.install_log.flush() progress.send_message(progress_msg) self.package_file = None diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index 6114155..5f5a44a 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -98,7 +98,6 @@ instclass = DefaultInstall() payload = YumPayload(ksdata) payload.setup(storage) -payload.install_log = sys.stdout spoke = spokeClass(ksdata, storage, payload, instclass) if hasattr(spoke, "register_event_cb"): -- 1.7.7.6

2 2

[PATCH lorax/master] Add platforms to the treeinfo for Beaker support.
by d.marlin 02 Aug '12

02 Aug '12

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> --- share/arm.tmpl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/share/arm.tmpl b/share/arm.tmpl index bf6eef9..bb65e7c 100644 --- a/share/arm.tmpl +++ b/share/arm.tmpl @@ -22,6 +22,9 @@ mkdir ${LIVEDIR} install ${runtime_img} ${LIVEDIR}/squashfs.img treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img +# Add platforms to treeinfo for Beaker support. +treeinfo ${basearch} platforms highbank,imx,mvebu,omap,tegra + ## install kernels mkdir ${KERNELDIR} %for kernel in kernels: -- 1.7.6.5

1 0

[PATCH] parse-kickstart: fix "readfile", rename to "readsysfile"
by Will Woods 01 Aug '12

01 Aug '12

Make "readfile" more clear about its intent (read one line, discard errors). Rename it to "readsysfile" just so nobody gets confused about what it's for. --- dracut/parse-kickstart | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 2d35560..13a0e8f 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -23,6 +23,15 @@ from collections import OrderedDict # Default logging: none log = logging.getLogger('parse-kickstart').addHandler(logging.NullHandler()) +# Helper function for reading simple files in /sys +def readsysfile(f): + '''Return the contents of f, or "" if missing.''' + try: + val = open(f).readline().strip() + except IOError: + val = "" + return val + # Here are the kickstart commands we care about: class Method(commands.method.F14_Method): @@ -143,13 +152,9 @@ def is_mac(addr): def find_devname(mac): for netif in os.listdir("/sys/class/net"): - try: - thismac = readfile("/sys/class/net/%s/address" % netif) - except IOError: - pass - else: - if thismac.lower() == mac.lower(): - return netif + thismac = readsysfile("/sys/class/net/%s/address" % netif) + if thismac.lower() == mac.lower(): + return netif def ksnet_to_dracut(args, lineno, net, bootdev=False): '''Translate the kickstart network data into dracut network data.''' @@ -218,13 +223,6 @@ def ksnet_to_dracut(args, lineno, net, bootdev=False): return " ".join(line) -def readfile(f): - try: - val = open(f).readline().strip() - except IOError: - val = None - return val - def ksnet_to_ifcfg(net, filename=None): '''Write an ifcfg file for the given kickstart network config''' dev = net.device @@ -238,8 +236,8 @@ def ksnet_to_ifcfg(net, filename=None): if not os.path.isdir("/tmp/ifcfg"): os.makedirs("/tmp/ifcfg") ifcfg['DEVICE'] = dev - ifcfg['HWADDR'] = readfile("/sys/class/net/%s/address" % dev) - ifcfg['UUID'] = readfile("/proc/sys/kernel/random/uuid") + ifcfg['HWADDR'] = readsysfile("/sys/class/net/%s/address" % dev) + ifcfg['UUID'] = readsysfile("/proc/sys/kernel/random/uuid") ifcfg['ONBOOT'] = "yes" if net.onboot else "no" # dhcp etc. -- 1.7.11.2

2 1

[PATCH] Add "Starting installer..." messages
by Will Woods 01 Aug '12

01 Aug '12

Print a couple of messages as anaconda starts up so the user isn't confused about what's happening after the screen goes dark. --- anaconda | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/anaconda b/anaconda index fc679c9..15d13e6 100755 --- a/anaconda +++ b/anaconda @@ -646,6 +646,8 @@ def prompt_for_ssh(): if __name__ == "__main__": + print "Starting installer, one moment..." + setupPythonPath() # Allow a file to be loaded as early as possible @@ -708,6 +710,13 @@ if __name__ == "__main__": from pyanaconda import vnc from pyanaconda import kickstart + print "anaconda %s for %s %s%s started." % ( + getAnacondaVersion(), + product.productName, + product.productVersion, + " (pre-release)" if not product.isFinal else "", + ) + # to set UTF8 mode on the terminal, we need LANG to be set usefully if os.environ.get("LANG", "C") == "C": os.environ['LANG'] = DEFAULT_LANG -- 1.7.10.4

2 6

[newui] use the virtio rsyslog template (#820106)
by Brian C. Lane 01 Aug '12

01 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> The rsyslog template for forwarding logs over virtio was lost when loader was removed. --- pyanaconda/anaconda_log.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/anaconda_log.py b/pyanaconda/anaconda_log.py index f9d884e..68b0f70 100644 --- a/pyanaconda/anaconda_log.py +++ b/pyanaconda/anaconda_log.py @@ -224,7 +224,7 @@ class AnacondaLog: def setupVirtio(self): """Setup virtio rsyslog logging. """ - TEMPLATE = "*.* %s\n" + TEMPLATE = "*.* %s;anaconda_syslog\n" if not os.path.exists(self.VIRTIO_PORT) \ or not os.access(self.VIRTIO_PORT, os.W_OK): -- 1.7.7.6

2 1

[newui] log package installation
by Brian C. Lane 01 Aug '12

01 Aug '12

From: "Brian C. Lane" <bcl(a)redhat.com> log to syslog as well as /mnt/sysimage/root/install.log so that virtio and remote logging see the progress of the install. --- pyanaconda/packaging/yumpayload.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 5d85b3a..85f534c 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -45,6 +45,9 @@ import time from . import * +import logging +log = logging.getLogger("anaconda") + try: import rpm except ImportError: @@ -72,9 +75,6 @@ from pyanaconda.image import findFirstIsoImage import gettext _ = lambda x: gettext.ldgettext("anaconda", x) -import logging -log = logging.getLogger("anaconda") - from pyanaconda.errors import * from pyanaconda.packaging import NoSuchGroup, NoSuchPackage import pyanaconda.progress as progress @@ -1133,6 +1133,7 @@ class RPMCallback(object): log_msg = msg_format % (mode, txmbr.po, self.completed_actions, self.total_actions) + log.info(log_msg) self.install_log.write("%s %s\n" % (time.strftime("%H:%M:%S"), log_msg)) self.install_log.flush() -- 1.7.7.6

2 1

[PATCH 1/2] dracut: fix crash with PXE ipappend and ks=file:..
by Will Woods 01 Aug '12

01 Aug '12

If you're using pxelinux with 'ipappend 2', it will add a "BOOTIF=..." argument to your boot args. parse-kickstart will rewrite your first 'network' line to a "ip=..." argument for dracut. But dracut refuses to allow "ip=..." and "BOOTIF=..." arguments to mix, so this makes it die with the message: FATAL: Mixing BOOTIF and ip= lines is dangerous So: parse-kickstart should check the boot arguments, and not bother generating an "ip=..." line if "BOOTIF" is already there. --- dracut/parse-kickstart | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 3b6b861..d81dc72 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -23,6 +23,23 @@ from collections import OrderedDict # Default logging: none log = logging.getLogger('parse-kickstart').addHandler(logging.NullHandler()) +# So we can examine commandline args +def readfile(f): + try: + val = open(f).readline().strip() + except IOError: + val = None + return val + +def read_cmdline(f): + args = OrderedDict() + for arg in readfile(f).split(): + k,e,v = arg.partition("=") + args[k] = v + return args + +proc_cmdline = read_cmdline("/proc/cmdline") + # Here are the kickstart commands we care about: class Method(commands.method.F14_Method): @@ -79,7 +96,7 @@ class Network(commands.network.F16_Network): # write ifcfg for all listed devices ksnet_to_ifcfg(net) # anaconda tradition: bring up the first device listed, and no others - if len(self.network) == 1: + if len(self.network) == 1 and "BOOTIF" not in proc_cmdline: netline = ksnet_to_dracut(args, lineno, net, bootdev=True) return netline @@ -215,13 +232,6 @@ def ksnet_to_dracut(args, lineno, net, bootdev=False): return " ".join(line) -def readfile(f): - try: - val = open(f).readline().strip() - except IOError: - val = None - return val - def ksnet_to_ifcfg(net, filename=None): '''Write an ifcfg file for the given kickstart network config''' dev = net.device -- 1.7.11.2

4 5

[PATCH 1/4] add command line option to set the platform.
by Dennis Gilmore 01 Aug '12

01 Aug '12

Use case is to create images using livemedia-creator where we wont be running on the target platform, this could be for a arm system, or could be used to make efi bootable media on a non efi system, or any other use case where we need to override anacondas detection of the running system. Signed-off-by: Dennis Gilmore <dennis(a)ausil.us> --- anaconda | 4 ++++ pyanaconda/flags.py | 1 + pyanaconda/iutil.py | 3 +++ 3 files changed, 8 insertions(+) diff --git a/anaconda b/anaconda index fc679c9..c37dd72 100755 --- a/anaconda +++ b/anaconda @@ -222,6 +222,7 @@ def parseOptions(argv=None, cmdline=None): op.add_option("--kickstart", dest="ksfile") op.add_option("--rescue", dest="rescue", action="store_true", default=False) op.add_option("--targetarch", "rpmarch", dest="targetArch", type="string") + op.add_option("--targetplatform", "platform", dest="targetPlatform", type="string") op.add_option("-m", "--method", dest="method", default=None) op.add_option("--repo", dest="method", default=None) @@ -803,6 +804,9 @@ if __name__ == "__main__": if opts.targetArch: flags.targetarch = opts.targetArch + if opts.targetPlatform: + flags.platform = opts.targetPlatform + # set flags flags.dmraid = opts.dmraid flags.mpath = opts.mpath diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py index 92584fd..7a18043 100644 --- a/pyanaconda/flags.py +++ b/pyanaconda/flags.py @@ -58,6 +58,7 @@ class Flags(object): self.targetarch = None self.useIPv4 = True self.useIPv6 = True + self.platform = None self.preexisting_x11 = False self.noverifyssl = False self.imageInstall = False diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index ed6d098..aef4cc6 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -627,6 +627,9 @@ def getARMMachine(): if not isARM(): return 0 + if flags.platform: + return flags.platform + armMachine = os.uname()[2].rpartition('.' )[2] if armMachine.startswith('arm'): -- 1.7.11.2

1 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches August 2012