February 2013 - anaconda-patches - Fedora mailing-lists

[PATCH] Teach TUI how to react on async events
by Martin Sivak 21 Feb '13

21 Feb '13

This involves couple of places: - TUI is blocking and waiting for user input - Progress HUB is in charge and is reading the progress queue - any other part wanting to react to a message like READY, .. This patch directly fixes the first two and adds a mechanism to register callbacks that will react to the third one. We (me and vpodzime) expect python-meh integration to use this to file exception reports from text mode installation. --- pyanaconda/ui/communication.py | 4 ++ pyanaconda/ui/tui/__init__.py | 3 +- pyanaconda/ui/tui/hubs/progress.py | 12 +++- pyanaconda/ui/tui/simpleline/base.py | 104 +++++++++++++++++++++++++++++++++-- pyanaconda/ui/tui/spokes/password.py | 5 +- 5 files changed, 117 insertions(+), 11 deletions(-) diff --git a/pyanaconda/ui/communication.py b/pyanaconda/ui/communication.py index 19e3a24..04bb512 100644 --- a/pyanaconda/ui/communication.py +++ b/pyanaconda/ui/communication.py @@ -37,9 +37,13 @@ hubQ = Queue.Queue() # _READY - [spoke_name, justUpdate] # _NOT_READY - [spoke_name] # _MESSAGE - [spoke_name, string] +# _INPUT - [string] +# _EXCEPTION - [exc] HUB_CODE_READY = 0 HUB_CODE_NOT_READY = 1 HUB_CODE_MESSAGE = 2 +HUB_CODE_INPUT = 3 +HUB_CODE_EXCEPTION = 4 # Convenience methods to put things into the queue without the user having to # know the details of the queue. diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py index 83c2beb..8da9846 100644 --- a/pyanaconda/ui/tui/__init__.py +++ b/pyanaconda/ui/tui/__init__.py @@ -21,6 +21,7 @@ from pyanaconda import ui from pyanaconda.ui import common +from pyanaconda.ui import communication from pyanaconda.flags import flags import simpleline as tui from hubs.summary import SummaryHub @@ -170,7 +171,7 @@ class TextUserInterface(ui.UserInterface): """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._app = tui.App(u"Anaconda", yes_or_no_question=YesNoDialog, queue=communication.hubQ) _hubs = self._list_hubs() # First, grab a list of all the standalone spokes. diff --git a/pyanaconda/ui/tui/hubs/progress.py b/pyanaconda/ui/tui/hubs/progress.py index c80372e..72cb5dc 100644 --- a/pyanaconda/ui/tui/hubs/progress.py +++ b/pyanaconda/ui/tui/hubs/progress.py @@ -52,7 +52,17 @@ class ProgressHub(TUIHub): while True: # Attempt to get a message out of the queue for how we should update # the progress bar. If there's no message, don't error out. - (code, args) = q.get() + # Also flush the communication Queue at least once a second and + # process it's events so we can react to async evens (like a thread + # throwing an exception) + while True: + try: + (code, args) = q.get(timeout = 1) + break + except Queue.Empty: + pass + finally: + self.app.process_events() if code == progress.PROGRESS_CODE_INIT: # Text mode doesn't have a finite progress bar diff --git a/pyanaconda/ui/tui/simpleline/base.py b/pyanaconda/ui/tui/simpleline/base.py index e3039d2..f6ed9fb 100644 --- a/pyanaconda/ui/tui/simpleline/base.py +++ b/pyanaconda/ui/tui/simpleline/base.py @@ -22,6 +22,10 @@ __all__ = ["App", "UIScreen", "Widget"] import readline +import Queue +import getpass +from pyanaconda.threads import threadMgr, AnacondaThread +from pyanaconda.ui.communication import HUB_CODE_INPUT import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -36,7 +40,6 @@ class ExitMainLoop(Exception): 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. @@ -55,7 +58,7 @@ class App(object): STOP_MAINLOOP = False NOP = None - def __init__(self, title, yes_or_no_question = None, width = 80): + def __init__(self, title, yes_or_no_question = None, width = 80, queue = None): """ :param title: application title for whenever we need to display app name :type title: unicode @@ -72,6 +75,20 @@ class App(object): self._width = width self.quit_question = yes_or_no_question + # async control queue + if queue: + self.queue = queue + else: + self.queue = Queue.Queue() + + # ensure unique thread names + self._in_thread_counter = 0 + + # event handlers + # key: event id + # value: list of tuples (callback, data) + self._handlers = {} + # screen stack contains triplets # UIScreen to show # arguments for it's show method @@ -81,6 +98,50 @@ class App(object): # - False = already running loop, exit when window closes self._screens = [] + def register_event_handler(self, event, callback, data = None): + """This method registers a callback which will be called + when message "event" is encountered during process_events. + + The callback has to accept two arguments: + - the received message in the form of (type, [arguments]) + - the data registered with the handler + + :param event: the id of the event we want to react on + :type event: number|string + + :param callback: the callback function + :type callback: func(event_message, data) + + :param data: optional data to pass to callback + :type data: anything + """ + if not event in self._handlers: + self._handlers[event] = [] + self._handlers[event].append((callback, data)) + + def _thread_input(self, queue, prompt, hidden): + """This method is responsible for interruptible user input. It is expected + to be used in a thread started on demand by the App class and returns the + input via the communication Queue. + + :param queue: communication queue to be used + :type queue: Queue.Queue instance + + :param prompt: prompt to be displayed + :type prompt: str + + :param hidden: whether typed characters should be echoed or not + :type hidden: bool + + """ + + if hidden: + data = getpass.getpass(prompt) + else: + data = raw_input(prompt) + + queue.put((HUB_CODE_INPUT, [data])) + def switch_screen(self, ui, args = None): """Schedules a screen to replace the current one. @@ -223,6 +284,9 @@ class App(object): # run until there is nothing else to display while self._screens: + # process asynchronous events + self.process_events() + # if redraw is needed, separate the content on the screen from the # stuff we are about to display now if self._redraw: @@ -271,10 +335,38 @@ class App(object): 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 process_events(self, return_at = None): + """This method processes incoming async messages and returns + when a specific message is encountered or when the queue + is empty. + + If return_at message was specified, the received + message is returned. + + If the message does not fit return_at, but handlers are + defined then it processes all handlers for this message + """ + while return_at or not self.queue.empty(): + event = self.queue.get() + if event[0] == return_at: + return event + elif event[0] in self._handlers: + for handler, data in self._handlers[event[0]]: + handler(event, data) + + def raw_input(self, prompt, hidden=False): + """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.""" + + thread_name = "AnaInputThread%d" % self._in_thread_counter + self._in_thread_counter += 1 + input_thread = AnacondaThread(name=thread_name, + target=self._thread_input, + args=(self.queue, prompt, hidden)) + input_thread.daemon = True + threadMgr.add(input_thread) + event = self.process_events(return_at=HUB_CODE_INPUT) + return event[1][0] # return the user input def input(self, args, key): """Method called internally to process unhandled input key presses. diff --git a/pyanaconda/ui/tui/spokes/password.py b/pyanaconda/ui/tui/spokes/password.py index f812678..bd81603 100644 --- a/pyanaconda/ui/tui/spokes/password.py +++ b/pyanaconda/ui/tui/spokes/password.py @@ -25,7 +25,6 @@ from pyanaconda.ui.tui.simpleline import TextWidget from pyanaconda.ui.tui import YesNoDialog from pyanaconda.users import validatePassword from pwquality import PWQError -import getpass import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -65,8 +64,8 @@ class PasswordSpoke(NormalTUISpoke): def prompt(self, args = None): """Overriden prompt as password typing is special.""" - pw = getpass.getpass(_("Password: ")) - confirm = getpass.getpass(_("Password (confirm): ")) + pw = self._app.raw_input(_("Password: "), hidden=True) + confirm = self._app.raw_input(_("Password (confirm): "), hidden=True) error = None # just returning an error is either blank or mismatched -- 1.7.11.7

3 3

[master] Fix RAID level test
by Brian C. Lane 20 Feb '13

20 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> The string needs to be converted to a raid level before passing it to blivet. --- pyanaconda/ui/gui/spokes/custom.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index ddddcb3..ba93b72 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1353,11 +1353,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): # what is the incremental disk space requirement for this feature? # TODO: update this when the size spinner changes - level = self._get_raid_level() - min_disks = mdraid.get_raid_min_members(level) - if min_disks <= len(factory.disks): - factory.raid_level = level - delta = factory.device_size - base_size + raid_level = self._get_raid_level() + if raid_level not in (None, "single"): + md_level = mdraid.raidLevel(raid_level) + min_disks = mdraid.get_raid_min_members(md_level) + if min_disks <= len(factory.disks): + factory.raid_level = md_level + delta = factory.device_size - base_size def _get_current_device_type(self): typeCombo = self.builder.get_object("deviceTypeCombo") -- 1.8.1

2 1

[blivet] parse buffer output from resize (#913141)
by Brian C. Lane 20 Feb '13

20 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- blivet/formats/fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py index 5ec1948..de94ff4 100644 --- a/blivet/formats/fs.py +++ b/blivet/formats/fs.py @@ -1266,7 +1266,7 @@ class NTFS(FS): if self.exists and os.path.exists(self.device) and \ util.find_program_in_path(self.resizefsProg): minSize = None - buf = util.run_program([self.resizefsProg, "-m", self.device]) + buf = util.capture_output([self.resizefsProg, "-m", self.device]) for l in buf.split("\n"): if not l.startswith("Minsize"): continue -- 1.8.1

2 1

[PATCH 1/3] If you set_markup, the label forgets set_use_underline from glade.
by Chris Lumens 20 Feb '13

20 Feb '13

--- pyanaconda/ui/gui/spokes/custom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index dea3dce..6449d16 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -600,6 +600,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): summaryLabel.set_use_markup(True) summaryLabel.set_markup("%s" % summary) + summaryLabel.set_use_underline(True) def _reset_storage(self): self.__storage = self.storage.copy() -- 1.8.1.2

2 3

[PATCH] Don't emit "gfxterm" in grub2 configs (#821355)
by Peter Jones 19 Feb '13

19 Feb '13

This seems to break a pile of hardware, and we don't want a theme on RHEL anyway, so we shouldn't use it there. Resolves: rhbz#821355 --- pyanaconda/bootloader.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index c24ccc3..000d493 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1349,6 +1349,7 @@ class GRUB2(GRUB): defaults_file = "/etc/default/grub" can_dual_boot = True can_update = True + terminal_type = "console" # requirements for boot devices stage2_device_types = ["partition", "mdarray", "lvmlv", "btrfs volume", @@ -1442,6 +1443,8 @@ class GRUB2(GRUB): if self.console and self.console.startswith("ttyS"): defaults.write("GRUB_TERMINAL=\"serial console\"\n") defaults.write("GRUB_SERIAL_COMMAND=\"%s\"\n" % self.serial_command) + else: + defaults.write("GRUB_TERMINAL_OUTPUT=\"%s\"\n" % self.terminal_type) # this is going to cause problems for systems containing multiple # linux installations or even multiple boot entries with different @@ -1903,6 +1906,7 @@ class IPSeriesGRUB2(GRUB2): # to present the disk as a bootable target. If stage2_bootable is False, then the PReP partition # will be marked bootable. Confusing. stage2_bootable = False + terminal_type = "ofconsole" # # installation -- 1.8.1.2

2 1

[rhel7/blivet] prevent traceback when root device is not defined #rhbz883768
by Samantha N. Bueno 19 Feb '13

19 Feb '13

root defined as None was causing tracebacks when attempts to determine root device's properties were run later in sanityCheck resolves: rhbz#883768 --- blivet/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/blivet/__init__.py b/blivet/__init__.py index 9dc7f23..f7f03c2 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -1412,6 +1412,7 @@ class Blivet(object): errors.append(_("You have not defined a root partition (/), " "which is required for installation of %s " "to continue.") % (productName,)) + return (errors, warnings) if root and root.size < 250: warnings.append(_("Your root partition is less than 250 " -- 1.7.11.7

2 3

[rhel7/master] unpack product.img to /updates (#911873)
by Brian C. Lane 19 Feb '13

19 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> product.img should place its files under /run/install/product This maintains consistency between updates.img and product.img and supports correct operation whether or not tmpfs is used for /tmp --- dracut/anaconda-lib.sh | 2 +- dracut/anaconda-netroot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 19573ed..30bf51e 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -95,7 +95,7 @@ anaconda_auto_updates() { unpack_updates_img $dir/updates.img /updates fi if [ -e $dir/product.img ]; then - unpack_updates_img $dir/product.img /updates/tmp/product + unpack_updates_img $dir/product.img /updates fi } diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 0425661..6217953 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -58,7 +58,7 @@ case $repo in updates=$(fetch_url $repo/images/updates.img) [ -n "$updates" ] && unpack_updates_img $updates /updates product=$(fetch_url $repo/images/product.img) - [ -n "$product" ] && unpack_updates_img $product /updates/tmp/product + [ -n "$product" ] && unpack_updates_img $product /updates /sbin/dmsquash-live-root $runtime fi ;; -- 1.8.1

2 1

[PATCH 1/3] Swap the order of the part scheme combo and encryption checkbox.
by Chris Lumens 18 Feb '13

18 Feb '13

Currently, the encryption checkbox kind of looks like it belongs with the radio button group. A little extra padding might also help. --- pyanaconda/ui/gui/spokes/storage.glade | 72 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 85c2756..be81660 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -158,24 +158,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="encryption1_checkbutton"> - <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> <object class="GtkExpander" id="options1_expander"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -233,6 +215,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="encryption1_checkbutton"> + <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -474,24 +474,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="encryption2_checkbutton"> - <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> <object class="GtkExpander" id="options2_expander"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -549,6 +531,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="encryption2_checkbutton"> + <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> -- 1.8.1.2

2 4

[PATCH] Don't use "type" to name a variable.
by Radek Vykydal 18 Feb '13

18 Feb '13

--- pyanaconda/nm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 0991020..ab497a2 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -411,13 +411,13 @@ if __name__ == "__main__": print devname try: - type = nm_device_type(devname) + devtype = nm_device_type(devname) except UnknownDeviceError as e: print " %s" % e - type = None - if type == NetworkManager.DeviceType.ETHERNET: + devtype = None + if devtype == NetworkManager.DeviceType.ETHERNET: print " type %s" % "ETHERNET" - elif type == NetworkManager.DeviceType.WIFI: + elif devtype == NetworkManager.DeviceType.WIFI: print " type %s" % "WIFI" wireless_device = devname -- 1.7.11.7

2 1

[master] [PATCH] Unpack product.img to / and use /run/install/product (#911873)
by Vratislav Podzimek 18 Feb '13

18 Feb '13

This needs a change in product.img creation process so that the product.img looks similar as our updates.img (i.e. containing the whole directory tree with /run/install/product). Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- dracut/anaconda-netroot.sh | 2 +- pyanaconda/installclass.py | 2 +- pyanaconda/packaging/yumpayload.py | 2 +- pyanaconda/product.py | 2 +- pyanaconda/ui/gui/hubs/progress.py | 2 +- tests/pyanaconda_test/product_test.py | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 0425661..6217953 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -58,7 +58,7 @@ case $repo in updates=$(fetch_url $repo/images/updates.img) [ -n "$updates" ] && unpack_updates_img $updates /updates product=$(fetch_url $repo/images/product.img) - [ -n "$product" ] && unpack_updates_img $product /updates/tmp/product + [ -n "$product" ] && unpack_updates_img $product /updates /sbin/dmsquash-live-root $runtime fi ;; diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 753de20..1a39ca5 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -198,7 +198,7 @@ def availableClasses(showHidden=0): for dir in env_path + ["installclasses", "/tmp/updates/pyanaconda/installclasses", - "/tmp/product/pyanaconda/installclasses", + "/run/install/product/pyanaconda/installclasses", "%s/pyanaconda/installclasses" % get_python_lib(plat_specific=1) ]: if os.access(dir, os.R_OK): path.append(dir) diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 9fe60ad..caa8649 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -116,7 +116,7 @@ class YumPayload(PackagePayload): self.install_device = None self._root_dir = "/tmp/yum.root" - self._repos_dir = "/etc/yum.repos.d,/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anaconda.repos.d" + self._repos_dir = "/etc/yum.repos.d,/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/run/install/product/anaconda.repos.d" self._yum = None self._setup = False diff --git a/pyanaconda/product.py b/pyanaconda/product.py index 0edab7d..97e248e 100644 --- a/pyanaconda/product.py +++ b/pyanaconda/product.py @@ -35,7 +35,7 @@ config.set("Main", "UUID", "") config.set("Main", "Version", os.environ.get("ANACONDA_PRODUCTVERSION", "bluesky")) # Now read in the .buildstamp file, wherever it may be. -config.read(["/tmp/product/.buildstamp", "/.buildstamp", os.environ.get("PRODBUILDPATH", "")]) +config.read(["/run/install/product/.buildstamp", "/.buildstamp", os.environ.get("PRODBUILDPATH", "")]) # Set up some variables we import throughout, applying a couple transforms as necessary. bugUrl = config.get("Main", "BugURL") diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index 65cd9e4..06d63ad 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -147,7 +147,7 @@ class ProgressHub(Hub): # directories without the language component. You know, just in case. langs = expand_langs(os.environ["LANG"]) + [""] paths = ["/tmp/updates/pixmaps/rnotes/%s/*.png", - "/tmp/product/pixmaps/rnotes/%s/*.png", + "/run/install/product/pixmaps/rnotes/%s/*.png", "/usr/share/anaconda/pixmaps/rnotes/%s/*.png"] for (l, d) in itertools.product(langs, paths): diff --git a/tests/pyanaconda_test/product_test.py b/tests/pyanaconda_test/product_test.py index 9b0d864..9338f8a 100644 --- a/tests/pyanaconda_test/product_test.py +++ b/tests/pyanaconda_test/product_test.py @@ -19,14 +19,14 @@ class ProductTest(mock.TestCase): os.uname.return_value = ('', '', '', '', 'i386') os.environ = {} - # fake /tmp/product/.buildstamp file + # fake /run/install/product/.buildstamp file self.BUGURL = 'http://bug.url' self.FINAL = 'false' self.ARCH = 'i386' self.NAME = '__anaconda' self.UUID = '123456.%s' % self.ARCH self.VERSION = '14' - self.FILENAME = '/tmp/product/.buildstamp' + self.FILENAME = '/run/install/product/.buildstamp' self.FILE = \ "[Main]\n"\ "BugURL: %s\n"\ -- 1.7.11.7

2 1

[master] [PATCH] Fix for the addons kickstart support
by Vratislav Podzimek 18 Feb '13

18 Feb '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/addons.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyanaconda/addons.py b/pyanaconda/addons.py index 6028737..7c517c6 100644 --- a/pyanaconda/addons.py +++ b/pyanaconda/addons.py @@ -23,7 +23,8 @@ __all__ = ["AddonSection", "AddonRegistry", "AddonData", "collect_addon_paths"] import os from pykickstart.sections import Section - +from pykickstart.options import KSOptionParser + def collect_addon_paths(toplevel_addon_paths, ui_subdir="gui"): """This method looks into the directories present in toplevel_addon_paths and registers each subdirectory @@ -159,6 +160,6 @@ class AddonSection(Section): self.addon_id = extra[0] # if the addon is not registered, create dummy placeholder for it - if self.addon_id and not hasattr(self.handler.addon, self.addon_id): - setattr(self.handler.addon, self.addon_id, AddonData(self.addon_id)) + if self.addon_id and not hasattr(self.handler.addons, self.addon_id): + setattr(self.handler.addons, self.addon_id, AddonData(self.addon_id)) -- 1.7.11.7

2 1

[master] Friday's bit of refactoring
by Vratislav Podzimek 15 Feb '13

15 Feb '13

PATCH 1/2 is refactoring and preparation for full-featured text mode. PATCH 2/2 is something pylint suggested Vratislav Podzimek (2): Refactor pieces of the Datetime spoke and move some parts to kickstart.py kickstart.py needs udev that now lives in blivet pyanaconda/kickstart.py | 58 +++++++++++++++++++++++------ pyanaconda/timezone.py | 3 ++ pyanaconda/ui/gui/spokes/datetime_spoke.py | 60 +++++++++--------------------- 3 files changed, 68 insertions(+), 53 deletions(-) -- 1.7.11.7

2 3

[LORAX rhel7/master] Make sure tmpfs is enabled (#908253)
by Brian C. Lane 15 Feb '13

15 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> NOTE: better solution, but requires systemd to include tmp.mount --- share/runtime-postinstall.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index e87a627..1c0f9ba 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -22,6 +22,10 @@ move etc/yum.repos.d etc/anaconda.repos.d remove etc/systemd/system/default.target symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target +## Make sure tmpfs is enabled +mkdir etc/systemd/system/local-fs.target.wants/ +symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount + ## Disable unwanted systemd services systemctl disable systemd-readahead-collect.service \ systemd-readahead-replay.service \ -- 1.8.1

2 2

[LORAX] Remove some env variables (#907692)
by Brian C. Lane 15 Feb '13

15 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> Some package scripts may call utilities using dbus. Since this is just a chroot that will fail. This unsets DESKTOP and DBUS_SESSION_BUS_ADDRESS to keep them from crashing. --- src/pylorax/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index e1c0069..3eff6e8 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -121,6 +121,10 @@ class Lorax(BaseLoraxClass): # so we have to add it ourselves os.environ["PATH"] = "{0}:/sbin:/usr/sbin".format(os.environ["PATH"]) + # remove some environmental variables that can cause problems with package scripts + env_remove = ('DISPLAY', 'DBUS_SESSION_BUS_ADDRESS') + [os.environ.pop(k) for k in env_remove if k in os.environ] + self._configured = True def init_stream_logging(self): -- 1.8.1

2 1

[PATCH] enable tmpfs (#908253)
by Brian C. Lane 15 Feb '13

15 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> NOTE: This depends on systemd updating the tmp.mount unit so that it can be enabled with systemctl. --- share/runtime-postinstall.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index e87a627..3153969 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -22,6 +22,9 @@ move etc/yum.repos.d etc/anaconda.repos.d remove etc/systemd/system/default.target symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target +## Enable tmpfs +systemctl enable tmp.mount + ## Disable unwanted systemd services systemctl disable systemd-readahead-collect.service \ systemd-readahead-replay.service \ -- 1.8.1

3 4

[master] Issues found when testing addon's TUI spoke
by Vratislav Podzimek 14 Feb '13

14 Feb '13

Two little tweaks. Vratislav Podzimek (2): Refresh addons_paths once we know if gui or tui takes place Fix reprompting and screen redrawing on invalid input pyanaconda/__init__.py | 12 +++++++++++- pyanaconda/ui/tui/simpleline/base.py | 8 ++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) -- 1.7.11.7

2 3

[PATCH 1/2] Fixup kickstart script logging
by Brian C. Lane 14 Feb '13

14 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> Changes to the execWith* methods removed the ability to handle a string as stdin/out/err. Change the callers to first open where they want output to be sent to and pass that instead. Only stdout is needed because _run_program combines stdout and stderr, pass stderr through but ignore it. Also clean up a couple places that were passing strings that don't need to. --- anaconda | 3 +-- pyanaconda/iutil.py | 61 ++++++++++++++++++++++++++++++------------------- pyanaconda/kickstart.py | 35 +++++++++++++--------------- pyanaconda/network.py | 3 +-- 4 files changed, 55 insertions(+), 47 deletions(-) diff --git a/anaconda b/anaconda index 324d31e..06773ca 100755 --- a/anaconda +++ b/anaconda @@ -85,8 +85,7 @@ def startMetacityWM(): try: args = ['--display', ':1', '--sm-disable'] - iutil.execWithRedirect('metacity', args, - stdout='/dev/null', stderr='/dev/null') + iutil.execWithRedirect('metacity', args) except BaseException as e: # catch all possible exceptions log.error("Problems running the window manager: %s" % str(e)) diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index dbc7c3b..2d2b08c 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -49,7 +49,15 @@ def augmentEnv(): }) return env -def _run_program(argv, root='/', stdin=None, env_prune=None): +def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None): + """ Run an external program, log the output and return it to the caller + @param argv The command to run and argument + @param root The directory to chroot to before running command. + @param stdin The file descriptor to read stdin from. + @param stdout Optional file descriptor to write stdout and stderr to. + @param env_prune environment variable to remove before execution + @return The return code of the command and the output + """ if env_prune is None: env_prune = [] @@ -75,6 +83,8 @@ def _run_program(argv, root='/', stdin=None, env_prune=None): if out: for line in out.splitlines(): program_log.info(line) + if stdout: + stdout.write(line) except OSError as e: program_log.error("Error running %s: %s" % (argv[0], e.strerror)) @@ -84,41 +94,44 @@ def _run_program(argv, root='/', stdin=None, env_prune=None): return (proc.returncode, out) -## Run an external program and redirect the output to a file. -# @param command The command to run. -# @param argv A list of arguments. -# @param stdin The file descriptor to read stdin from. -# @param stdout The file descriptor to redirect stdout to. -# @param stderr The file descriptor to redirect stderr to. -# @param root The directory to chroot to before running command. -# @return The return code of command. -def execWithRedirect(command, argv, stdin = None, stdout = None, - stderr = None, root = '/', env_prune=[]): +def execWithRedirect(command, argv, stdin=None, stdout=None, + stderr=None, root='/', env_prune=[]): + """ Run an external program and redirect the output to a file. + @param command The command to run + @param argv The argument list + @param stdin The file descriptor to read stdin from. + @param stdout Optional file descriptor to redirect stdout and stderr to. + @param stderr not used + @param root The directory to chroot to before running command. + @param env_prune environment variable to remove before execution + @return The return code of the command + """ if flags.testing: log.info("not running command because we're testing: %s %s" % (command, " ".join(argv))) return 0 argv = [command] + argv - return _run_program(argv, stdin=stdin, root=root, env_prune=env_prune)[0] - -## Run an external program and capture standard out. -# @param command The command to run. -# @param argv A list of arguments. -# @param stdin The file descriptor to read stdin from. -# @param stderr The file descriptor to redirect stderr to. -# @param root The directory to chroot to before running command. -# @param fatal Boolean to determine if non-zero exit is fatal. -# @return The output of command from stdout. -def execWithCapture(command, argv, stdin = None, stderr = None, root='/', - fatal = False): + return _run_program(argv, stdin=stdin, stdout=stdout, root=root, env_prune=env_prune)[0] + +def execWithCapture(command, argv, stdin=None, stderr=None, root='/', + fatal=False): + """ Run an external program and capture standard out and err. + @param command The command to run + @param argv The argument list + @param stdin The file descriptor to read stdin from. + @param stderr not used + @param root The directory to chroot to before running command. + @param fatal not used + @return The output of the command + """ if flags.testing: log.info("not running command because we're testing: %s %s" % (command, " ".join(argv))) return "" argv = [command] + argv - return _run_program(argv, stdin=stdin, root=root)[1] + return _run_program(argv, stdin=stdin, stdout=stdout, root=root)[1] ## Run a shell. def execConsole(): diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index a93c552..35f90e2 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -81,7 +81,17 @@ packagesSeen = False topology = None class AnacondaKSScript(KSScript): + """ Execute a kickstart script + + This will write the script to a file named /tmp/ks-script- before + execution. + Output is logged by the program logger, the path specified by --log + or to /tmp/ks-script-*.log + """ def run(self, chroot): + """ Run the kickstart script + @param chroot directory path to chroot into before execution + """ if self.inChroot: scriptRoot = chroot else: @@ -93,9 +103,9 @@ class AnacondaKSScript(KSScript): os.close(fd) os.chmod(path, 0700) - # Always log stdout/stderr from scripts. Using --logfile just lets you + # Always log stdout/stderr from scripts. Using --log just lets you # pick where it goes. The script will also be logged to program.log - # because of execWithRedirect, and to anaconda.log if the script fails. + # because of execWithRedirect. if self.logfile: if self.inChroot: messages = "%s/%s" % (scriptRoot, self.logfile) @@ -110,26 +120,13 @@ class AnacondaKSScript(KSScript): # chroot later. messages = "/tmp/%s.log" % os.path.basename(path) - rc = iutil.execWithRedirect(self.interp, ["/tmp/%s" % os.path.basename(path)], - stdin = messages, stdout = messages, stderr = messages, - root = scriptRoot) + with open(messages, "w") as fp: + rc = iutil.execWithRedirect(self.interp, ["/tmp/%s" % os.path.basename(path)], + stdin=fp, stdout=fp, + root = scriptRoot) - # Always log an error. Only fail if we have a handle on the - # windowing system and the kickstart file included --erroronfail. if rc != 0: log.error("Error code %s running the kickstart script at line %s" % (rc, self.lineno)) - - if os.path.isfile(messages): - try: - f = open(messages, "r") - except IOError as e: - err = None - else: - err = f.readlines() - f.close() - for l in err: - log.error("\t%s" % l) - if self.errorOnFail: errorHandler.cb(ScriptError(), self.lineno, err) sys.exit(0) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 294f937..0d352d2 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -836,8 +836,7 @@ def set_hostname(hn): return log.info("setting installation environment hostname to %s" % hn) - iutil.execWithRedirect("hostname", ["-v", hn ], - stdout="/dev/tty5", stderr="/dev/tty5") + iutil.execWithRedirect("hostname", ["-v", hn ]) def get_NM_settings_value(iface, key1, key2): value = "" -- 1.8.1

2 3

[master] The LayoutIndicator widget and minor fixes
by Vratislav Podzimek 14 Feb '13

14 Feb '13

PATCH [3/3] is the most important one the other two are just fixes for the issues I've noticed during the development and testing of the widget. The preview of the widget and its functionality can be seen at: http://vpodzime.fedorapeople.org/layout_indicator.webm (it doesn't show that it has a tooltip with full layout name and description of what clicking it does) There are some questions related to the widget: 1) How it should look like? Should it have a border or some background? 2) How wide it should be? For now it is 8 chars wide and uses ELLIPSIZE_CENTER, but it could be wider. I don't want it to be expanding because that would result in many widgets changing their place and size when the layout is switched. It could also be 2 chars wide and show just 'us', 'cz' etc., but I believe some users are using e.g. 'cz' and 'cz (qwerty)' at the same time. 3) Where it should be placed? Should it go to the header of our BaseWindow and to the dialogs that include password creation? Or should it be just on the dialogs with password creation? Suggestions? Vratislav Podzimek (3): Remove debugging print (DatetimeSpoke) Fixes for the XklWrapper (#895766) LayoutIndicator widget pyanaconda/keyboard.py | 13 +- pyanaconda/ui/gui/spokes/datetime_spoke.py | 1 - widgets/configure.ac | 1 + widgets/glade/AnacondaWidgets.xml | 7 + widgets/src/LayoutIndicator.c | 339 +++++++++++++++++++++++++++++ widgets/src/LayoutIndicator.h | 69 ++++++ widgets/src/Makefile.am | 8 +- 7 files changed, 433 insertions(+), 5 deletions(-) create mode 100644 widgets/src/LayoutIndicator.c create mode 100644 widgets/src/LayoutIndicator.h -- 1.7.11.7

1 4

[PATCH 1/2] Display storage warnings, similar to how errors are displayed (#909410).
by Chris Lumens 13 Feb '13

13 Feb '13

--- pyanaconda/ui/gui/spokes/storage.py | 56 ++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index bb26754..7d4080e 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -440,6 +440,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): if self.autopart: # this was already run as part of doAutoPartition. dumb. StorageChecker.errors = [] + StorageChecker.warnings = [] self.run() finally: self._ready = True @@ -483,6 +484,8 @@ class StorageSpoke(NormalSpoke, StorageChecker): if self.errors: msg = _("Error checking storage configuration") + elif self.warnings: + msg = _("Warning checking storage configuration") elif self.data.autopart.autopart: msg = _("Automatic partitioning selected") else: @@ -530,6 +533,8 @@ class StorageSpoke(NormalSpoke, StorageChecker): if self.errors: self.set_warning(_("Error checking storage configuration. Click for details.")) + elif self.warnings: + self.set_warning(_("Warning checking storage configuration. Click for details.")) def initialize(self): from pyanaconda.ui.gui.utils import setViewportBackground @@ -808,23 +813,34 @@ class StorageSpoke(NormalSpoke, StorageChecker): print "ADD DISK CLICKED" def on_info_bar_clicked(self, *args): - if not self.errors: - return - - label = _("The following errors were encountered when checking your storage " - "configuration. You can modify your storage layout\nor quit the " - "installer.") - dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit"), _("_Modify Storage Layout")], label=label) - with enlightbox(self.window, dialog.window): - errors = "\n".join(self.errors) - dialog.refresh(errors) - rc = dialog.run() - - dialog.window.destroy() - - if rc == 0: - # Quit. - sys.exit(0) - elif rc == 1: - # Close the dialog so the user can change selections. - pass + if self.errors: + label = _("The following errors were encountered when checking your storage " + "configuration. You can modify your storage layout\nor quit the " + "installer.") + + dialog = DetailedErrorDialog(self.data, buttons=[_("_Quit"), _("_Modify Storage Layout")], label=label) + with enlightbox(self.window, dialog.window): + errors = "\n".join(self.errors) + dialog.refresh(errors) + rc = dialog.run() + + dialog.window.destroy() + + if rc == 0: + # Quit. + sys.exit(0) + elif rc == 1: + # Close the dialog so the user can change selections. + pass + elif self.warnings: + label = _("The following warnings were encountered when checking your storage " + "configuration. These are not fatal, but you may wish to make " + "changes to your storage layout.") + + dialog = DetailedErrorDialog(self.data, buttons=[_("_OK")], label=label) + with enlightbox(self.window, dialog.window): + warnings = "\n".join(self.warnings) + dialog.refresh(warnings) + rc = dialog.run() + + dialog.window.destroy() -- 1.7.11.2

2 2

[PATCH] Wait for continueButton in KS mode if the user changed anything
by Martin Sivak 13 Feb '13

13 Feb '13

This behaviour tries to minimize the "surprise factor" we have in the installer. When the user entered spoke, changed any data and then left the spoke, the installer gave him no chance for review or correcting the entered values. With this patch applied the Hub waits for a click on the continueButton if any user interaction happened before all the spokes were ready+completed. --- pyanaconda/ui/gui/hubs/__init__.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 1379315..4056371 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -34,6 +34,7 @@ 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 +from pyanaconda.ui.gui.utils import gtk_call_once import logging log = logging.getLogger("anaconda") @@ -85,7 +86,11 @@ class Hub(GUIObject, common.Hub): GUIObject.__init__(self, data) common.Hub.__init__(self, data, storage, payload, instclass) - self._autoContinue = False + # enable the autoContinue feature if we are in kickstart + # mode, but if the user interacts with the hub, it will be + # disabled again + self._autoContinue = flags.automatedInstall + self._incompleteSpokes = [] self._inSpoke = False self._notReadySpokes = [] @@ -330,9 +335,10 @@ class Hub(GUIObject, common.Hub): if self.continuePossible: if self._inSpoke: - self._autoContinue = True - elif q.empty(): - self.continueButton.emit("clicked") + self._autoContinue = False + elif self._autoContinue and q.empty(): + # enqueue the emit to the Gtk message queue + gtk_call_once(self.continueButton.emit("clicked")) elif code == communication.HUB_CODE_MESSAGE: spoke.selector.set_property("status", args[1]) log.info("setting %s status to: %s" % (spoke, args[1])) @@ -370,6 +376,15 @@ class Hub(GUIObject, common.Hub): if selector: selector.grab_focus() + # On automated kickstart installs, our desired behavior is to display + # the hub while background processes work, then skip to the progress + # hub immediately after everything's done. + # However if the user proves his intent to change the kickstarted + # values by entering any of the spokes, we need to disable the + # autoContinue feature and wait for the user to explicitly state + # that he is done configuring by pressing the continue button. + self._autoContinue = False + self._inSpoke = True self._runSpoke(spoke) self._inSpoke = False @@ -389,10 +404,4 @@ class Hub(GUIObject, common.Hub): self._on_spoke_clicked(self._spokes[dest].selector, None, self._spokes[dest]) - # On automated kickstart installs, our desired behavior is to display - # the hub while background processes work, then skip to the progress - # hub immediately after everything's done. However, this allows for - # the possibility that the user will be on a hub when everything - # finishes. We need to wait until they're done, and then continue. - if self._autoContinue: - self.continueButton.emit("clicked") + -- 1.7.11.7

2 1

[PATCH 1/3] Get rid of packagesSeen.
by Chris Lumens 13 Feb '13

13 Feb '13

pykickstart now provides this information for all commands. --- anaconda.spec.in | 2 +- pyanaconda/kickstart.py | 4 ---- pyanaconda/ui/gui/spokes/software.py | 7 +++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index 755c8a5..5bb3b74 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define gconfversion 2.28.1 %define intltoolver 0.31.2-3 %define libnlver 1.0 -%define pykickstartver 1.99.22 +%define pykickstartver 1.99.24 %define yumver 3.4.3-32 %define partedver 1.8.1 %define pypartedver 2.5-2 diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index c2249f6..f6bf222 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -74,8 +74,6 @@ stdoutLog = logging.getLogger("anaconda.stdout") from anaconda_log import logger, logLevelMap, setHandlersLevel,\ DEFAULT_TTY_LEVEL -packagesSeen = False - # deviceMatches is called early, before any multipaths can possibly be coalesced # so it needs to know about them in some additional way: have the topology ready. topology = None @@ -1484,8 +1482,6 @@ def parseKickstart(f): errorHandler.cb(KickstartError(), e) sys.exit(1) - global packagesSeen - packagesSeen = ksparser.getSection("%packages").timesSeen > 0 return handler def appendPostScripts(ksdata): diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 8598303..3493d0c 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -24,7 +24,6 @@ _ = lambda x: gettext.ldgettext("anaconda", x) N_ = lambda x: x from pyanaconda.flags import flags -from pyanaconda.kickstart import packagesSeen from pyanaconda.threads import threadMgr, AnacondaThread from pyanaconda.ui import communication @@ -124,7 +123,7 @@ class SoftwareSelectionSpoke(NormalSpoke): processingDone = not threadMgr.get("AnaCheckSoftwareThread") and \ not self._errorMsgs and self.txid_valid - if flags.automatedInstall and packagesSeen: + if flags.automatedInstall and self.data.packages.seen: return processingDone else: return self._get_selected_environment() is not None and processingDone @@ -164,7 +163,7 @@ class SoftwareSelectionSpoke(NormalSpoke): # Kickstart installs with %packages will have a row selected, unless # they did an install without a desktop environment. This should # catch that one case. - if flags.automatedInstall and packagesSeen: + if flags.automatedInstall and self.data.packages.seen: return _("Custom software selected") return _("Nothing selected") @@ -184,7 +183,7 @@ class SoftwareSelectionSpoke(NormalSpoke): # we have no way to select environments with kickstart right now # so don't try. - if flags.automatedInstall and packagesSeen: + if flags.automatedInstall and self.data.packages.seen: # We don't want to do a full refresh, just # join the metadata thread threadMgr.wait("AnaPayloadMDThread") -- 1.7.11.2

3 5

[PATCH] Move the encryption checkbox to the dialog
by Brian C. Lane 13 Feb '13

13 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> This moves the 'Encrypt my data' checkbox from the main storage spoke into the dialog above the partition type combobox. --- pyanaconda/ui/gui/spokes/storage.glade | 68 +++++++++++++++++++--------------- pyanaconda/ui/gui/spokes/storage.py | 30 ++++++++++----- 2 files changed, 58 insertions(+), 40 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade index 114d4d2..24a0737 100644 --- a/pyanaconda/ui/gui/spokes/storage.glade +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -158,6 +158,24 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="encryption1_checkbutton"> + <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> <object class="GtkExpander" id="options1_expander"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -215,7 +233,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> @@ -456,6 +474,24 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="encryption2_checkbutton"> + <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_encrypt_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> <object class="GtkExpander" id="options2_expander"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -513,7 +549,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> @@ -793,8 +829,6 @@ <property name="vexpand">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xscale">1</property> - <property name="yscale">1</property> <child internal-child="action_area"> <object class="GtkBox" id="storageWindow-action_area1"> <property name="can_focus">False</property> @@ -946,32 +980,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="encryption_checkbutton"> - <property name="label" translatable="yes">_Encrypt my data. I'll set a passphrase later.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="valign">end</property> - <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="xalign">1</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <placeholder/> </child> </object> diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index a3d31ff..6d53bb4 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -147,11 +147,15 @@ class InstallOptions1Dialog(GUIObject): self.window.destroy() return rc - def refresh(self, required_space, disk_free, fs_free, autoPartType): + def refresh(self, required_space, disk_free, fs_free, autoPartType, encrypted): self.autoPartType = autoPartType self.autoPartTypeCombo = self.builder.get_object("options1_combo") self.autoPartTypeCombo.set_active(self.autoPartType) + self.encrypted = encrypted + self.encryptCheckbutton = self.builder.get_object("encryption1_checkbutton") + self.encryptCheckbutton.set_active(self.encrypted) + options_label = self.builder.get_object("options1_label") options_text = _("You have %(freeSpace)s of free space, which is " @@ -241,15 +245,22 @@ class InstallOptions1Dialog(GUIObject): def on_type_changed(self, combo): self.autoPartType = combo.get_active() + def on_encrypt_toggled(self, checkbox): + self.encrypted = checkbox.get_active() + class InstallOptions2Dialog(InstallOptions1Dialog): builderObjects = ["options2_dialog"] mainWidgetName = "options2_dialog" - def refresh(self, required_space, disk_free, fs_free, autoPartType): + def refresh(self, required_space, disk_free, fs_free, autoPartType, encrypted): self.autoPartType = autoPartType self.autoPartTypeCombo = self.builder.get_object("options2_combo") self.autoPartTypeCombo.set_active(self.autoPartType) + self.encrypted = encrypted + self.encryptCheckbutton = self.builder.get_object("encryption2_checkbutton") + self.encryptCheckbutton.set_active(self.encrypted) + sw_text = self._get_sw_needs_text(required_space) label_text = _("%s\nThe disks you've selected have the following " "amounts of free space:") % sw_text @@ -279,7 +290,7 @@ class InstallOptions3Dialog(InstallOptions1Dialog): builderObjects = ["options3_dialog"] mainWidgetName = "options3_dialog" - def refresh(self, required_space, disk_free, fs_free, autoPartType): + def refresh(self, required_space, disk_free, fs_free, autoPartType, encrypted): sw_text = self._get_sw_needs_text(required_space) label_text = (_("%s\nYou don't have enough space available to install " "%s, even if you used all of the free space\n" @@ -501,9 +512,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): self._previous_autopart = self.autopart - encrypt_checkbutton = self.builder.get_object("encryption_checkbutton") - encrypt_checkbutton.set_active(self.encrypted) - # update the selections in the ui overviews = self.local_disks_box.get_children() for overview in overviews: @@ -658,9 +666,6 @@ class StorageSpoke(NormalSpoke, StorageChecker): def _check_encrypted(self): # even if they're not doing autopart, setting autopart.encrypted # establishes a default of encrypting new devices - encrypt_button = self.builder.get_object("encryption_checkbutton") - self.encrypted = encrypt_button.get_active() - if not self.encrypted: return True @@ -733,10 +738,12 @@ class StorageSpoke(NormalSpoke, StorageChecker): else: dialog = InstallOptions3Dialog(self.data, payload=self.payload) - dialog.refresh(required_space, disk_free, fs_free, self.autoPartType) + dialog.refresh(required_space, disk_free, fs_free, self.autoPartType, + self.encrypted) rc = self.run_lightbox_dialog(dialog) if rc == dialog.RESPONSE_CONTINUE: self.autoPartType = dialog.autoPartType + self.encrypted = dialog.encrypted if not self._check_encrypted(): return @@ -761,6 +768,8 @@ class StorageSpoke(NormalSpoke, StorageChecker): NormalSpoke.on_back_clicked(self, button) elif rc == dialog.RESPONSE_RECLAIM: self.autoPartType = dialog.autoPartType + self.encrypted = dialog.encrypted + if not self._check_encrypted(): return @@ -771,6 +780,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): elif rc == dialog.RESPONSE_CUSTOM: self.autopart = False self.autoPartType = dialog.autoPartType + self.encrypted = dialog.encrypted self.skipTo = "CustomPartitioningSpoke" NormalSpoke.on_back_clicked(self, button) -- 1.8.1

3 2

[PATCH rhel7] Set ONBOOT=no for default autoconnections (#905918, #886090)
by Radek Vykydal 13 Feb '13

13 Feb '13

Autoconnections are set up by NM for devices not having ifcfg file (ie those not activated by dracut or not configured in kickstart). We want to default to "no" for this devices in RHEL. We even't don't want to bring up the autoconnections in installer environment, but that is something for a separate bug. --- pyanaconda/network.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 2bf7832..dc29c1b1 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -483,6 +483,7 @@ def createMissingDefaultIfcfgs(): # if so, write its configuration with name changed to iface if con_hwaddr.upper() == hwaddr.upper(): setting['connection']['id'] = interface + setting['connection']['autoconnect'] = False con.Update(setting) rv = True log.debug("network: dumped ifcfg file for default autoconnection on %s" % interface) -- 1.7.11.7

2 1

[PATCH] re-fetch metadata when proxy settings change
by Brian C. Lane 13 Feb '13

13 Feb '13

From: "Brian C. Lane" <bcl(a)redhat.com> If you entered a bad proxy the only way to get it to continue was to change the source to something different. --- pyanaconda/ui/gui/spokes/source.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 87ebb89..b5a7162 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -95,8 +95,6 @@ class ProxyDialog(GUIObject): self._proxyAuthBox.set_sensitive(button.get_active()) def refresh(self): - import re - GUIObject.refresh(self) self._proxyCheck = self.builder.get_object("enableProxyCheck") @@ -435,6 +433,7 @@ class SourceSpoke(NormalSpoke): self._currentIsoFile = None self._ready = False self._error = False + self._proxyChange = False def apply(self): import copy @@ -475,7 +474,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 and self.payload.baseRepo: + if not old_source.method and self.payload.baseRepo and \ + not self._proxyChange: return elif self._http_active() or self._ftp_active(): url = self._urlEntry.get_text().strip() @@ -499,7 +499,7 @@ class SourceSpoke(NormalSpoke): url = "https://" + url mirrorlist = self._mirrorlistCheckbox.get_active() - if old_source.method == "url" and \ + if old_source.method == "url" and not self._proxyChange and \ ((not mirrorlist and old_source.url == url) or \ (mirrorlist and old_source.mirrorlist == url)): return @@ -879,10 +879,12 @@ class SourceSpoke(NormalSpoke): self._verifyIsoButton.set_sensitive(True) def on_proxy_clicked(self, button): + old_proxy = self.data.method.proxy dialog = ProxyDialog(self.data) with enlightbox(self.window, dialog.window): dialog.refresh() dialog.run() + self._proxyChange = old_proxy != self.data.method.proxy def on_verify_iso_clicked(self, button): p = self._get_selected_partition() -- 1.8.1

2 1

[master] Fixes to make addons work
by Vratislav Podzimek 12 Feb '13

12 Feb '13

These changes are needed to make addons work. As a proof of concept and as part of the Anaconda Addon Development Guide I've written an example addon [1]. And believe it or not it really works! [2] [1] http://www.fi.muni.cz/~xpodzim/git/?p=hello-world-anaconda-addon.git [2] http://vpodzime.fedorapeople.org/working_addon.png Martin Sivak (1): Honor modules' __all__ when doing collect Vratislav Podzimek (1): Use ksdata.addons instead of ksdata.addon and add ADDON_PATHS to sys.path anaconda | 4 ++++ pyanaconda/addons.py | 2 +- pyanaconda/install.py | 4 ++-- pyanaconda/kickstart.py | 8 ++++---- pyanaconda/ui/common.py | 10 +++++++++- 5 files changed, 20 insertions(+), 8 deletions(-) -- 1.7.11.7

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches February 2013