Anaconda-devel August 2010

anaconda-devel@lists.stg.fedoraproject.org

32 participants
101 discussions

[PATCH 1/2 master] Improve logging of ifcfg stuff.
by Radek Vykydal 08 Sep '10

08 Sep '10

Still logging into /tmp/ifcfg.log, but now - standard format is used, - values of IfcfgFile are removed (only what would be written-out, that is __str__() output is kept) - it was only confusing, should be part of unit tests if anything - logging of some events is added (e.g. Network.write(), Network.update()) --- pyanaconda/gui.py | 6 ++- pyanaconda/network.py | 105 ++++++++++++++++++++++++------------------------- 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index 1853b2d..0b593b6 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -942,9 +942,11 @@ class InstallInterface(InstallInterfaceBase): self.anaconda.network.updateIfcfgsSSID(dev_ssids) self.anaconda.network.writeIfcfgFiles() - network.logIfcfgFiles(header="========== before nm-c-e run\n") + # Logging can race here with ifcfg-rh updating the file + network.logIfcfgFiles(message="Dump before nm-c-e (can race " + "with ifcfg updating). ") runNMCE(self.anaconda) - network.logIfcfgFiles(header="========== after nm-c-e run\n") + network.logIfcfgFiles(message="Dump after nm-c-e. ") self.anaconda.network.update() diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 5dc81cb..8998759 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -49,6 +49,19 @@ networkConfFile = "%s/network" % (sysconfigDir) ifcfgLogFile = "/tmp/ifcfg.log" CONNECTION_TIMEOUT = 45 +# Setup special logging for ifcfg NM interface +from pyanaconda import anaconda_log +logger = logging.getLogger("ifcfg") +logger.setLevel(logging.DEBUG) +anaconda_log.logger.addFileHandler(ifcfgLogFile, logger, logging.DEBUG) +anaconda_log.logger.addFileHandler("/dev/tty3", logger, + anaconda_log.DEFAULT_TTY_LEVEL, + anaconda_log.TTY_FORMAT, + autoLevel=True) +anaconda_log.logger.forwardToSyslog(logger) + +ifcfglog = logging.getLogger("ifcfg") + class IPError(Exception): pass @@ -175,33 +188,24 @@ def getActiveNetDevs(): ret.sort() return ret -def logIfcfgFile(path, header="\n"): - logfile = ifcfgLogFile - if not os.access(path, os.R_OK): - return - f = open(path, 'r') - lf = open(logfile, 'a') - lf.write(header) - lf.write(f.read()) - lf.close() - f.close() - -def logIfcfgFiles(header="\n"): - - lf = open(ifcfgLogFile, 'a') - lf.write(header) - lf.close() +def logIfcfgFile(path, message=""): + content = "" + if os.access(path, os.R_OK): + f = open(path, 'r') + content = f.read() + f.close() + ifcfglog.debug("%s%s:\n%s" % (message, path, content)) +def logIfcfgFiles(message=""): devprops = isys.getDeviceProperties(dev=None) for device in devprops: path = "%s/ifcfg-%s" % (netscriptsDir, device) - logIfcfgFile(path, "===== %s\n" % (path,)) + logIfcfgFile(path, message) class NetworkDevice(IfcfgFile): - def __init__(self, dir, iface, logfile='/tmp/ifcfg.log'): + def __init__(self, dir, iface): IfcfgFile.__init__(self, dir, iface) - self.logfile = logfile self.description = "" if iface.startswith('ctc'): self.info["TYPE"] = "CTC" @@ -218,8 +222,9 @@ class NetworkDevice(IfcfgFile): s = "" keys = self.info.keys() keys.sort() - keys.remove("DEVICE") - keys.insert(0, "DEVICE") + if ("DEVICE" in keys): + keys.remove("DEVICE") + keys.insert(0, "DEVICE") if iutil.isS390() and ("HWADDR" in keys): keys.remove("HWADDR") # make sure we include autoneg in the ethtool line @@ -234,23 +239,39 @@ class NetworkDevice(IfcfgFile): return s + def loadIfcfgFile(self): + ifcfglog.debug("%s:\n%s" % (self.path, self.fileContent())) + ifcfglog.debug("NetworkDevice %s:\n%s" % (self.iface, self.__str__())) + ifcfglog.debug("loadIfcfgFile %s from %s" % (self.iface, self.path)) + self.clear() IfcfgFile.read(self) - self.log("NetworkDevice read from %s\n" % self.path) self._dirty = False + ifcfglog.debug("NetworkDevice %s:\n%s" % (self.iface, self.__str__())) + def writeIfcfgFile(self): # Write out the file only if there is a key whose # value has been changed since last load of ifcfg file. + ifcfglog.debug("%s:\n%s" % (self.path, self.fileContent())) + ifcfglog.debug("NetworkDevice %s:\n%s" % (self.iface, self.__str__())) + ifcfglog.debug("writeIfcfgFile %s to %s%s" % (self.iface, self.path, + (self._dirty and "" or " not needed"))) + if self._dirty: IfcfgFile.write(self) - self.log("NetworkDevice written to %s\n" % self.path) self._dirty = False + # We can't read the file right now racing with ifcfg-rh update + #ifcfglog.debug("%s:\n%s" % (device.path, device.fileContent())) + def set(self, *args): # If we are changing value of a key set _dirty flag # informing that ifcfg file needs to be synced. + s = " ".join(["%s=%s" % key_val for key_val in args]) + ifcfglog.debug("NetworkDevice %s set: %s" % + (self.iface, s)) for (key, data) in args: if self.get(key) != data: break @@ -286,37 +307,11 @@ class NetworkDevice(IfcfgFile): raise shutil.move(newifcfg, keyfile) - - def log(self, header="\n"): - lf = open(self.logfile, 'a') - lf.write(header) - lf.close() - self.log_file() - self.log_write_file() - self.log_values() - - def log_values(self, header="\n"): - lf = open(self.logfile, 'a') - lf.write(header) - lf.write("== values for file %s\n" % self.path) - lf.write(IfcfgFile.__str__(self)) - lf.close() - - def log_write_file(self, header="\n"): - lf = open(self.logfile, 'a') - lf.write(header) - lf.write("== file to be written for %s\n" % self.path) - lf.write(self.__str__()) - lf.close() - - def log_file(self, header="\n"): + def fileContent(self): f = open(self.path, 'r') - lf = open(self.logfile, 'a') - lf.write(header) - lf.write("== file %s\n" % self.path) - lf.write(f.read()) - lf.close() + content = f.read() f.close() + return content def usedByFCoE(self, anaconda): import storage @@ -365,6 +360,8 @@ class Network: def update(self): + ifcfglog.debug("Network.update() called") + self.netdevices = {} self.ksdevice = None self.domains = [] @@ -372,7 +369,7 @@ class Network: # populate self.netdevices devhash = isys.getDeviceProperties(dev=None) for iface in devhash.keys(): - device = NetworkDevice(netscriptsDir, iface, logfile=ifcfgLogFile) + device = NetworkDevice(netscriptsDir, iface) if os.access(device.path, os.R_OK): device.loadIfcfgFile() else: @@ -637,6 +634,8 @@ class Network: def write(self): + ifcfglog.debug("Network.write() called") + devices = self.netdevices.values() if len(devices) == 0: -- 1.7.2

3 8

[PATCH f14-branch master] Use mount alone to mount potential iso images.
by Brian C. Lane 03 Sep '10

03 Sep '10

Also added some debugging output. losetup isn't needed anymore. mount figures out how to mount the iso on its own. This prevents any race conditions between lo operations and mount/umount operations. --- pyanaconda/image.py | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index 60f03aa..1a82013 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -37,19 +37,16 @@ def findIsoImages(path, messageWindow): for file in files: what = path + '/' + file + log.debug("Checking %s" % (what)) if not isys.isIsoImage(what): continue try: - isys.losetup("/dev/loop2", what, readOnly = 1) - except SystemError: - continue - - try: - isys.mount("/dev/loop2", "/mnt/cdimage", fstype = "iso9660", - readOnly = True) + log.debug("mounting %s on /mnt/cdimage", what) + isys.mount(what, "/mnt/cdimage", fstype = "iso9660", readOnly = True) for num in range(1, 10): if os.access("/mnt/cdimage/.discinfo", os.R_OK): + log.debug("Reading .discinfo") f = open("/mnt/cdimage/.discinfo") try: f.readline() # skip timestamp @@ -62,6 +59,7 @@ def findIsoImages(path, messageWindow): f.close() + log.debug("discArch = %s | discNum = %s" % (discArch, discNum)) if num not in discNum or discArch != arch: continue @@ -94,13 +92,14 @@ def findIsoImages(path, messageWindow): sys.exit(0) discImages[num] = file + log.info("Found disc %d at %s" % (num, file)) + log.info("unmounting /mnt/cdimage") isys.umount("/mnt/cdimage", removeDir=False) except SystemError: pass - isys.unlosetup("/dev/loop2") - + log.info("Returning with %s" % (discImages)) return discImages def getDiscNums(line): @@ -178,8 +177,7 @@ def mountImage(isodir, tree, discnum, messageWindow, discImages={}): while True: try: isoImage = "%s/%s" % (isodir, discImages[discnum]) - isys.losetup("/dev/loop1", isoImage, readOnly = 1) - isys.mount("/dev/loop1", tree, fstype = 'iso9660', readOnly = True) + isys.mount(isoImage, tree, fstype = 'iso9660', readOnly = True) break except: ans = messageWindow(_("Missing ISO 9660 Image"), -- 1.7.2.2

3 10

slow yum depsolve
by Curtis Doty 30 Aug '10

30 Aug '10

Attempting to kickstart from the latest yum f13 everthing+updates repositories on an i7 system with a gazillion cores. But anaconda takes almost 5 minutes depsolving in the postselection step, even though a small set of packages are selected. It appears to be pegging only one cpu/core while the others all sit idle. Are there any plans/ways to speed this up? All the other steps just keep getting faster and faster. Especially when doing minimal install over gigabit. But the yum depsolve step seems to be getting slower. ../C

3 5

[f14-branch 1/2] memory: check_memory() displays GUI dialog on livecd (#624534).
by Ales Kozumplik 30 Aug '10

30 Aug '10

Because currently this would only happen during the graphical-mode-memory-check. While at it I changed the text composing in check_memory() so the strings are translatable. --- anaconda | 75 +++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 30 deletions(-) diff --git a/anaconda b/anaconda index e369d64..28bbada 100755 --- a/anaconda +++ b/anaconda @@ -314,57 +314,72 @@ def runVNC(): sys.stdin.readline() iutil.execConsole() +def gtk_warning(title, reason): + import gtk + dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, + buttons = gtk.BUTTONS_CLOSE, + message_format=reason) + dialog.set_title(title) + dialog.run() + sys.exit(1) + def check_memory(anaconda, opts, display_mode=None): + reason_strict = _('You do not have enough RAM to install %s ' + 'on this machine.\n' % product.productName) + reason_method = _('You do not have enough RAM to install %s ' + 'on this machine using this install method.\n' % + product.productName) + reason_graphical = _('You do not have enough RAM to use the graphical ' + 'installer.') + reboot_extra = _('\n' + 'Press <return> to reboot your system.\n') + livecd_title = _("Not enough RAM") + livecd_extra =_(" Try the text mode installer by running:\n\n" + "'/usr/bin/liveinst -T'\n\n from a root " + "terminal.") + nolivecd_extra = _(" Starting text mode.") if not display_mode: display_mode = anaconda.displayMode extra_ram = 0 - reason = '' + reason = reason_strict if opts.stage2 and opts.stage2.startswith(('http', 'ftp', '@')): extra_ram += isys.URL_INSTALL_EXTRA_RAM - reason = " using this install method" + reason = reason_method total_ram = isys.total_memory() - needed_ram = isys.MIN_RAM + extra_ram + if needed_ram > total_ram: from snack import SnackScreen, ButtonChoiceWindow - screen = SnackScreen() - ButtonChoiceWindow(screen, _('Fatal Error'), - _('You do not have enough RAM to install %s ' - 'on this machine%s.\n' - '\n' - 'Press <return> to reboot your system.\n') - %(product.productName, reason), - buttons = (_("OK"),)) - screen.finish() - sys.exit(0) + if opts.liveinst: + stdoutLog.warning(reason) + gtk_warning(livecd_title, reason) + else: + reason += reboot_extra + screen = SnackScreen() + ButtonChoiceWindow(screen, _('Fatal Error'), + reason, + buttons = (_("OK"),)) + screen.finish() + sys.exit(1) # override display mode if machine cannot nicely run X if display_mode not in ('t', 'c') and not flags.usevnc: needed_ram += isys.GUI_INSTALL_EXTRA_RAM + reason = reason_graphical if needed_ram > total_ram: - complain = _("You do not have enough RAM to use the graphical " - "installer.") - if flags.livecdInstall: - stdoutLog.warning(complain) - recommendation = _("Try the text mode installer by running:\n\n" - "'/usr/bin/liveinst -T'\n\n from a root " - "terminal.") - title = _("Not enough RAM") - text = "%s %s" %(complain, recommendation) - import gtk - dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, - buttons = gtk.BUTTONS_CLOSE, - message_format=text) - dialog.set_title(title) - dialog.run() + if opts.liveinst: + reason += livecd_extra + stdoutLog.warning(reason) + title = livecd_title + gtk_warning(title, reason) sys.exit(1) else: - resolution = _("Starting text mode.") - stdoutLog.warning("%s %s" % (complain, resolution)) + reason += nolivecd_extra + stdoutLog.warning(reason) anaconda.displayMode = 't' time.sleep(2) -- 1.7.1.1

2 3

[f13-branch] i18n: do not build translatable sentences from parts (#622545).
by Ales Kozumplik 30 Aug '10

30 Aug '10

It doesn't necessarily work for all languages. --- loader/loader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 3c97f9e..d412cbc 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1202,9 +1202,10 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, /* make sure they have enough ram */ static void checkForRam(int install_method) { - const char *reason_no = ""; - const char *reason_method = " using this install method"; - const char *reason = reason_no; + char *reason_none = _("You do not have enough RAM to install %s on this machine."); + char *reason_method = _("You do not have enough RAM to install %s on this machine using this install method."); + + char* reason = reason_none; int needed = MIN_RAM; if (install_method == METHOD_URL) { @@ -1214,9 +1215,7 @@ static void checkForRam(int install_method) { if (totalMemory() < needed) { char *buf; - - checked_asprintf(&buf, _("You do not have enough RAM to install %s " - "on this machine%s."), getProductName(), reason); + checked_asprintf(&buf, reason, getProductName()); startNewt(); newtWinMessage(_("Error"), _("OK"), buf); -- 1.7.1.1

2 2

[PATCH 1/4] Remove the DRI modules from the initrd.
by Chris Lumens 27 Aug '10

27 Aug '10

This saves about 30 MB of uncompressed space. --- scripts/upd-instroot | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 7a958e4..9c6ede5 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -185,7 +185,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda lohit-kashmiri-fonts lohit-kannada-fonts lohit-maithili-fonts lohit-marathi-fonts lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts lohit-telugu-fonts lsof lvm2 madan-fonts mdadm - mesa-dri-drivers metacity module-init-tools ncurses neon net-tools + metacity module-init-tools ncurses neon net-tools newt newt-python nfs-utils nspr nss nss-softokn ntfs-3g openldap openssh openssh-server pam pango parted pciutils pcre psmisc @@ -500,7 +500,6 @@ sbin/xfsrestore sbin/ybin usr/include/python?.?/pyconfig*.h usr/$LIBDIR/NetworkManager -usr/$LIBDIR/dri usr/$LIBDIR/gconv usr/$LIBDIR/gdk-pixbuf/loaders/*la* usr/$LIBDIR/gdk-pixbuf/loaders/*png* -- 1.7.1.1

3 5

[PATCH master f14-branch 1/2] Adding output to method selection process
by Brian C. Lane 27 Aug '10

27 Aug '10

--- loader/method.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/loader/method.c b/loader/method.c index 5b4f504..b4caba9 100644 --- a/loader/method.c +++ b/loader/method.c @@ -524,6 +524,8 @@ int getFileFromBlockDevice(char *device, char *path, char * dest) { } void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { + logMessage(INFO, "Setting stage2 from %s", arg); + if (!strncmp(arg, "nfs:", 4)) { ld->method = METHOD_NFS; ld->stage2Data = calloc(sizeof(struct nfsInstallData), 1); @@ -533,6 +535,12 @@ void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { &(((struct nfsInstallData *)ld->stage2Data)->directory), &(((struct nfsInstallData *)ld->stage2Data)->mountOpts)); stripTrailingSlash(((struct nfsInstallData *)ld->stage2Data)->directory); + + logMessage(INFO, "method nfs - %s / %s / %s", + (((struct nfsInstallData *)ld->stage2Data)->host), + (((struct nfsInstallData *)ld->stage2Data)->directory), + (((struct nfsInstallData *)ld->stage2Data)->mountOpts) + ); } else if (!strncmp(arg, "nfsiso:", 7)) { ld->method = METHOD_NFS; ld->stage2Data = calloc(sizeof(struct nfsInstallData), 1); @@ -541,30 +549,45 @@ void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { &(((struct nfsInstallData *)ld->stage2Data)->host), &(((struct nfsInstallData *)ld->stage2Data)->directory), &(((struct nfsInstallData *)ld->stage2Data)->mountOpts)); + + logMessage(INFO, "method nfsiso - %s / %s / %s", + (((struct nfsInstallData *)ld->stage2Data)->host), + (((struct nfsInstallData *)ld->stage2Data)->directory), + (((struct nfsInstallData *)ld->stage2Data)->mountOpts) + ); } else if (!strncmp(arg, "ftp:", 4) || !strncmp(arg, "http", 4)) { ld->method = METHOD_URL; ld->stage2Data = calloc(sizeof(urlInstallData), 1); ((urlInstallData *)ld->stage2Data)->url = strdup(arg); + + logMessage(INFO, "method url - %s", ((urlInstallData *)ld->stage2Data)->url); } else if (!strncmp(arg, "cdrom:", 6)) { ld->method = METHOD_CDROM; + + logMessage(INFO, "method cdrom"); } else if (!strncmp(arg, "harddrive:", 10) || !strncmp(arg, "hd:", 3)) { size_t offset; - arg += strcspn(arg, ":"); - if (!*arg || !*(arg+1)) - return; - arg += 1; + arg += strcspn(arg, ":"); + if (!*arg || !*(arg+1)) + return; + arg += 1; offset = strcspn(arg, ":"); ld->method = METHOD_HD; ld->stage2Data = calloc(sizeof(struct hdInstallData), 1); ((struct hdInstallData *)ld->stage2Data)->partition = strndup(arg, offset); - arg += offset; - if (*arg && *(arg+1)) + arg += offset; + if (*arg && *(arg+1)) ((struct hdInstallData *)ld->stage2Data)->directory = strdup(arg+1); else ((struct hdInstallData *)ld->stage2Data)->directory = NULL; + + logMessage(INFO, "method hd - %s / %s", + ((struct hdInstallData *)ld->stage2Data)->partition, + ((struct hdInstallData *)ld->stage2Data)->directory + ); } } -- 1.7.2.2

2 2

[PATCH f14-branch master] Various upd-instroot cleanups, most importantly for firstaidkit (#627758).
by Chris Lumens 27 Aug '10

27 Aug '10

* Don't put slashes after firstaidkit paths as find doesn't like that. * kernel-wrapper is ppc-specific, so conditionalize its inclusion. * rpmpopt is always in /usr/lib/rpm. * Include kacst font packages and fix font names. * No subdirectories under PYTHONPATH ever need to be mentioned. --- scripts/upd-instroot | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 3a28b26..bb79c0a 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -170,7 +170,8 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf gnome-themes gobject-introspection gpm grep gtk2 gtk2-engines hdparm hwdata initscripts iproute iputils iscsi-initiator-utils - jfsutils kbd kpartx keyutils-libs krb5-libs libICE libSM libX11 libXau + jfsutils kbd kacst-farsi-fonts kacst-qurn-fonts kpartx keyutils-libs + krb5-libs libICE libSM libX11 libXau libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft libXi libXinerama libXmu libXpm libXrandr libXrender libXt libXtst libXxf86misc libacl libaio libart_lgpl libattr @@ -511,18 +512,13 @@ usr/$LIBDIR/gtk-2.0/*/loaders/*la* usr/$LIBDIR/gtk-2.0/*/loaders/*png* usr/$LIBDIR/gtk-2.0/*/loaders/*xpm* usr/$LIBDIR/gtk-2.0/immodules -usr/$LIBDIR/kernel-wrapper/* usr/$LIBDIR/libuser/* usr/$LIBDIR/pango usr/$LIBDIR/python?.? -usr/$LIBDIR/rpm/rpmpopt -usr/lib/rpm/rpmrc -usr/lib/rpm/macros usr/$LIBDIR/libiscsi.so* usr/$LIBDIR/libmetacity-private.so* usr/$LIBDIR/libsqlite3.so* usr/$LIBDIR/xorg/modules -usr/$LIBDIR/xserver/SecurityPolicy usr/$LIBDIR/libfreebl3.so usr/$LIBDIR/libfreebl3.chk usr/$LIBDIR/libnss3.so @@ -596,7 +592,6 @@ usr/$LIBDIR/anaconda usr/lib/kernel-wrapper usr/lib/locale usr/lib/python?.? -usr/lib/python?.?/site-packages/epdb/*.py usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc @@ -665,7 +660,7 @@ usr/share/fonts/dejavu/DejaVuSans-Bold.ttf usr/share/fonts/dejavu/DejaVuSans.ttf usr/share/fonts/dejavu/DejaVuSansMono.ttf usr/share/fonts/kacst/KacstFarsi.ttf -usr/share/fonts/kacst/KacstQura.ttf +usr/share/fonts/kacst/KacstQurn.ttf usr/share/fonts/madan/Madan.ttf usr/share/fonts/un-core/UnDotum.ttf usr/share/fonts/*/VL-Gothic-Regular.ttf @@ -720,6 +715,12 @@ var/lib/lldpad var/run/dbus EOF +if [ $ARCH = ppc -o $ARCH = ppc64 ]; then + cat >> $KEEPFILE <<EOF +usr/$LIBDIR/kernel-wrapper/* +EOF +fi + if [ $ARCH = s390 -o $ARCH = s390x ]; then cat >> $KEEPFILE <<EOF bin/basename @@ -801,10 +802,6 @@ usr/libexec/at-spi-registryd usr/$LIBDIR/bonobo/servers usr/libexec/gconfd-2 usr/$LIBDIR/GConf/2/libgconfbackend-xml.so -usr/$LIBDIR/python?.?/site-packages/gtk-2.0/atk.so -usr/$LIBDIR/python?.?/site-packages/gtk-2.0/gconf.so -usr/$LIBDIR/python?.?/site-packages/atspi.so -usr/lib/python?.?/site-packages/dogtail/*.py EOF # @@ -913,8 +910,7 @@ usr/sbin/ntfsundelete usr/sbin/mtr usr/sbin/smartctl usr/sbin/traceroute -usr/$LIBDIR/firstaidkit/plugins/ -usr/lib/python?.?/site-packages/pyfirstaidkit/ +usr/$LIBDIR/firstaidkit/plugins/* usr/bin/whiptail usr/bin/firstaidkit-qs EOF -- 1.7.1.1

1 0

[PATCH f14-branch master] systemd symlinks now reside in /lib (#627401).
by Chris Lumens 26 Aug '10

26 Aug '10

--- pyanaconda/desktop.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyanaconda/desktop.py b/pyanaconda/desktop.py index 306e481..ed506d6 100644 --- a/pyanaconda/desktop.py +++ b/pyanaconda/desktop.py @@ -65,13 +65,13 @@ class Desktop (SimpleConfigFile): inittab.write (line) inittab.close () - if not os.path.isdir(instPath + '/etc/systemd/system'): - log.warning("there is no /etc/systemd/system directory, cannot update default.target!") + if not os.path.isdir(instPath + '/lib/systemd/system'): + log.warning("there is no /lib/systemd/system directory, cannot update default.target!") return - default_target = instPath + '/etc/systemd/system/default.target' + default_target = instPath + '/lib/systemd/system/default.target' if os.path.islink(default_target): os.unlink(default_target) - os.symlink('/etc/systemd/system/runlevel' + str(self.runlevel) + '.target', default_target) + os.symlink('/lib/systemd/system/runlevel' + str(self.runlevel) + '.target', default_target) if self.getDefaultDesktop(): f = open(instPath + "/etc/sysconfig/desktop", "w") -- 1.7.1.1

2 1

futher adventures in initrd shrinking
by Chris Lumens 26 Aug '10

26 Aug '10

I may have gotten this idea from someone else, so my apologies if it looks like I'm presenting it as my own. Just speak up and you'll get the glory and adulation of the tens that are reading this list. As you may know, I am working on converting us from an initrd+install.img to one giant initrd containing everything from both. My baseline of just shoving everything into one image was 172 MB compressed. This is pretty big - it increases memory requirements and causes a variety of weird lags in bootup. For just one data point, a VM here refused to boot the boot.iso with anything less than 1 GB of memory. After some strategic removals as outlined in a previous mail, I reduced this image to 131 MB compressed, 386 MB uncompressed. This is much better and is quite a bit smaller than what we have today. It reduced my boot.iso memory requirements to 560 MB. However, it's still not close to what I want. My goal is a 100 MB compressed initrd. So it's time to think a little more drastically. Here it is: What if we kicked all translations out of the initrd? This further reduces the initrd to 114 MB compressed, 329 MB uncompressed. Check out all those memory savings, plus think about how much faster downloads will go if doing pxeboot. As an English speaker, I can't see how anyone would disapprove of this plan. No? Not my best idea ever? Well, I'm not advocating removing translation support from anaconda. I just want to move it. What if instead of building in every single translation to one giant file that everyone has to download, we moved each language into its own specific support image file? This file would basically be another cpio archive containing /usr/share/locale/<lang>, perhaps plus some other files as they turn up. These would be stored in a known location given by .treeinfo, perhaps in a directory within images/. Then in loader when you select your language, the proper support image is fetched, mounted, and away we go. For people using boot.iso or the DVD, there would be no downloading - this would all just be mounted silently in the background. For pxebooting, it would mean downloading a separate file, but it would only be the one smaller, specific one so it should save time and bandwidth. It may sound like this is violating my principle that we should move everything needed for installation into one single image to be downloaded, but I don't think so. I think once I get all the horrible method-specific poking, transferring, and mounting code ripped out, adding support for transferring and mounting one single image should be pretty straightforward. Thoughts? - Chris

5 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel August 2010