Anaconda-devel May 2012

anaconda-devel@lists.stg.fedoraproject.org

26 participants
106 discussions

[PATCH rhel7-alpha2-branch] Start ssh with systemd, not in anaconda (#824580)
by Radek Vykydal 31 May '12

31 May '12

In this take: 1) sshd is started always, regardless of sshd boot option, (as in s390x) with empty root password. 2) sshpw kickstart command works, so root/users passwords can be set, but this happens in anaconda so between sshd and anaconda is run there is root ssh access without password. Is this ok for alpha2? To achieve original behaviour we'll need to parse sshd option in dracut and change sshd (and/or perhaps anaconda/sshd systemd) configuration files in dracut. Setting passwords (at least for root) already in dracut may be needed. I'd need to consult this with Will, or leave it to him. Resolves: rhbz#824580 --- data/systemd/anaconda.target | 1 + pyanaconda/sshd.py | 46 ++++------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target index 983ff3b..1af847d 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -9,3 +9,4 @@ Wants=rsyslog.service Wants=udev-settle.service Wants=NetworkManager.service Wants=plymouth-quit.service plymouth-quit-wait.service +Wants=sshd.service diff --git a/pyanaconda/sshd.py b/pyanaconda/sshd.py index b6c9372..300d943 100644 --- a/pyanaconda/sshd.py +++ b/pyanaconda/sshd.py @@ -23,34 +23,16 @@ import logging import os, sys log = logging.getLogger("anaconda") -import iutil import users from flags import flags from constants import ROOT_PATH -def createSshKey(algorithm, keyfile): - path = '/etc/ssh/%s' % (keyfile,) - argv = ['-q','-t',algorithm,'-f',path,'-C','','-N',''] - if os.access(path, os.R_OK): - return - log.debug("running \"%s\"" % (" ".join(['ssh-keygen']+argv),)) - - so = "/tmp/ssh-keygen-%s-stdout.log" % (algorithm,) - se = "/tmp/ssh-keygen-%s-stderr.log" % (algorithm,) - iutil.execWithRedirect('ssh-keygen', argv, stdout=so, stderr=se) - def doSshd(anaconda): - if flags.sshd: - # we need to have a libuser.conf that points to the installer root for - # sshpw, but after that we start sshd, we need one that points to the - # install target. - luserConf = users.createLuserConf(instPath="") - handleSshPw(anaconda) - startSsh() - del(os.environ["LIBUSER_CONF"]) - else: - log.info("sshd: not enabled, skipping.") - + # we need to have a libuser.conf that points to the installer root for + # sshpw, but after that we need one that points to the install target. + luserConf = users.createLuserConf(instPath="") + handleSshPw(anaconda) + del(os.environ["LIBUSER_CONF"]) users.createLuserConf(ROOT_PATH) def handleSshPw(anaconda): @@ -70,21 +52,3 @@ def handleSshPw(anaconda): u.createUser(ud.username, **kwargs) del u - -def startSsh(): - if iutil.isS390(): - return - - if not iutil.fork_orphan(): - os.open("/var/log/lastlog", os.O_RDWR | os.O_CREAT, 0644) - ssh_keys = { - 'rsa1':'ssh_host_key', - 'rsa':'ssh_host_rsa_key', - 'dsa':'ssh_host_dsa_key', - } - for (algorithm, keyfile) in ssh_keys.items(): - createSshKey(algorithm, keyfile) - sshd = iutil.find_program_in_path("sshd") - args = [sshd, "-f", "/etc/ssh/sshd_config.anaconda"] - os.execv(sshd, args) - sys.exit(1) -- 1.7.4

4 5

[newui] NTP servers configuration
by Vratislav Podzimek 31 May '12

31 May '12

These three patches introduce the NTP servers configuration button and dialog on the Datetime spoke. Video preview can be found at: http://vpodzime.fedorapeople.org/ntp_config_dialog.ogg There is a question when to refresh the working states of the servers. For now, the are refreshed in the refresh method of the spoke and when "Cancel" is hit on the configuration dialog (that results in repopulation of the store with servers from the config file. I think this should be both enough and not too much. -- Vratislav Podzimek

2 12

[lorax] Don't remove sha256sum from the install image
by Martin Gracik 31 May '12

31 May '12

--- share/runtime-cleanup.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 5a08ab1..b454e67 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -154,7 +154,7 @@ removefrom coreutils /usr/bin/mkfifo /usr/bin/nl /usr/bin/nohup /usr/bin/nproc removefrom coreutils /usr/bin/od /usr/bin/paste /usr/bin/pathchk removefrom coreutils /usr/bin/pinky /usr/bin/pr /usr/bin/printenv removefrom coreutils /usr/bin/printf /usr/bin/ptx /usr/bin/runcon /usr/bin/seq -removefrom coreutils /usr/bin/sha224sum /usr/bin/sha256sum /usr/bin/sha384sum +removefrom coreutils /usr/bin/sha224sum /usr/bin/sha384sum removefrom coreutils /usr/bin/sha512sum /usr/bin/shuf /usr/bin/stat removefrom coreutils /usr/bin/stdbuf /usr/bin/sum /usr/bin/test removefrom coreutils /usr/bin/timeout /usr/bin/truncate /usr/bin/tsort -- 1.7.9.5

1 0

[grubby] Pick the last / device (#826537)
by Brian C. Lane 30 May '12

30 May '12

From: "Brian C. Lane" <bcl(a)redhat.com> When there are multiple devices mounted on /, as there can be during a preupgrade, the last device is the one that should match the grub.cfg entry. This was preventing preupgrade from installing the new f17 kernel. Related: rhbz#820340 Related: rhbz#820351 --- grubby.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/grubby.c b/grubby.c index b7d989d..fe8317d 100644 --- a/grubby.c +++ b/grubby.c @@ -1460,6 +1460,8 @@ static char *findDiskForRoot() buf[rc] = '\0'; chptr = buf; + char *foundanswer = NULL; + while (chptr && chptr != buf+rc) { devname = chptr; @@ -1487,13 +1489,8 @@ static char *findDiskForRoot() * for '/' obviously. */ if (*(++chptr) == '/' && *(++chptr) == ' ') { - /* - * Move back 2, which is the first space after the device name, set - * it to \0 so strdup will just get the devicename. - */ - chptr -= 2; - *chptr = '\0'; - return strdup(devname); + /* remember the last / entry in mtab */ + foundanswer = devname; } /* Next line */ @@ -1502,6 +1499,13 @@ static char *findDiskForRoot() chptr++; } + /* Return the last / entry found */ + if (foundanswer) { + chptr = strchr(foundanswer, ' '); + *chptr = '\0'; + return strdup(foundanswer); + } + return NULL; } -- 1.7.7.6

1 0

Allow sharing of the VNC server
by Jesse Keating 30 May '12

30 May '12

I'm not really sure what might break here, we've always used -nevershared since the vnc code was first added to Anaconda waaaay back when. But it's worth testing in rawhide to see what falls over I suppose. -- jlk

3 4

Anaconda storage module does not see LVM
by Jan Safranek 29 May '12

29 May '12

Hi, I have one volume group /dev/vgMine with one logical volume /dev/vgMine/lvMine and I have troubles seeing these devices in Anaconda storage module. E.g. this simple program does not list them: <imports omitted> platform = pyanaconda.platform.getPlatform(None) storage = pyanaconda.storage.Storage(platform=platform) storage.devicetree.populate() print storage.vgs, storage.lvs --> [] [] print storage.devices -> neither vgMine nor lvMine is there I am pretty sure I am doing something wrong, I'd bet you test such basic cases. I'm using anaconda-18.2-1.fc18. You can see storage log attached. It seems /dev/sda1 is correctly detected as lvmpv, but its vgName = None and vgUUID = None. vgMine is not added to the device tree and later lvMine is thrown away, because it misses vgMine. Jan

2 1

GUI TODO
by Martin Sivak 29 May '12

29 May '12

Hi Chris, some of the outstanding entries in the TODO list in newui branch lack enough context. We mostly understand the summaries, but would like to know more about your ideas and directions you want to pursue. Can you please elaborate on some of the following items? (in the TODO itself or on the list). We can think about solutions ourselves, but as it is your design, you probably have ideas about how to make it properly and consistently. We would like to hear those. - Custom partitioning needs to be revisited, then written. - Disk tug-o-war needs to be written. - Test handling of inconsistent LVM/RAID, and uninitialized disks. If I followed correctly, this is what you are doing ATM, right? - Install hub needs to be skipped if all spokes are completed on a kickstart install. How to handle the fact that spokes may only be ready once they're finished downloading? This would be handled in Hub's refresh method I assume. Can we detect that a spoke is still downloading? I mean, do we have a "spoke ready" message? We might just show the Hub screen with information about the ongoing operation and then continue once everything is ready && completed. I am not sure about whether we should allow the user to make any changes while in ks mode, we used to ask for stuff we didn't get, so we probably should.. - Update exception handling. This requires updating python-meh to use gtk3, which also requires updating firstboot and s-c-ks to gtk3. I want to turn s-c-ks into an anaconda wrapper first, though. Anything we can help with (the gtk port is obvious)? How do you envision the wrapper to work and interact with newui anaconda? Do we still want s-c-ks? I thought we are about to kill it and use the newui in standalone mode. And what about firstboot and anaconda widgets? Do we still plan to implement interoperability there? (I am asking because there is another project seeking to replace firstboot - https://fedoraproject.org/wiki/Features/InitialExperience ) - Wall of anaconda needs to be taken into account. I have no idea what this is supposed to mean... -- Martin Sivák msivak(a)redhat.com Red Hat Czech Anaconda team / Brno, CZ

2 1

[PATCH] Implementation of normal Language spoke
by Martin Sivak 29 May '12

29 May '12

Shares most of the code with WelcomeLanguageSpoke and transfers the selection ListView and label between the two display variants as needed. --- pyanaconda/ui/gui/spokes/welcome.py | 110 +++++++++++++++++++++++++++++------ pyanaconda/ui/gui/spokes/welcome.ui | 63 +++++++++++++++++++- 2 files changed, 153 insertions(+), 20 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index b80ccb9..741d291 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -23,33 +23,34 @@ import sys import gettext _ = lambda x: gettext.ldgettext("anaconda", x) +N_ = lambda x: x from gi.repository import AnacondaWidgets, Gtk from pyanaconda.ui.gui.hubs.summary import SummaryHub -from pyanaconda.ui.gui.spokes import StandaloneSpoke +from pyanaconda.ui.gui.spokes import StandaloneSpoke, NormalSpoke from pyanaconda.ui.gui.utils import enlightbox +from pyanaconda.ui.gui.categories.localization import LocalizationCategory from pyanaconda.localization import Language, LOCALE_PREFERENCES from pyanaconda.product import productName, productVersion from pyanaconda import xklavier from pyanaconda import localization -__all__ = ["WelcomeLanguageSpoke"] +__all__ = ["WelcomeLanguageSpoke", "LanguageSpoke"] -class WelcomeLanguageSpoke(StandaloneSpoke): - mainWidgetName = "welcomeWindow" - uiFile = "spokes/welcome.ui" - - preForHub = SummaryHub - priority = 0 +class LanguageMixIn(object): + builderObjects = ["languageStore"] - def __init__(self, *args): - StandaloneSpoke.__init__(self, *args) + def __init__(self, labelName = "welcomeLabel", + viewName = "languageView", selectionName = "languageViewSelection"): self._xklwrapper = xklavier.XklWrapper.get_instance() self._origStrings = {} + self._labelName = labelName + self._viewName = viewName + self._selectionName = selectionName def apply(self): - selected = self.builder.get_object("languageViewSelection") + selected = self.builder.get_object(self._selectionName) (store, itr) = selected.get_selected() lang = store[itr][2] @@ -87,8 +88,6 @@ class WelcomeLanguageSpoke(StandaloneSpoke): return self.data.lang.lang and self.data.lang.lang != "" def initialize(self): - StandaloneSpoke.initialize(self) - store = self.builder.get_object("languageStore") # TODO We can use the territory from geoip here @@ -106,8 +105,7 @@ class WelcomeLanguageSpoke(StandaloneSpoke): self._selectLanguage(store, self.language.preferred_translation.short_name) def retranslate(self): - StandaloneSpoke.retranslate(self) - welcomeLabel = self.builder.get_object("welcomeLabel") + welcomeLabel = self.builder.get_object(self._labelName) if not welcomeLabel in self._origStrings: self._origStrings[welcomeLabel] = welcomeLabel.get_label() @@ -116,11 +114,25 @@ class WelcomeLanguageSpoke(StandaloneSpoke): xlated = _(before) % (productName.upper(), productVersion) welcomeLabel.set_label(xlated) - def refresh(self): - StandaloneSpoke.refresh(self) + def refresh(self, displayArea): store = self.builder.get_object("languageStore") self._selectLanguage(store, self.data.lang.lang) + # Rip the label and language selection window + # from where it is right now and add it to this + # spoke. + # This way we can share the dialog and code + # between Welcome and Language spokes + langList = self.builder.get_object("languageWindow") + langList.get_parent().remove(langList) + langLabel = self.builder.get_object("pickLanguageLabel") + langLabel.get_parent().remove(langLabel) + + content = self.builder.get_object(displayArea) + content.pack_start(child = langLabel, fill = True, expand = False, padding = 0) + content.pack_start(child = langList, fill = True, expand = True, padding = 0) + + def _addLanguage(self, store, native, english, setting): store.append([native, english, setting]) @@ -133,7 +145,7 @@ class WelcomeLanguageSpoke(StandaloneSpoke): if not itr: return - treeview = self.builder.get_object("languageView") + treeview = self.builder.get_object(self._viewName) selection = treeview.get_selection() selection.select_iter(itr) path = store.get_path(itr) @@ -142,7 +154,8 @@ class WelcomeLanguageSpoke(StandaloneSpoke): # Signal handlers. def on_selection_changed(self, selection): (store, selected) = selection.get_selected_rows() - self.window.set_may_continue(len(selected) > 0) + if hasattr(self.window, "set_may_continue"): + self.window.set_may_continue(len(selected) > 0) if selected: lang = store[selected[0]][2] @@ -150,6 +163,27 @@ class WelcomeLanguageSpoke(StandaloneSpoke): self.language.set_system_lang(lang) self.retranslate() + +class WelcomeLanguageSpoke(LanguageMixIn, StandaloneSpoke): + mainWidgetName = "welcomeWindow" + uiFile = "spokes/welcome.ui" + builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, "betaWarnDialog"] + + preForHub = SummaryHub + priority = 0 + + def __init__(self, *args): + StandaloneSpoke.__init__(self, *args) + LanguageMixIn.__init__(self) + + def retranslate(self): + StandaloneSpoke.retranslate(self) + LanguageMixIn.retranslate(self) + + def refresh(self): + StandaloneSpoke.refresh(self) + LanguageMixIn.refresh(self, "welcomeWindowContentBox") + # Override the default in StandaloneSpoke so we can display the beta # warning dialog first. def _on_continue_clicked(self, cb): @@ -163,3 +197,41 @@ class WelcomeLanguageSpoke(StandaloneSpoke): sys.exit(0) else: StandaloneSpoke._on_continue_clicked(self, cb) + + +class LanguageSpoke(LanguageMixIn, NormalSpoke): + mainWidgetName = "languageSpokeWindow" + uiFile = "spokes/welcome.ui" + builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, WelcomeLanguageSpoke.mainWidgetName] + + category = LocalizationCategory + + icon = "accessories-character-map-symbolic" + title = N_("LANGUAGE") + + + def __init__(self, *args): + NormalSpoke.__init__(self, *args) + LanguageMixIn.__init__(self) + + def retranslate(self): + print "retranslate" + NormalSpoke.retranslate(self) + LanguageMixIn.retranslate(self) + + def refresh(self): + NormalSpoke.refresh(self) + LanguageMixIn.refresh(self, "languageSpokeWindowContentBox") + + @property + def completed(self): + # The language spoke is always completed, as it does not require you do + # anything. There's always a default selected. + return True + + @property + def status(self): + selected = self.builder.get_object(self._selectionName) + (store, itr) = selected.get_selected() + + return store[itr][0] diff --git a/pyanaconda/ui/gui/spokes/welcome.ui b/pyanaconda/ui/gui/spokes/welcome.ui index 0d64ffc..655f9f7 100644 --- a/pyanaconda/ui/gui/spokes/welcome.ui +++ b/pyanaconda/ui/gui/spokes/welcome.ui @@ -119,6 +119,15 @@ OS you can rely on. It's for testing purposes only.</property> <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> @@ -133,6 +142,58 @@ OS you can rely on. It's for testing purposes only.</property> <action-widget response="1">continueButton</action-widget> </action-widgets> </object> + <object class="AnacondaSpokeWindow" id="languageSpokeWindow"> + <property name="startup_id">filler</property> + <property name="can_focus">False</property> + <property name="startup_id">filler</property> + <signal name="back-clicked" handler="on_back_clicked" swapped="no"/> + <child internal-child="main_box"> + <object class="GtkBox" id="AnacondaSpokeWindow-main_box1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child internal-child="nav_area"> + <object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1"> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> + <property name="margin_top">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="alignment"> + <object class="GtkAlignment" id="AnacondaSpokeWindow-alignment1"> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="xscale">0</property> + <property name="yscale">0.5</property> + <child internal-child="action_area"> + <object class="GtkBox" id="languageSpokeWindowContentBox"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> <object class="GtkListStore" id="languageStore"> <columns>  @@ -174,7 +235,7 @@ OS you can rely on. It's for testing purposes only.</property> <property name="xscale">0</property> <property name="yscale">0.5</property> <child internal-child="action_area"> - <object class="GtkBox" id="welcomeWindow-actionArea"> + <object class="GtkBox" id="welcomeWindowContentBox"> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> -- 1.7.10.1

2 1

[PATCH] Change cursor shape when the pointer is over SpokeSelector icon
by Martin Sivak 29 May '12

29 May '12

I have no idea where should we free private SpokeSelector variables.. I haven't found any structure or call for that.. any idea? --- widgets/src/SpokeSelector.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index f4247a6..bb2162e 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -58,12 +58,14 @@ struct _AnacondaSpokeSelectorPrivate { GtkWidget *icon, *incomplete_icon; GtkWidget *title_label; GtkWidget *status_label; + GdkCursor *cursor; }; G_DEFINE_TYPE(AnacondaSpokeSelector, anaconda_spoke_selector, GTK_TYPE_EVENT_BOX) static void anaconda_spoke_selector_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void anaconda_spoke_selector_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void anaconda_spoke_selector_realize(GtkWidget *widget, gpointer user_data); static gboolean anaconda_spoke_selector_focus_changed(GtkWidget *widget, GdkEventFocus *event, gpointer user_data); @@ -156,6 +158,11 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) { g_signal_connect(spoke, "focus-in-event", G_CALLBACK(anaconda_spoke_selector_focus_changed), NULL); g_signal_connect(spoke, "focus-out-event", G_CALLBACK(anaconda_spoke_selector_focus_changed), NULL); + /* Set "hand" cursor shape when over the selector */ + spoke->priv->cursor = gdk_cursor_new(GDK_HAND2); + g_signal_connect(spoke, "realize", G_CALLBACK(anaconda_spoke_selector_realize), NULL); + /* TODO free the cursor when not needed */ + /* Set property defaults. */ spoke->priv->is_incomplete = FALSE; @@ -284,3 +291,9 @@ static gboolean anaconda_spoke_selector_focus_changed(GtkWidget *widget, GdkEven gtk_widget_set_state_flags(widget, new_state, TRUE); return FALSE; } + +static void anaconda_spoke_selector_realize(GtkWidget *widget, gpointer user_data) { + AnacondaSpokeSelector *spoke_selector = ANACONDA_SPOKE_SELECTOR(widget); + + gdk_window_set_cursor(gtk_widget_get_window(widget), spoke_selector->priv->cursor); +} -- 1.7.10.1

2 1

f17-branch is in the can
by Brian C. Lane 29 May '12

29 May '12

They declared RC4 as gold today, so the f17-branch is now finished. Onward to F18 with newui! Thanks to everyone who helped with this release, especially Will Woods for killing off loader and being so responsive with bugfixes as we sorted things out. -- Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel May 2012