Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[PATCH] Remove libdhcp* from scripts/upd-instroot
by David Cantrell 22 Dec '08

22 Dec '08

--- scripts/upd-instroot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 23efc51..b7bef0e 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -163,7 +163,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit VLGothic-fonts acl anaconda libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft libXi libXinerama libXmu libXpm libXrandr libXrender libXt libXtst libXxf86misc libacl libart_lgpl libattr libbdevid libbdevid-python - libbonobo libdhcp libdhcp4client libdhcp6client libfontenc libgcc + libbonobo libfontenc libgcc libglade2 libgnomecanvas libgcrypt libgpg-error libjpeg liblbxutil libnl libpixman libpng libselinux libselinux-python libsemanage libsemanage-python libsepol libstdc++ libtermcap libthai libuser -- 1.6.0.3

2 1

[PATCH] methodstr -> self.methodstr
by David Cantrell 22 Dec '08

22 Dec '08

--- anaconda | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anaconda b/anaconda index 73fba85..ec0ba47 100755 --- a/anaconda +++ b/anaconda @@ -578,9 +578,9 @@ class Anaconda: numNetDevs = isys.getNetworkDeviceCount() if self.methodstr is not None: - if (methodstr.startswith("http://") or \ - methodstr.startswith("ftp://") or \ - methodstr.startswith("nfs:")) and \ + if (self.methodstr.startswith("http://") or \ + self.methodstr.startswith("ftp://") or \ + self.methodstr.startswith("nfs:")) and \ numNetDevs == 0: fail = True elif self.stage2 is not None: -- 1.6.0.3

2 1

[PATCH] Prevent network install when no network devices are found (#470144)
by David Cantrell 22 Dec '08

22 Dec '08

A corner case, but if a user boots up with boot.iso and has no network devices available, we get all the way to package selection and user is told they cannot continue. This is after all of the other screens and partitioning. In the welcome screen, perform a check to see if the user has booted the installer to a point where it requires a network install for the packages. If so, tell the user they cannot continue and exit the installer. --- anaconda | 21 +++++++++++++++++++++ isys/isys.py | 7 +++++++ iw/welcome_gui.py | 21 +++++++++++++++++++-- textw/welcome_text.py | 16 ++++++++++++++-- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/anaconda b/anaconda index 2731c43..ade122d 100755 --- a/anaconda +++ b/anaconda @@ -564,6 +564,27 @@ class Anaconda: else: self.methodstr = methodstr + def requiresNetworkInstall(self): + fail = False + numNetDevs = isys.getNetworkDeviceCount() + + if self.methodstr is not None: + if (methodstr.startswith("http://") or \ + methodstr.startswith("ftp://") or \ + methodstr.startswith("nfs:")) and \ + numNetDevs == 0: + fail = True + elif self.stage2 is not None: + if stage2.startswith("cdrom://") and \ + not os.path.isdir("/mnt/source/Packages") and \ + numNetDevs == 0: + fail = True + + if fail: + log.error("network install required, but no network devices available") + + return fail + if __name__ == "__main__": anaconda = Anaconda() diff --git a/isys/isys.py b/isys/isys.py index 05e0806..c7cf25b 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -873,6 +873,13 @@ def isIsoImage(file): def fbinfo(): return _isys.fbinfo() +# Return number of network devices +def getNetworkDeviceCount(): + bus = dbus.SystemBus() + nm = bus.get_object(NM_SERVICE, NM_MANAGER_PATH) + devlist = nm.get_dbus_method("GetDevices")() + return len(devlist) + # Get a D-Bus interface for the specified device's (e.g., eth0) properties. # If dev=None, return a hash of the form 'hash[dev] = props_iface' that # contains all device properties for all interfaces that NetworkManager knows diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index a12a2e1..8dc1a7e 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -25,16 +25,18 @@ from constants import * import gettext _ = lambda x: gettext.ldgettext("anaconda", x) -class WelcomeWindow (InstallWindow): +class WelcomeWindow (InstallWindow): windowTitle = "" #N_("Welcome") def __init__ (self, ics): - InstallWindow.__init__ (self, ics) + InstallWindow.__init__ (self, ics) ics.setGrabNext (1) + self.anaconda = None # WelcomeWindow tag="wel" def getScreen (self, anaconda): + self.anaconda = anaconda # this is a bit ugly... but scale the image if we're not at 800x600 (w, h) = self.ics.cw.window.get_size_request() if w >= 800: @@ -48,3 +50,18 @@ class WelcomeWindow (InstallWindow): box.add (pix) return box + def getNext (self): + if self.anaconda.requiresNetworkInstall(): + self.anaconda.intf.messageWindow(_("Network Install Required"), + _("Your installation source is set to " + "a network location, but no netork " + "devices were found on your " + "system. To avoid a network " + "installation, boot with the full " + "DVD, full CD set, or do not pass " + "a repo= parameter that specifies " + "a network source."), + type="custom", + custom_icon="error", + custom_buttons=[_("E_xit Installer")]) + sys.exit(0) diff --git a/textw/welcome_text.py b/textw/welcome_text.py index c5fce5c..c0f771d 100644 --- a/textw/welcome_text.py +++ b/textw/welcome_text.py @@ -25,10 +25,22 @@ _ = lambda x: gettext.ldgettext("anaconda", x) class WelcomeWindow: def __call__(self, screen, anaconda): - rc = ButtonChoiceWindow(screen, _("%s") % (productName,), + rc = ButtonChoiceWindow(screen, _("%s") % (productName,), _("Welcome to %s!\n\n") % (productName, ), buttons = [TEXT_OK_BUTTON], width = 50, - help = "welcome") + help = "welcome") + + if anaconda.requiresNetworkInstall(): + anaconda.intf.messageWindow(_("Network Install Required"), + _("Your installation source is set to " + "a network location, but no netork " + "devices were found on your " + "system. To avoid a network " + "installation, boot with the full " + "DVD, full CD set, or do not pass " + "a repo= parameter that specifies " + "a network source.")) + sys.exit(0) return INSTALL_OK -- 1.6.0.3

3 3

[PATCH] Die on errors from upd-instroot/mk-images rather than continuing on
by Jeremy Katz 22 Dec '08

22 Dec '08

--- scripts/buildinstall | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/buildinstall b/scripts/buildinstall index 97eaf61..8167dcc 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -18,6 +18,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +die() { + [ -n "$TREEDIR" ] && rm -rf $TREEDIR + [ -n "$BUILDINSTDIR" ] && rm -rf $BUILDINSTDIR + [ -n "$yumconf" ] && rm -rf $yumconf + echo "Aborting buildinstall" + echo "$@" + exit 1 +} + usage() { echo "Usage: buildinstall --version <version> --product <product> --release <comment> [--output outputdir] [--discs <discstring>] <root>" >&2 exit 1 @@ -197,14 +206,14 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi echo "Building images..." -$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf +$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf || die "upd-instroot failed" echo "Writing .treeinfo file..." $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo # FIXME: need to update mk-images to take the yumconf echo "Making images..." -$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf +$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf || die "image creation failed" echo "Writing .discinfo file" $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo -- 1.5.4.3

2 1

unsuscribe
by  Cisco#2 21 Dec '08

21 Dec '08

unsuscribe José Pagola.

1 0

[PATCH] removal of libdhcp
by David Cantrell 21 Dec '08

21 Dec '08

No patch attached because it's quite large. I apologize for the length, but considering this replaces a library and introduces a new struct it meant a new file and changing calls everywhere. http://dcantrel.fedorapeople.org/anaconda/iface/ iface.h - Header file explaining the iface API. iface_t structure replacing pumpNetIntf and networkDeviceConfig, and all of the functions. iface.patch - The changes, it's about 90% complete at this point. *.txt - Explanations and notes. This patch removes anaconda's use of libdhcp, which also means removing libdhcp4client and libdhcp6client. For static network configuration, I am using libnl. To gather current network interface information, I am using libnl. To control IPv6 autoconf, I read/ write /proc since that's all we can do right now. For DHCP and DHCPv6, I run dhclient and dhcp6c, respectively. I'd like everyone to have a look at iface.h and the patch file. It's not complete yet, so I probably know about the obvious things (the FIXMEs and the useless debugging printfs and the incomplete isys.py code and so on). The goal with iface.patch is to get us closer to using NetworkManager in stage 1 and stage 2. I envision the NM changeover to be just as large, but hopefully by then we will have decided to nuke certain parts of loader entirely. Completely eliminating libdhcp and friends will be a nice step. There are some other things that need discussion as well. mkinitrd currently uses libdhcp, for example. This had me thinking we could generate libisys in an anaconda-devel package for things like mkinitrd, but I'm just brainstorming. Maybe I should put the iface code elsewhere? I dunno. At any rate, mkinitrd needs to be not left out. Work in progress, comments welcome. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

8 28

Time to cull PACKAGES
by Jesse Keating 21 Dec '08

21 Dec '08

I'm trying to debug why we aren't getting images in rawhide recently, and in doing so I've been running parts of buildinstall by hand (god this is terrible to debug). One thing I noticed is that we're trying to install a lot of things that aren't around anymore. Now, maybe this is bad use of Provides/Obsoletes, but maybe it's also time to cull the list a bit... grep "No package" /tmp/yum.out No package dejavu-fonts available. No package dmapi available. No package libdhcp available. No package libdhcp4client available. No package libdhcp6client available. No package liblbxutil available. No package libpixman available. No package libtermcap available. No package policy available. No package pyspi available. No package python-elementtree available. No package raidtools available. No package redhat-artwork available. No package xorg-x11 available. No package xorg-x11-auth available. No package xorg-x11-base available. No package xorg-x11-libs available. No package xorg-x11-libs-data available. No package xorg-x11-xkbdata available. Thoughts? -- Jesse Keating Fedora -- Freedom² is a feature! identi.ca: http://identi.ca/jkeating

3 2

upd-instroot a little too sensitive to errors?
by Jesse Keating 21 Dec '08

21 Dec '08

upd-instroot has a line in it where it calls yum to install packages, and if yum exits with anything but 0, we die(). Of course, the higher level buildinstall doesn't really check the status of upd-instroot so it just keeps going and fails in more miserable ways. Now, I'm repeating the install command by hand and noticing that yum is actually installing (most) the packages, and there are only a few %pre/% post errors. Unfortunately this is leading yum to exit 1 and upd-instroot is falling over. Sad thing is that yum exists 1 in this scenario for at least a few weeks (I suspect a much longer history). I think something in the current package set of rawhide is triggering this error case. I'm having a hell of a time reproducing in small amounts though, I suspect rpm ordering. Now, I've got another conversation started with yum folks about whether yum should return non-zero here, but should we be so sensitive with upd-instroot? I guess we don't have any other way to tell if yum actually installed something, but given that buildinstall doesn't seem to care, it seems silly to make upd-instroot care. Either way, this is why we don't have images in rawhide currently, and I'm trying to fix that. -- Jesse Keating Fedora -- Freedom² is a feature! identi.ca: http://identi.ca/jkeating

2 1

[PATCH] Rewrite iface_ip2str() to use libnm-glib
by David Cantrell 20 Dec '08

20 Dec '08

Last dbus removal patch for code written in C. This one changes iface_ip2str() to use libnm-glib to get the IPv4 address of the specified interface. [rawhide] --- isys/iface.c | 143 +++++++++++++++------------------------------------------- 1 files changed, 36 insertions(+), 107 deletions(-) diff --git a/isys/iface.c b/isys/iface.c index 3e101fd..eb3a20b 100644 --- a/isys/iface.c +++ b/isys/iface.c @@ -44,9 +44,11 @@ #include <netlink/route/link.h> #include <glib.h> -#include <dbus/dbus.h> #include <NetworkManager.h> #include <nm-client.h> +#include <nm-device.h> +#include <nm-ip4-config.h> +#include <nm-setting-ip4-config.h> #include "iface.h" #include "str.h" @@ -155,16 +157,15 @@ int _iface_redirect_io(char *device, int fd, int mode) { * inet_ntop()). Return NULL for no match or error. */ char *iface_ip2str(char *ifname, int family) { - char *ipaddr = NULL; - char *nm_iface = NM_DBUS_INTERFACE; - char *property = NULL; - char *device_path = NULL; - char *interface = NULL; - struct in_addr addr; - DBusConnection *connection = NULL; - DBusError error; - DBusMessage *message = NULL, *reply = NULL, *devreply = NULL; - DBusMessageIter iter, a_iter, d_iter, v_iter; + int i; + NMClient *client = NULL; + NMIP4Config *ip4config = NULL; + NMIP4Address *ipaddr = NULL; + NMDevice *candidate = NULL; + struct in_addr tmp_addr; + const GPtrArray *devices; + const char *iface; + char ipstr[INET_ADDRSTRLEN+1]; if (ifname == NULL) { return NULL; @@ -175,120 +176,48 @@ char *iface_ip2str(char *ifname, int family) { return NULL; } - dbus_error_init(&error); - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (connection == NULL) { - dbus_error_free(&error); - return NULL; - } + g_type_init(); - message = dbus_message_new_method_call(NM_DBUS_SERVICE, - NM_DBUS_PATH, - NM_DBUS_SERVICE, - "GetDevices"); - if (!message) { + client = nm_client_new(); + if (!client) { return NULL; } - reply = dbus_connection_send_with_reply_and_block(connection, - message, - -1, &error); - dbus_message_unref(message); - if (!reply) { + if (nm_client_get_state(client) != NM_STATE_CONNECTED) { + g_object_unref(client); return NULL; } - dbus_message_iter_init(reply, &iter); - dbus_message_iter_recurse(&iter, &a_iter); - - while (dbus_message_iter_get_arg_type(&a_iter) != DBUS_TYPE_INVALID) { - dbus_message_iter_get_basic(&a_iter, &device_path); + devices = nm_client_get_devices(client); + for (i=0; i < devices->len; i++) { + candidate = g_ptr_array_index(devices, i); + iface = nm_device_get_iface(candidate); - message = dbus_message_new_method_call(NM_DBUS_SERVICE, - device_path, - DBUS_INTERFACE_PROPERTIES, - "Get"); - if (!message) { - return NULL; - } + if (nm_device_get_state(candidate) != NM_DEVICE_STATE_ACTIVATED) + continue; - property = "Interface"; - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &nm_iface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID)) { - dbus_message_unref(message); - return NULL; - } + if (!iface || strcmp(iface, ifname)) + continue; - devreply = dbus_connection_send_with_reply_and_block(connection, - message, - -1, &error); - dbus_message_unref(message); - if (!devreply) { - dbus_message_iter_next(&a_iter); + if (!(ip4config = nm_device_get_ip4_config(candidate))) continue; - } - dbus_message_iter_init(devreply, &d_iter); - while (dbus_message_iter_get_arg_type(&d_iter) != DBUS_TYPE_INVALID) { - dbus_message_iter_recurse(&d_iter, &v_iter); - dbus_message_iter_get_basic(&v_iter, &interface); - - if (!strcmp(ifname, interface)) { - message = dbus_message_new_method_call(NM_DBUS_SERVICE, - device_path, DBUS_INTERFACE_PROPERTIES, "Get"); - if (!message) { - return NULL; - } - - if (family == AF_INET) { - property = "Ip4Address"; - } - - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &nm_iface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID)) { - dbus_message_unref(message); - return NULL; - } - - devreply = dbus_connection_send_with_reply_and_block(connection, - message, -1, &error); - dbus_message_unref(message); - if (!devreply) { - return NULL; - } - - dbus_message_iter_init(devreply, &d_iter); - dbus_message_iter_recurse(&d_iter, &v_iter); - if (dbus_message_iter_get_arg_type(&v_iter)==DBUS_TYPE_UINT32) { - memset(&addr, 0, sizeof(addr)); - dbus_message_iter_get_basic(&v_iter, &addr.s_addr); - - if ((ipaddr = malloc(INET_ADDRSTRLEN+1)) == NULL) { - abort(); - } - - if (inet_ntop(family, &addr, ipaddr, - INET_ADDRSTRLEN) == NULL) { - abort(); - } - - dbus_connection_unref(connection); - return ipaddr; - } - } + if (!(ipaddr = nm_ip4_config_get_addresses(ip4config)->data)) + continue; + memset(&ipstr, '\0', sizeof(ipstr)); + tmp_addr.s_addr = nm_ip4_address_get_address(ipaddr); - dbus_message_iter_next(&d_iter); + if (inet_ntop(AF_INET, &tmp_addr, ipstr, INET_ADDRSTRLEN) == NULL) { + g_object_unref(client); + return NULL; } - dbus_message_iter_next(&a_iter); + g_object_unref(client); + return g_strdup(ipstr); } - dbus_connection_unref(connection); + g_object_unref(client); return NULL; } -- 1.6.0.3

2 1

[PATCH] Remove isys.e2fslabel() and isys.getraidsb()
by David Cantrell 19 Dec '08

19 Dec '08

These functions are not used in anaconda by anything. --- isys/isys.c | 67 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 67 deletions(-) diff --git a/isys/isys.c b/isys/isys.c index b3466ab..0813e50 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -98,13 +98,11 @@ static PyObject * doUnLoSetup(PyObject * s, PyObject * args); static PyObject * doLoChangeFd(PyObject * s, PyObject * args); static PyObject * doDdFile(PyObject * s, PyObject * args); static PyObject * doWipeRaidSuperblock(PyObject * s, PyObject * args); -static PyObject * doGetRaidSuperblock(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 * doClobberExt2 (PyObject * s, PyObject * args); -static PyObject * doReadE2fsLabel(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); @@ -137,10 +135,8 @@ static PyMethodDef isysModuleMethods[] = { { "ejectcdrom", (PyCFunction) doEjectCdrom, METH_VARARGS, NULL }, { "e2dirty", (PyCFunction) doExt2Dirty, METH_VARARGS, NULL }, { "e2hasjournal", (PyCFunction) doExt2HasJournal, METH_VARARGS, NULL }, - { "e2fslabel", (PyCFunction) doReadE2fsLabel, METH_VARARGS, NULL }, { "e2fsclobber", (PyCFunction) doClobberExt2, METH_VARARGS, NULL }, { "devSpaceFree", (PyCFunction) doDevSpaceFree, METH_VARARGS, NULL }, - { "getraidsb", (PyCFunction) doGetRaidSuperblock, METH_VARARGS, NULL }, { "wiperaidsb", (PyCFunction) doWipeRaidSuperblock, METH_VARARGS, NULL }, { "getraidchunk", (PyCFunction) doGetRaidChunkSize, METH_VARARGS, NULL }, { "lochangefd", (PyCFunction) doLoChangeFd, METH_VARARGS, NULL }, @@ -422,45 +418,6 @@ static PyObject * doWipeRaidSuperblock(PyObject * s, PyObject * args) { return Py_None; } -static PyObject * doGetRaidSuperblock(PyObject * s, PyObject * args) { - int fd; - unsigned long size; - mdp_super_t sb; - char uuid[36]; - - if (!PyArg_ParseTuple(args, "i", &fd)) return NULL; - - if (ioctl(fd, BLKGETSIZE, &size)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - /* put the size in 1k blocks */ - size >>= 1; - - if (lseek64(fd, ((off64_t) 512) * (off64_t) MD_NEW_SIZE_SECTORS(size), SEEK_SET) < 0) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - if (read(fd, &sb, sizeof(sb)) != sizeof(sb)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - if (sb.md_magic != MD_SB_MAGIC) { - PyErr_SetString(PyExc_ValueError, "bad md magic on device"); - return NULL; - } - - sprintf(uuid, "%08x:%08x:%08x:%08x", sb.set_uuid0, sb.set_uuid1, - sb.set_uuid2, sb.set_uuid3); - - return Py_BuildValue("(iisiiii)", sb.major_version, sb.minor_version, - uuid, sb.level, sb.nr_disks, sb.raid_disks, - sb.md_minor); -} - static PyObject * doGetRaidChunkSize(PyObject * s, PyObject * args) { int fd; unsigned long size; @@ -573,30 +530,6 @@ static PyObject * doClobberExt2 (PyObject * s, PyObject * args) { return Py_None; } -static PyObject * doReadE2fsLabel(PyObject * s, PyObject * args) { - char * device; - ext2_filsys fsys; - char buf[50]; - int rc; - - if (!PyArg_ParseTuple(args, "s", &device)) return NULL; - - rc = ext2fs_open(device, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, - &fsys); - if (rc) { - Py_INCREF(Py_None); - return Py_None; - } - - memset(buf, 0, sizeof(buf)); - strncpy(buf, fsys->super->s_volume_name, - sizeof(fsys->super->s_volume_name)); - - ext2fs_close(fsys); - - return Py_BuildValue("s", buf); -} - static PyObject * doExt2Dirty(PyObject * s, PyObject * args) { char * device; ext2_filsys fsys; -- 1.6.0.3

2 1

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel December 2008