Anaconda-devel March 2011

anaconda-devel@lists.stg.fedoraproject.org

22 participants
107 discussions

"btrsquash" images (dracut dmsquash-live + btrfs-in-squashfs runtime)
by Will Woods 06 Apr '11

06 Apr '11

Hey all, Here's a first attempt at the "compressed anaconda runtime" patch I've been messing with for a while now. Consider it a Request For Comment, or a simple Proof-of-Concept patch. src/pylorax/__init__.py | 11 +++- src/pylorax/constants.py | 2 + src/pylorax/installtree.py | 133 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 133 insertions(+), 13 deletions(-) The problem I was trying to solve is this: our initrd.img is ~360MB uncompressed in RAM. This means we can no longer boot and run on systems with 512MB RAM; see bug 682555 (and its various duplicates) for example reports. Idea #1: Let's use squashfs! The main problem with this is that squashfs is read-only, and anaconda (specifically loader) will crash and burn if it can't write to various parts of its root filesystem - /etc, /var, /tmp, and possibly others. (We could probably fix this with some effort - especially once we've gotten rid of anaconda-init and loader - but I needed a low-effort proof of concept first.) Idea #2: Our Live images are compressed with squashfs, and they use a device-mapper overlay to make themselves read-write - so let's do that! This is basically what the patch does: it builds the anaconda runtime image into something very similar to the Live image, and uses the same dracut startup scripts as the Live images to get itself set up and running. Here's how the btrsquash initrd build process works: - populate installtree as usual - chroot into install tree and create dracut initramfs - clean installtree as usual (note: this removes dracut) - [other normal lorax steps...] - create initrd - create empty btrfs image "LiveOS/rootfs.img" and mount it - copy installtree into rootfs - unmount rootfs - make squashfs.img with "LiveOS/rootfs.img" inside - place squashfs.img in a cpio archive with "/etc/cmdline" - /etc/cmdline tells dracut where to find squashfs.img - concatenate dracut initramfs and squashfs.cpio As noted in the bug report, this does require some changes to anaconda and dracut. The relevant changes are: anaconda: dac6c6ec 6f4a1a3b (should be in anaconda-16.2 or 16.3) dracut: up to fe17f4e8 (should be in dracut-009) I've tested the resulting images in KVM - systems with 512MB RAM happily boot, run and install. See the following screenshot, taken just after the betanag screen in anaconda: http://wwoods.fedorapeople.org/screenshots/btrsquash/btrsquash-dracut.png There are a couple of known problems: first, the dracut initramfs will only contain the modules for one kernel - we need to run dracut once for each kernel and merge all the images together. Second, the resulting image is ~132MB, which is still too big for PPC netboot. Finally, I'm not sure how this will affect driver disks or updates images or other weird things that might involve writing to the initramfs. Keep in mind that the image is actually two parts again - initramfs and squashfs. If we keep those parts separate, PPC users could use dracut's networking stuff to fetch the runtime image. We can also save RAM on media installs (and boot.iso and USB-based installs) by leaving the squashfs image on the media. And for every other case, we can just use the concatenated Big Image like are now. So there we have it. Feedback welcomed. If we come up with a good plan for how to handle compressed images in the future I'll try to port this to lorax master. Oh, one last thing - I have some scripts to convert current, existing images into working btrsquash-style images. I might put those somewhere public if people are interested, but they're pretty hacky.. -w

4 6

[PATCH] use Transifex for translations, remove po/*.po
by David Cantrell 01 Apr '11

01 Apr '11

Patches are here: http://dcantrel.fedorapeople.org/anaconda/transifex/master/ I recommend reading the transifex.txt file as well, which will be added to the git repo as docs/transifex.txt. Everyone will need a transifex.net account if you intend on making releases. I've done several test releases locally and everything works, though tx pull is incredibly slow for me (I'm on a Clear wimax connection). There may also be some more fixups to Makefile.am to come later, but the basic workflow is there. I am not a tx expert, but I may be able to answer basic questions if you have them. I'll wait for an ack or two before I push these to master. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

4 5

[rhel6-branch] two small patches
by David Cantrell 31 Mar '11

31 Mar '11

The dracut-fips one is required for FIPS certification stuff. The yaboot timeout one is mostly to help out the QA guys a little. I've cloned the bug to a yaboot bug for a future update release. Both applicable to master as well. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

2 4

[PATCH] unicode-linedraw-chars.txt is no longer useful.
by Chris Lumens 31 Mar '11

31 Mar '11

--- loader/Makefile.am | 1 - loader/unicode-linedraw-chars.txt | 22 ---------------------- 2 files changed, 0 insertions(+), 23 deletions(-) delete mode 100644 loader/unicode-linedraw-chars.txt diff --git a/loader/Makefile.am b/loader/Makefile.am index ebcc5f7..6ec4604 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -22,7 +22,6 @@ shareddir = $(datadir)/$(PACKAGE_NAME) boot_PROGRAMS = loader shared_DATA = loader.tr -dist_shared_DATA = unicode-linedraw-chars.txt noinst_PROGRAMS = dirbrowser noinst_HEADERS = *.h diff --git a/loader/unicode-linedraw-chars.txt b/loader/unicode-linedraw-chars.txt deleted file mode 100644 index c1a4814..0000000 --- a/loader/unicode-linedraw-chars.txt +++ /dev/null @@ -1,22 +0,0 @@ -─ -│ -┌ -┐ -└ -┘ -┤ -├ -┴ -┬ -┼ -▒ -◆ -° -± -· -← -→ -↓ -↑ -▒ -▮ -- 1.7.4.1

2 1

[PATCH] mkctype is no longer useful.
by Chris Lumens 31 Mar '11

31 Mar '11

--- loader/.gitignore | 2 - loader/Makefile.am | 15 +--------- loader/mkctype.c | 76 ---------------------------------------------------- 3 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 loader/mkctype.c diff --git a/loader/.gitignore b/loader/.gitignore index 021a962..c894638 100644 --- a/loader/.gitignore +++ b/loader/.gitignore @@ -1,5 +1,3 @@ -ctype.c -mkctype loader init debug.log diff --git a/loader/Makefile.am b/loader/Makefile.am index dc6f5fe..ebcc5f7 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -23,8 +23,7 @@ shareddir = $(datadir)/$(PACKAGE_NAME) boot_PROGRAMS = loader shared_DATA = loader.tr dist_shared_DATA = unicode-linedraw-chars.txt -noinst_PROGRAMS = mkctype dirbrowser -noinst_DATA = ctype.c +noinst_PROGRAMS = dirbrowser noinst_HEADERS = *.h if IS_S390 @@ -65,16 +64,13 @@ init_SOURCES = init.c undomounts.c shutdown.c copy.c modules.c \ shutdown_CFLAGS = $(COMMON_CFLAGS) -DAS_SHUTDOWN=1 shutdown_SOURCES = shutdown.c undomounts.c -mkctype_CFLAGS = $(COMMON_CFLAGS) -mkctype_SOURCES = mkctype.c - dirbrowser_CFLAGS = $(COMMON_CFLAGS) -DSTANDALONE dirbrowser_LDADD = $(NEWT_LIBS) dirbrowser_SOURCES = dirbrowser.c EXTRA_DIST = simplemot keymaps-* -CLEANFILES = keymaps-override-$(ARCH) ctype.c tr/*.tr +CLEANFILES = keymaps-override-$(ARCH) tr/*.tr MAINTAINERCLEANFILES = Makefile.in @@ -86,10 +82,6 @@ cp_verbose = $(cp_verbose_$(V)) cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) cp_verbose_0 = @echo " CP "$@; -mkctype_verbose = $(mkctype_verbose_$(V)) -mkctype_verbose_ = $(mkctype_verbose_$(AM_DEFAULT_VERBOSITY)) -mkctype_verbose_0 = @echo " MAKE "$@; - msgmerge_verbose = $(msgmerge_verbose_$(V)) msgmerge_verbose_ = $(msgmerge_verbose_$(AM_DEFAULT_VERBOSITY)) msgmerge_verbose_0 = echo " MERGE "$${lang}.po; @@ -101,9 +93,6 @@ xgettext_verbose_0 = @echo " GETTXT "$@; keymaps-override-$(ARCH): keymaps-$(ARCH) $(cp_verbose)cp -p $< $@ -ctype.c: mkctype - $(mkctype_verbose)./mkctype > ctype.c - loader.tr: $(top_srcdir)/data/lang-table loader.po @LANGS="`cut -f 2 $(top_srcdir)/data/lang-table | egrep -v '(^en$$)'`" ; \ if [ ! -d tr ]; then \ diff --git a/loader/mkctype.c b/loader/mkctype.c deleted file mode 100644 index 12eaba0..0000000 --- a/loader/mkctype.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * mkctype.c - * - * Copyright (C) 2007 Red Hat, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <ctype.h> -#include <stdio.h> - -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) -# define __ctype_b (*__ctype_b_loc()) -# define __ctype_tolower (*__ctype_tolower_loc()) -# define __ctype_toupper (*__ctype_toupper_loc()) -#endif - -int main(int argc, char ** argv) { - int i; - - printf("#include <sys/types.h>\n\n"); - - printf("static const unsigned short int __ctype_b_internal[] = {"); - - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_b[i]); - } - - printf("\n};\n\n"); - printf("const unsigned short int * __ctype_b = __ctype_b_internal + 128;\n\n"); - - printf("const int __ctype_toupper_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_toupper[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_toupper = __ctype_toupper_internal + 128;\n\n"); - - printf("const int __ctype_tolower_internal[] = {"); - for (i = -128; i < 256; i++) { - if (!(i % 8)) { - printf("\n"); - } - - printf("\t0x%x,", __ctype_tolower[i]); - } - - printf("\n};\n\n"); - printf("const int * __ctype_tolower = __ctype_tolower_internal + 128;\n\n"); - - printf ("const unsigned short int **__ctype_b_loc (void) { return &__ctype_b; }\n"); - printf ("const int **__ctype_toupper_loc (void) { return &__ctype_toupper; }\n"); - printf ("const int **__ctype_tolower_loc (void) { return &__ctype_tolower; }\n\n"); - - return 0; -}; -- 1.7.4.1

2 1

Add gpgkeys section to .treeinfo?
by Kay Williams 31 Mar '11

31 Mar '11

What would folks think of adding a [gpgkeys] section to the .treeinfo file? This could provide a general mechanism for anaconda to determine which keys to install by default (reference https://bugzilla.redhat.com/show_bug.cgi?id=253897) It could also be used by down-stream utilities (e.g. a yum plugin) for keeping clients up-to-date with gpgkey changes to the base distribution (not terribly common in rhel and fedora distribution, but moreso in custom spins). Comments?

3 5

[PATCH master f15-branch] crypttab should not be work-readable (#692254).
by Chris Lumens 31 Mar '11

31 Mar '11

--- pyanaconda/storage/__init__.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 472627c..90bc2b0 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -2239,6 +2239,7 @@ class FSSet(object): crypttab_path = os.path.normpath("%s/etc/crypttab" % instPath) crypttab = self.crypttab() open(crypttab_path, "w").write(crypttab) + os.chmod(crypttab_path, 0600) # /etc/mdadm.conf mdadm_path = os.path.normpath("%s/etc/mdadm.conf" % instPath) -- 1.7.4.1

2 2

[rhel5-branch] Add busybox to initrd (#500527)
by Martin Gracik 31 Mar '11

31 Mar '11

--- scripts/mk-images | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 99d861c..a61b930 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -449,25 +449,7 @@ EOF cp -f $IMGPATH/usr/sbin/sshd $MBD_DIR/sbin/sshd cp -f $IMGPATH/usr/sbin/xinetd $MBD_DIR/sbin/xinetd cp -f $IMGPATH/usr/sbin/in.telnetd $MBD_DIR/sbin/in.telnetd - cp -f $IMGPATH/usr/bin/bash $MBD_DIR/sbin/bash cp -f $IMGPATH/usr/bin/ipcalc $MBD_DIR/sbin/ipcalc - cp -f $IMGPATH/usr/bin/busybox $MBD_DIR/sbin/busybox - - # make some symlinks - ln -sf bash $MBD_DIR/sbin/sh - (cd $MBD_DIR/sbin; - set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//'); - while [ -n "$1" ]; do - if [ $1 != "busybox" -a $1 != "sh" ]; then - # if file doesnt already exist, link to busybox - if [ ! -f "$1" ]; then - ln -sf ./busybox $1 - else - [ -n "$DEBUG" ] && echo "Overriding busybox version of $1" - fi - fi - shift - done ) # and copy libraries too mkdir -p $MBD_DIR/$LIBDIR $MBD_DIR/lib @@ -533,6 +515,26 @@ EOF done } +addBusyBox() { + cp -f $IMGPATH/usr/bin/bash $MBD_DIR/sbin/bash + cp -f $IMGPATH/usr/bin/busybox $MBD_DIR/sbin/busybox + + # make some symlinks + ln -sf bash $MBD_DIR/sbin/sh + (cd $MBD_DIR/sbin; + set $(./busybox 2>&1 | awk '/^\t([[:alnum:]_\.\[]+,)+/' | sed 's/,//g' | sed 's/ +//'); + while [ -n "$1" ]; do + if [ $1 != "busybox" -a $1 != "sh" ]; then + if [ ! -f "$1" ]; then + ln -sf ./busybox $1 + else + [ -n "$DEBUG" ] && echo "Overriding busybox version of $1" + fi + fi + shift + done) +} + makeinitrd() { EXTRAINITRDPATH="" INITRDSIZE="" @@ -677,6 +679,8 @@ EOF setupShellEnvironment fi + addBusyBox + cat > $MBD_DIR/.profile <<EOF PATH=/bin:/usr/bin:/usr/sbin:/mnt/sysimage/sbin:/mnt/sysimage/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin export PATH -- 1.7.3.2

2 1

Set color for text mode installation
by Vijay N. Majagaonkar 30 Mar '11

30 Mar '11

I am sorry, I did not got link to reply on the same thread .... https://www.redhat.com/archives/anaconda-devel-list/2011-March/msg00129.html <https://www.redhat.com/archives/anaconda-devel-list/2011-March/msg00129.html>Sorry again for late reply, this issue has been fixed and problem was with Library we were missing some library at the time of building ISO (creating initrd and stage2 images) Hope this will help someone... and just update on setColor method is available in python 2.7 or later version.... "Human Knowledge Belongs To World" Vijay.

1 0

[rhel5-branch] write OPTIONS for s390x netdevs on all methods
by David Cantrell 30 Mar '11

30 Mar '11

This platform again. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2011