anaconda-patches September 2013

anaconda-patches@lists.fedorahosted.org

17 participants
168 discussions

livecd-iso-to-disk label patch
by Helio Chissini de Castro 17 Sep '13

17 Sep '13

Here's a small patch to handle a feature introduced on anaconda. Anaconda options inst.ks allows to create a inst.ks:LABEL=<SOME> to pass custom kickstart files, and more specific, if you want create an grub menu with multiple kickstarts, it allows you to do inst.ks:LABEL=<SOME>:/custom.cfg This patch allows to override the fixed LIVE label if you want some custom name. It fix the regexp that befores glob the entire line after LABEL=, and then overriding all entries that comes after : ex.: Original isolinux.cfg inst.ks:LABEL=SOME:/media/myks.cfg With current tool after subst: inst.ks:LABEL=LIVE After the patch inst.ks:LABEL=<SOME>:/media/myks.cfg Thanks in advance

2 1

[PATCH pylorax] livemedia-creator: add file system manifest creation option for --make-iso builds
by Joey Boggs 17 Sep '13

17 Sep '13

This add a fine level of details about the created image including: - installed packages - source rpms used - licensing - dependencies - where disk space is used Signed-off-by: Joey Boggs <jboggs(a)redhat.com> --- src/pylorax/treebuilder.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++ src/sbin/livemedia-creator | 6 ++++ 2 files changed, 90 insertions(+) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 2e7c43e..0311118 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -29,6 +29,7 @@ from base import DataHolder from ltmpl import LoraxTemplateRunner import imgutils from pylorax.executils import runcmd, runcmd_output +from subprocess import Popen, PIPE, STDOUT templatemap = { 'i386': 'x86.tmpl', @@ -184,6 +185,88 @@ class TreeBuilder(object): def kernels(self): return findkernels(root=self.vars.inroot) + def collect_manifest(self, cmd, output_file, sort=False): + output = runcmd_output(cmd, root=self.vars.inroot) + with open(os.path.join(self.manifest_path, output_file), "w") as f: + if sort: + output = output.split("\n") + for line in sorted(set(output),key=str.lower): + if line: + f.write("%s\n" % line) + else: + f.write(output) + + def create_manifests(self): + self.manifest_path = os.path.join(self.vars.outroot, "isolinux") + env = os.environ.copy() + env['LC_ALL'] = 'C' + os.makedirs(self.manifest_path) + # collect installed packages information + cmd = ["rpm", "-qa", "--qf", + "%{name}-%{version}-%{release}.%{arch} (%{SIGPGP:pgpsig})\n"] + self.collect_manifest(cmd, "manifest-rpm.txt", True) + + # collect source rpms + cmd = ["rpm", "-qa", "--qf", "%{sourcerpm}\n"] + self.collect_manifest(cmd, "manifest-srpm.txt", True) + + # collect all included licenses rhbz#601927 + cmd = ["rpm", "-qa", "--qf", "%{license}\n"] + self.collect_manifest(cmd, "manifest-license.txt", True) + + # get individial file sizes + cmd = ["du", "-akx", "--exclude=/var/cache/yum", "/"] + self.collect_manifest(cmd, "manifest-file.txt", True) + + # get directory sizes + cmd = ["du", "-x", "--exclude=/var/cache/yum", "/"] + self.collect_manifest(cmd, "manifest-dir.txt", True) + + # find orphaned files + file_list = [] + cmd = ["rpm", "-qa"] + installed_rpms = runcmd_output(cmd).strip() + + for pkg in installed_rpms.split("\n"): + cmd = ["rpm", "-ql", pkg] + pkg_files = runcmd_output(cmd).strip() + for f in pkg_files.split("\n"): + file_list.append("%s##%s" % (f, pkg)) + + cmd = ["find", "/", "-xdev"] + fs_list = runcmd_output(cmd).strip() + + for f in fs_list.split("\n"): + file_list.append("%s##Not owned by any package." % f) + + final_list = {} + + for item in file_list: + f, owner = item.split("##") + if not f in final_list: + final_list[f] = owner + + output_file = os.path.join(self.manifest_path, "manifest-owns.txt") + with open(output_file, "w") as t: + for x in final_list.keys(): + t.write("%s\n%s\n" % (x, final_list[x])) + + # get dependency list + cmd = ["rpm", "-qa"] + output = runcmd_output(cmd, root=self.vars.inroot) + piped_cmd = ["xargs", "-n1", "rpm", "-e", "--test"] + run_cmd = Popen(piped_cmd, stdout=PIPE, stdin=PIPE, stderr=PIPE) + stdout_data = run_cmd.communicate(input=output)[1] + deps_file = os.path.join(self.manifest_path, "manifest-deps.txt") + with open(deps_file, "w") as f: + f.write("%s\n" % stdout_data) + + # bzip large manufest files + for f in ["deps", "owns", "file", "dir" ]: + path = os.path.join(self.manifest_path, "manifest-%s.txt" % f) + cmd = ["bzip2", path] + runcmd(cmd) + def rebuild_initrds(self, add_args=[], backup="", prefix=""): '''Rebuild all the initrds in the tree. If backup is specified, each initrd will be renamed with backup as a suffix before rebuilding. @@ -269,6 +352,7 @@ def findkernels(root="/", kdir="boot"): r"(\.(?P<flavor>{0}))?)$".format("|".join(flavors))) kernels = [] bootfiles = os.listdir(joinpaths(root, kdir)) + for f in bootfiles: match = kre.match(f) if match: diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 9239445..61c4a5e 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -535,6 +535,9 @@ def make_livecd(opts, mount_dir, work_dir): log.info("dracut args = {0}".format(dracut_args)) tb.rebuild_initrds(add_args=dracut_args) log.info("Building boot.iso") + log.info("Generating Manifests") + if opts.create_manifests and opts.make_iso: + tb.create_manifests() tb.build() return work_dir @@ -814,6 +817,9 @@ if __name__ == '__main__': parser.add_argument( "--volid", default=None, help="volume id") parser.add_argument( "--squashfs_args", help="additional squashfs args" ) + parser.add_argument( "--create-manifests", action="store_true", + help="Create file system manifests of image", + default=False ) opts = parser.parse_args() -- 1.8.3.1

2 2

[PATCH] Fix Lightbox for compositing window managers (#1008446)
by David Shea 17 Sep '13

17 Sep '13

If the lightbox is running in a compositing window manager, use Gtk to set the color and opacity of the widget. Fallback to drawing the background ourselves if we are not composited. --- widgets/src/Lightbox.c | 126 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 86 insertions(+), 40 deletions(-) diff --git a/widgets/src/Lightbox.c b/widgets/src/Lightbox.c index 245deab..c399cca 100644 --- a/widgets/src/Lightbox.c +++ b/widgets/src/Lightbox.c @@ -33,6 +33,24 @@ * The lightbox window will show as soon as it is created. */ +/* + * We have two methods for drawing the transparent background, depending + * on whether we can use a compositing window manager for alpha blending + * or not. + * + * In a compositing window manager (e.g., gnome-shell on the livecd), we + * create the transparent background using Gtk by overriding the window's + * background color and setting an opacity. + * + * In a non-compositing window manager (e.g., metacity on the install DVD), + * we override Gtk's drawing of the widget entirely. We set paintable to + * false to indicate that theme information should not be applied, and then + * as the parent-window property is being set, we use cairo to paint a new + * surface using the parent's Gdk window as the source pattern, apply a 50% + * translucent fill to the surface, and then use this surface as the + * background for the lightbox's Gdk window. + */ + #include <cairo.h> #include <gtk/gtk.h> @@ -48,10 +66,12 @@ struct _AnacondaLightboxPrivate { GtkWindow *transient_parent; gboolean parent_configure_event_handler_set; guint parent_configure_event_handler; + + gboolean composited; }; static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void anaconda_lightbox_draw_background(GObject *gobject, GParamSpec *psec, gpointer user_data); +static void anaconda_lightbox_set_parent_window(GObject *gobject, GParamSpec *psec, gpointer user_data); static gboolean anaconda_lb_parent_configure_event(GtkWidget *parent, GdkEvent *event, gpointer lightbox); static gboolean anaconda_lb_configure_event(GtkWidget *lightbox, GdkEvent *event, gpointer user_data); @@ -96,10 +116,32 @@ static void anaconda_lightbox_init(AnacondaLightbox *lightbox) gtk_window_set_decorated(GTK_WINDOW(lightbox), FALSE); gtk_window_set_has_resize_grip(GTK_WINDOW(lightbox), FALSE); - /* Indicate we will handle drawing the widget so no theme is applied */ - gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); gtk_window_set_type_hint(GTK_WINDOW(lightbox), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + /* Decide now which background drawing method to use */ + lightbox->priv->composited = gtk_widget_is_composited(GTK_WIDGET(lightbox)); + if (lightbox->priv->composited) + { + GdkRGBA color = {0.0, 0.0, 0.0, 1.0}; /* opaque black */ + + /* Set the background to black */ + gtk_widget_override_background_color(GTK_WIDGET(lightbox), + GTK_STATE_FLAG_NORMAL, + &color + ); + + /* Set the opacity to 50% */ + gtk_widget_set_opacity(GTK_WIDGET(lightbox), 0.5); + } + else + { + /* + * Indicate we will handle drawing the widget, do the rest in + * anaconda_lightbox_set_parent_window + */ + gtk_widget_set_app_paintable(GTK_WIDGET(lightbox), TRUE); + } + /* handle restacking events */ g_signal_connect(lightbox, "configure-event", G_CALLBACK(anaconda_lb_configure_event), NULL); @@ -117,7 +159,7 @@ static void anaconda_lightbox_set_property(GObject *object, guint prop_id, const case PROP_PARENT_WINDOW: priv->transient_parent = GTK_WINDOW(g_object_ref(g_value_get_object(value))); /* The property is CONSTRUCT_ONLY, so no point calling notify */ - anaconda_lightbox_draw_background(object, pspec, NULL); + anaconda_lightbox_set_parent_window(object, pspec, NULL); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -181,7 +223,7 @@ static gboolean anaconda_lb_parent_configure_event( * Draw the window background. Uses the gobject notify handler signature * in case we want to allow parent-window to change in the future. */ -static void anaconda_lightbox_draw_background( +static void anaconda_lightbox_set_parent_window( GObject *gobject, GParamSpec *psec, gpointer user_data @@ -232,43 +274,47 @@ static void anaconda_lightbox_draw_background( G_CALLBACK(anaconda_lb_parent_configure_event), lightbox); lightbox->priv->parent_configure_event_handler_set = TRUE; - /* - * NB: We should probably be handling the draw signal in order to refresh - * the transparent pattern from the parent window whenver something - * changes, but by the time things get to the signal handler the surface is - * already set up and doesn't support alpha channels and replacing it - * doesn't seem to work quite right. Besides, none of these windows are - * supposed to move anyway. - */ - - /* Realize the window to initialize the Gdk objects */ - if (!gtk_widget_get_realized(GTK_WIDGET(lightbox))) + /* Handle the non-compositing background case */ + if (!lightbox->priv->composited) { - gtk_widget_realize(GTK_WIDGET(lightbox)); + /* + * NB: We should probably be handling the draw signal in order to refresh + * the transparent pattern from the parent window whenver something + * changes, but by the time things get to the signal handler the surface is + * already set up and doesn't support alpha channels and replacing it + * doesn't seem to work quite right. Besides, none of these windows are + * supposed to move anyway. + */ + + /* Realize the window to initialize the Gdk objects */ + if (!gtk_widget_get_realized(GTK_WIDGET(lightbox))) + { + gtk_widget_realize(GTK_WIDGET(lightbox)); + } + g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); + + /* Create a new surface that supports alpha content */ + surface = gdk_window_create_similar_surface(g_lightbox_window, + CAIRO_CONTENT_COLOR_ALPHA, + gdk_window_get_width(g_parent_window), + gdk_window_get_height(g_parent_window)); + cr = cairo_create(surface); + + /* Use the parent window as a pattern and paint it on the surface */ + gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); + cairo_paint(cr); + + /* Paint a black, 50% transparent shade */ + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); + cairo_paint(cr); + + cairo_destroy(cr); + + /* Use the surface we painted as the window background */ + pattern = cairo_pattern_create_for_surface(surface); + gdk_window_set_background_pattern(g_lightbox_window, pattern); + cairo_pattern_destroy(pattern); } - g_lightbox_window = gtk_widget_get_window(GTK_WIDGET(lightbox)); - - /* Create a new surface that supports alpha content */ - surface = gdk_window_create_similar_surface(g_lightbox_window, - CAIRO_CONTENT_COLOR_ALPHA, - gdk_window_get_width(g_parent_window), - gdk_window_get_height(g_parent_window)); - cr = cairo_create(surface); - - /* Use the parent window as a pattern and paint it on the surface */ - gdk_cairo_set_source_window(cr, g_parent_window, 0, 0); - cairo_paint(cr); - - /* Paint a black, 50% transparent shade */ - cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.5); - cairo_paint(cr); - - cairo_destroy(cr); - - /* Use the surface we painted as the window background */ - pattern = cairo_pattern_create_for_surface(surface); - gdk_window_set_background_pattern(g_lightbox_window, pattern); - cairo_pattern_destroy(pattern); } gtk_widget_show(GTK_WIDGET(lightbox)); -- 1.8.3.1

2 1

[lorax-rhel7 1/2] livemedia-creator: Fix gcdx64.efi path to work for other distros than Fedora (#1003078)
by Brian C. Lane 16 Sep '13

16 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- share/live/x86.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl index 8d31b8b..a640fee 100644 --- a/share/live/x86.tmpl +++ b/share/live/x86.tmpl @@ -49,7 +49,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} ## WHeeeeeeee, EFI. ## We could remove the basearch restriction someday.. <% efiargs=""; efigraft=""; efihybrid="" %> -%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386': +%if exists("boot/efi/EFI/*/gcdx64.efi") and basearch != 'i386': <% efiarch = 'X64' if basearch=='x86_64' else 'IA32' efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) -- 1.8.3.1

2 2

[lorax-rhel7] livemedia-creator: Update example kickstart for rhel7 (#922064)
by Brian C. Lane 16 Sep '13

16 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> Based on fedora live kickstart. Removes the ec2 example because RHEL7 doesn't include cloud-init and I have no way to test the results. --- docs/fedora-livemedia-ec2.ks | 120 ------------- docs/fedora-livemedia.ks | 390 ------------------------------------------- docs/rhel7-livemedia.ks | 376 +++++++++++++++++++++++++++++++++++++++++ lorax.spec | 1 + 4 files changed, 377 insertions(+), 510 deletions(-) delete mode 100644 docs/fedora-livemedia-ec2.ks delete mode 100644 docs/fedora-livemedia.ks create mode 100644 docs/rhel7-livemedia.ks diff --git a/docs/fedora-livemedia-ec2.ks b/docs/fedora-livemedia-ec2.ks deleted file mode 100644 index 79ec1bc..0000000 --- a/docs/fedora-livemedia-ec2.ks +++ /dev/null @@ -1,120 +0,0 @@ -# Build a basic Fedora AMI using livemedia-creator -lang en_US.UTF-8 -keyboard us -timezone --utc America/New_York -auth --useshadow --enablemd5 -selinux --enforcing -firewall --service=ssh -bootloader --location=none -network --bootproto=dhcp --device=eth0 --onboot=on --activate -services --enabled=network,sshd,rsyslog -shutdown - -# By default the root password is emptied -rootpw --plaintext removethispw - -# -# Define how large you want your rootfs to be -# NOTE: S3-backed AMIs have a limit of 10G -# -zerombr -clearpart --all -part / --size 10000 --fstype ext4 --ondisk sda -part biosboot --size=1 -part swap --size=512 - -# -# Repositories -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/19/x86_64/os/" - -# -# -# Add all the packages after the base packages -# -%packages --nobase -@core -system-config-securitylevel-tui -audit -pciutils -bash -coreutils -kernel - -e2fsprogs -passwd -policycoreutils -chkconfig -rootfiles -yum -vim-minimal -acpid -openssh-clients -openssh-server -curl -sudo - -#Allow for dhcp access -dhclient -iputils - --firstboot --biosdevname - -# package to setup cloudy bits for us -cloud-init - -grub --dracut-config-rescue -%end - -# more ec2-ify -%post --erroronfail - -# create ec2-user -/usr/sbin/useradd ec2-user -/bin/echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers - -# fstab mounting is different for x86_64 and i386 -cat <<EOL > /etc/fstab -/dev/xvda1 / ext4 defaults 1 1 -/dev/xvda2 /mnt ext3 defaults 0 0 -/dev/xvda3 swap swap defaults 0 0 -EOL - -if [ ! -d /lib64 ] ; then -# workaround xen performance issue (bz 651861) -echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf -fi - -# Install grub.conf -# idle=nomwait is to allow xen images to boot and not try use cpu features that are not supported -INITRD=`ls /boot/initramfs-* | head -n1` -KERNEL=`ls /boot/vmlinuz-* | head -n1` -mkdir /boot/grub -pushd /boot/grub -cat <<EOL > grub.conf -default 0 -timeout 0 - -title Fedora Linux - root (hd0) - kernel $KERNEL root=/dev/xvda1 idle=halt - initrd $INITRD -EOL -# symlink grub.conf to menu.lst for use by EC2 pv-grub -ln -s grub.conf menu.lst -popd - -# the firewall rules get saved as .old without this we end up not being able -# ssh in as iptables blocks access -rename -v .old "" /etc/sysconfig/*old - -# setup systemd to boot to the right runlevel -rm /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target - -# remove the root password -passwd -d root > /dev/null - -%end - diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks deleted file mode 100644 index 6d59a22..0000000 --- a/docs/fedora-livemedia.ks +++ /dev/null @@ -1,390 +0,0 @@ -#version=DEVEL -sshpw --username=root --plaintext randOmStrinGhERE -# Firewall configuration -firewall --enabled --service=mdns -# Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/19/x86_64/os/" - -# X Window System configuration information -xconfig --startxonboot -# Root password -rootpw --plaintext removethispw -# Network information -network --bootproto=dhcp --device=eth0 --onboot=on --activate -# System authorization information -auth --useshadow --enablemd5 -# System keyboard -keyboard us -# System language -lang en_US.UTF-8 -# SELinux configuration -selinux --enforcing -# Installation logging level -logging --level=info -# Shutdown after installation -shutdown -# System services -services --disabled="network,sshd" --enabled="NetworkManager" -# System timezone -timezone US/Eastern -# System bootloader configuration -bootloader --location=mbr -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part biosboot --size=1 -part / --fstype="ext4" --size=4000 -part swap --size=1000 - -%post -# FIXME: it'd be better to get this installed from a package -cat > /etc/rc.d/init.d/livesys << EOF -#!/bin/bash -# -# live: Init script for live image -# -# chkconfig: 345 00 99 -# description: Init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then - exit 0 -fi - -if [ -e /.liveimg-configured ] ; then - configdone=1 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-configured - -# mount live image -if [ -b \`readlink -f /dev/live\` ]; then - mkdir -p /mnt/live - mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live -fi - -livedir="LiveOS" -for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##live_dir=}" != "\${arg}" ]; then - livedir=\${arg##live_dir=} - return - fi -done - -# enable swaps unless requested otherwise -swaps=\`blkid -t TYPE=swap -o device\` -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then - for s in \$swaps ; do - action "Enabling swap partition \$s" swapon \$s - done -fi -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then - action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img -fi - -mountPersistentHome() { - # support label/uuid - if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then - homedev=\`/sbin/blkid -o device -t "\$homedev"\` - fi - - # if we're given a file rather than a blockdev, loopback it - if [ "\${homedev##mtd}" != "\${homedev}" ]; then - # mtd devs don't have a block device but get magic-mounted with -t jffs2 - mountopts="-t jffs2" - elif [ ! -b "\$homedev" ]; then - loopdev=\`losetup -f\` - if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then - action "Remounting live store r/w" mount -o remount,rw /mnt/live - fi - losetup \$loopdev \$homedev - homedev=\$loopdev - fi - - # if it's encrypted, we need to unlock it - if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then - echo - echo "Setting up encrypted /home device" - plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" - homedev=/dev/mapper/EncHome - fi - - # and finally do the mount - mount \$mountopts \$homedev /home - # if we have /home under what's passed for persistent home, then - # we should make that the real /home. useful for mtd device on olpc - if [ -d /home/home ]; then mount --bind /home/home /home ; fi - [ -x /sbin/restorecon ] && /sbin/restorecon /home - if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi -} - -findPersistentHome() { - for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##persistenthome=}" != "\${arg}" ]; then - homedev=\${arg##persistenthome=} - return - fi - done -} - -if strstr "\`cat /proc/cmdline\`" persistenthome= ; then - findPersistentHome -elif [ -e /mnt/live/\${livedir}/home.img ]; then - homedev=/mnt/live/\${livedir}/home.img -fi - -# if we have a persistent /home, then we want to go ahead and mount it -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -# make it so that we don't do writing to the overlay for things which -# are just tmpdirs/caches -mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum -mount -t tmpfs tmp /tmp -mount -t tmpfs vartmp /var/tmp -[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# add fedora user with no passwd -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null - -# turn off firstboot for livecd boots -chkconfig --level 345 firstboot off 2>/dev/null -# We made firstboot a native systemd service, so it can no longer be turned -# off with chkconfig. It should be possible to turn it off with systemctl, but -# that doesn't work right either. For now, this is good enough: the firstboot -# service will start up, but this tells it not to run firstboot. I suspect the -# other services 'disabled' below are not actually getting disabled properly, -# with systemd, but we can look into that later. - AdamW 2010/08 F14Alpha -echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot - -# don't start yum-updatesd for livecd boots -chkconfig --level 345 yum-updatesd off 2>/dev/null - -# turn off mdmonitor by default -chkconfig --level 345 mdmonitor off 2>/dev/null - -# turn off setroubleshoot on the live image to preserve resources -chkconfig --level 345 setroubleshoot off 2>/dev/null - -# don't do packagekit checking by default -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_updates never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_upgrades never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_refresh_cache never >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_available false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_distro_upgrades false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_firmware false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null - - -# don't start cron/at as they tend to spawn things which are -# disk intensive that are painful on a live image -chkconfig --level 345 crond off 2>/dev/null -chkconfig --level 345 atd off 2>/dev/null -chkconfig --level 345 anacron off 2>/dev/null -chkconfig --level 345 readahead_early off 2>/dev/null -chkconfig --level 345 readahead_later off 2>/dev/null - -# Stopgap fix for RH #217966; should be fixed in HAL instead -touch /media/.hal-mtab - -# workaround clock syncing on shutdown that we don't want (#297421) -sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt - -# and hack so that we eject the cd on shutdown if we're using a CD... -if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then - cat >> /sbin/halt.local << FOE -#!/bin/bash -# XXX: This often gets stuck during shutdown because /etc/init.d/halt -# (or something else still running) wants to read files from the block\ -# device that was ejected. Disable for now. Bug #531924 -# we want to eject the cd on halt, but let's also try to avoid -# io errors due to not being able to get files... -#cat /sbin/halt > /dev/null -#cat /sbin/reboot > /dev/null -#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 -#echo "Please remove the CD from your drive and press Enter to finish restarting" -#read -t 30 < /dev/console -FOE -chmod +x /sbin/halt.local -fi - -EOF - -# bah, hal starts way too late -cat > /etc/rc.d/init.d/livesys-late << EOF -#!/bin/bash -# -# live: Late init script for live image -# -# chkconfig: 345 99 01 -# description: Late init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then - exit 0 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-late-configured - -# read some variables out of /proc/cmdline -for o in \`cat /proc/cmdline\` ; do - case \$o in - ks=*) - ks="--kickstart=\${o#ks=}" - ;; - xdriver=*) - xdriver="\${o#xdriver=}" - ;; - esac -done - -# if liveinst or textinst is given, start anaconda -if strstr "\`cat /proc/cmdline\`" liveinst ; then - plymouth --quit - /usr/sbin/liveinst \$ks -fi -if strstr "\`cat /proc/cmdline\`" textinst ; then - plymouth --quit - /usr/sbin/liveinst --text \$ks -fi - -# configure X, allowing user to override xdriver -if [ -n "\$xdriver" ]; then - cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE -Section "Device" - Identifier "Videocard0" - Driver "\$xdriver" -EndSection -FOE -fi - -EOF - -chmod 755 /etc/rc.d/init.d/livesys -/sbin/restorecon /etc/rc.d/init.d/livesys -/sbin/chkconfig --add livesys - -chmod 755 /etc/rc.d/init.d/livesys-late -/sbin/restorecon /etc/rc.d/init.d/livesys-late -/sbin/chkconfig --add livesys-late - -# work around for poor key import UI in PackageKit -rm -f /var/lib/rpm/__db* -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -echo "Packages within this LiveCD" -rpm -qa - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# convince readahead not to collect -rm -f /.readahead_collect -touch /var/lib/readahead/early.sorted - -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL - -# only works on x86, x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS -fi -%end - -%post -cat >> /etc/rc.d/init.d/livesys << EOF -# disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null - -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chown -R liveuser.liveuser /home/liveuser/Desktop -chmod a+x /home/liveuser/Desktop/liveinst.desktop - -# But not trash and home -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null - -# Turn off PackageKit-command-not-found while uninstalled -sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf - -# Use the animated laughlin background by default -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -t str -s /desktop/gnome/background/picture_filename /usr/share/backgrounds/laughlin/default-tod/laughlin.xml - -EOF - -# Remove root password -passwd -d root > /dev/null - -# fstab from the install won't match anything. remove it and let dracut -# handle mounting. -cat /dev/null > /etc/fstab - -%end - -%packages -@admin-tools -@standard -@base-x -@core -@dial-up -@fonts -@gnome-desktop -@graphical-internet -@hardware-support -@input-methods -#@office -#@printing -#@sound-and-video -anaconda -isomd5sum -kernel -laughlin-backgrounds-animated-gnome -memtest86+ -nss-mdns --ibus-pinyin-db-open-phrase --smartmontools -grub2-efi -grub2 -shim -syslinux --dracut-config-rescue -%end diff --git a/docs/rhel7-livemedia.ks b/docs/rhel7-livemedia.ks new file mode 100644 index 0000000..13b97e1 --- /dev/null +++ b/docs/rhel7-livemedia.ks @@ -0,0 +1,376 @@ +#version=DEVEL +sshpw --username=root --plaintext randOmStrinGhERE +# Firewall configuration +firewall --enabled --service=mdns +# Use network installation +url --url=http://repo/rhel7.0/Server/os +repo --name=optional --baseurl=http://repo/rhel7.0/Server/optional/os + +# X Window System configuration information +xconfig --startxonboot +# Root password +rootpw --plaintext removethispw +# Network information +network --bootproto=dhcp --onboot=on --activate +# System authorization information +auth --useshadow --enablemd5 +# System keyboard +keyboard us +# System language +lang en_US.UTF-8 +# SELinux configuration +selinux --enforcing +# Installation logging level +logging --level=info +# Shutdown after installation +shutdown +# System services +services --disabled="network,sshd" --enabled="NetworkManager" +# System timezone +timezone US/Eastern +# System bootloader configuration +bootloader --location=mbr +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all +# Disk partitioning information +part biosboot --size=1 +part / --fstype="ext4" --size=4000 +part swap --size=1000 + +%post +# FIXME: it'd be better to get this installed from a package +cat > /etc/rc.d/init.d/livesys << EOF +#!/bin/bash +# +# live: Init script for live image +# +# chkconfig: 345 00 99 +# description: Init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then + exit 0 +fi + +if [ -e /.liveimg-configured ] ; then + configdone=1 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-configured + +# mount live image +if [ -b \`readlink -f /dev/live\` ]; then + mkdir -p /mnt/live + mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live +fi + +livedir="LiveOS" +for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##live_dir=}" != "\${arg}" ]; then + livedir=\${arg##live_dir=} + return + fi +done + +# enable swaps unless requested otherwise +swaps=\`blkid -t TYPE=swap -o device\` +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then + for s in \$swaps ; do + action "Enabling swap partition \$s" swapon \$s + done +fi +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then + action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img +fi + +mountPersistentHome() { + # support label/uuid + if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then + homedev=\`/sbin/blkid -o device -t "\$homedev"\` + fi + + # if we're given a file rather than a blockdev, loopback it + if [ "\${homedev##mtd}" != "\${homedev}" ]; then + # mtd devs don't have a block device but get magic-mounted with -t jffs2 + mountopts="-t jffs2" + elif [ ! -b "\$homedev" ]; then + loopdev=\`losetup -f\` + if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then + action "Remounting live store r/w" mount -o remount,rw /mnt/live + fi + losetup \$loopdev \$homedev + homedev=\$loopdev + fi + + # if it's encrypted, we need to unlock it + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + echo + echo "Setting up encrypted /home device" + plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" + homedev=/dev/mapper/EncHome + fi + + # and finally do the mount + mount \$mountopts \$homedev /home + # if we have /home under what's passed for persistent home, then + # we should make that the real /home. useful for mtd device on olpc + if [ -d /home/home ]; then mount --bind /home/home /home ; fi + [ -x /sbin/restorecon ] && /sbin/restorecon /home + if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi +} + +findPersistentHome() { + for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##persistenthome=}" != "\${arg}" ]; then + homedev=\${arg##persistenthome=} + return + fi + done +} + +if strstr "\`cat /proc/cmdline\`" persistenthome= ; then + findPersistentHome +elif [ -e /mnt/live/\${livedir}/home.img ]; then + homedev=/mnt/live/\${livedir}/home.img +fi + +# if we have a persistent /home, then we want to go ahead and mount it +if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then + action "Mounting persistent /home" mountPersistentHome +fi + +# make it so that we don't do writing to the overlay for things which +# are just tmpdirs/caches +mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum +mount -t tmpfs tmp /tmp +mount -t tmpfs vartmp /var/tmp +[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 + +if [ -n "\$configdone" ]; then + exit 0 +fi + +# add fedora user with no passwd +action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser +passwd -d liveuser > /dev/null + +# turn off firstboot for livecd boots +chkconfig --level 345 firstboot off 2>/dev/null +# We made firstboot a native systemd service, so it can no longer be turned +# off with chkconfig. It should be possible to turn it off with systemctl, but +# that doesn't work right either. For now, this is good enough: the firstboot +# service will start up, but this tells it not to run firstboot. I suspect the +# other services 'disabled' below are not actually getting disabled properly, +# with systemd, but we can look into that later. - AdamW 2010/08 F14Alpha +echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot + +# don't start yum-updatesd for livecd boots +chkconfig --level 345 yum-updatesd off 2>/dev/null + +# turn off mdmonitor by default +chkconfig --level 345 mdmonitor off 2>/dev/null + +# turn off setroubleshoot on the live image to preserve resources +chkconfig --level 345 setroubleshoot off 2>/dev/null + +# don't do packagekit checking by default +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_updates never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_get_upgrades never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/update-icon/frequency_refresh_cache never >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_available false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/update-icon/notify_distro_upgrades false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_firmware false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null + + +# don't start cron/at as they tend to spawn things which are +# disk intensive that are painful on a live image +chkconfig --level 345 crond off 2>/dev/null +chkconfig --level 345 atd off 2>/dev/null +chkconfig --level 345 anacron off 2>/dev/null +chkconfig --level 345 readahead_early off 2>/dev/null +chkconfig --level 345 readahead_later off 2>/dev/null + +# Stopgap fix for RH #217966; should be fixed in HAL instead +touch /media/.hal-mtab + +# workaround clock syncing on shutdown that we don't want (#297421) +sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt + +# and hack so that we eject the cd on shutdown if we're using a CD... +if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then + cat >> /sbin/halt.local << FOE +#!/bin/bash +# XXX: This often gets stuck during shutdown because /etc/init.d/halt +# (or something else still running) wants to read files from the block\ +# device that was ejected. Disable for now. Bug #531924 +# we want to eject the cd on halt, but let's also try to avoid +# io errors due to not being able to get files... +#cat /sbin/halt > /dev/null +#cat /sbin/reboot > /dev/null +#/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1 +#echo "Please remove the CD from your drive and press Enter to finish restarting" +#read -t 30 < /dev/console +FOE +chmod +x /sbin/halt.local +fi + +EOF + +# bah, hal starts way too late +cat > /etc/rc.d/init.d/livesys-late << EOF +#!/bin/bash +# +# live: Late init script for live image +# +# chkconfig: 345 99 01 +# description: Late init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then + exit 0 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-late-configured + +# read some variables out of /proc/cmdline +for o in \`cat /proc/cmdline\` ; do + case \$o in + ks=*) + ks="--kickstart=\${o#ks=}" + ;; + xdriver=*) + xdriver="\${o#xdriver=}" + ;; + esac +done + +# if liveinst or textinst is given, start anaconda +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi + +# configure X, allowing user to override xdriver +if [ -n "\$xdriver" ]; then + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE +Section "Device" + Identifier "Videocard0" + Driver "\$xdriver" +EndSection +FOE +fi + +EOF + +chmod 755 /etc/rc.d/init.d/livesys +/sbin/restorecon /etc/rc.d/init.d/livesys +/sbin/chkconfig --add livesys + +chmod 755 /etc/rc.d/init.d/livesys-late +/sbin/restorecon /etc/rc.d/init.d/livesys-late +/sbin/chkconfig --add livesys-late + +# work around for poor key import UI in PackageKit +rm -f /var/lib/rpm/__db* +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +echo "Packages within this LiveCD" +rpm -qa + +# go ahead and pre-make the man -k cache (#455968) +/usr/bin/mandb + +# make sure there aren't core files lying around +rm -f /core* + +# convince readahead not to collect +rm -f /.readahead_collect +touch /var/lib/readahead/early.sorted + +%end + +%post --nochroot +cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL + +# only works on x86, x86_64 +if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then + if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi + cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS +fi +%end + +%post +cat >> /etc/rc.d/init.d/livesys << EOF +# disable screensaver locking +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null + +# set up timed auto-login for after 60 seconds +cat >> /etc/gdm/custom.conf << FOE +[daemon] +AutomaticLoginEnable=True +AutomaticLogin=liveuser +FOE + +# Show harddisk install on the desktop +sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop +chown -R liveuser.liveuser /home/liveuser/Desktop +chmod a+x /home/liveuser/Desktop/liveinst.desktop + +# But not trash and home +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null +gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null + +# Turn off PackageKit-command-not-found while uninstalled +sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf + +EOF + +# Remove root password +passwd -d root > /dev/null + +# fstab from the install won't match anything. remove it and let dracut +# handle mounting. +cat /dev/null > /etc/fstab + +%end + +%packages +@core +@fonts +@x11 +@gnome-desktop +@input-methods +anaconda +isomd5sum +kernel +memtest86+ +grub2-efi +grub2 +shim +syslinux +-dracut-config-rescue +%end diff --git a/lorax.spec b/lorax.spec index 049a412..363f953 100644 --- a/lorax.spec +++ b/lorax.spec @@ -73,6 +73,7 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %files %defattr(-,root,root,-) %doc COPYING AUTHORS README.livemedia-creator +%doc docs/rhel7-livemedia.ks %{python_sitelib}/pylorax %{python_sitelib}/*.egg-info %{_sbindir}/lorax -- 1.8.3.1

2 1

[master] Fix problems with translatable strings
by David Shea 16 Sep '13

16 Sep '13

Not every string is translatable, and some translatable strings require some extra information to make any damn sense to the translators. gettext is configured to include any comment that begins with TRANSLATORS: in the .pot file, so use that. In the bug fixed in patch #2 (854226), the translator is actually asking for gettext context strings, claiming that 'c' is being used as an input string for both "close" and "continue". It doesn't look like that's actually the case, or isn't anymore, but either way python still doesn't have pgettext support, so I just added some comments instead so that whoever gets asked to translate "c" gets a hint as to what that actually means. There is very likely more problems than just these.

2 7

[PATCH 1/2] Block resize slider value changed handler when setting range. (#1007387)
by David Lehman 16 Sep '13

16 Sep '13

--- pyanaconda/ui/gui/spokes/lib/resize.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index f4b8e84..37c887e 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -225,7 +225,9 @@ class ResizeDialog(GUIObject): will not have a slider displayed, so they do not need to be worried with here. """ + self._resizeSlider.handler_block_by_func(self.on_resize_value_changed) self._resizeSlider.set_range(device.minSize, device.size) + self._resizeSlider.handler_unblock_by_func(self.on_resize_value_changed) self._resizeSlider.set_value(value) # The slider needs to be keyboard-accessible. We'll make small movements change in -- 1.8.1.4

2 2

[PATCH 0/2] Move all langs from geoip to top in Welcome spoke and fix default lang setting
by Martin Kolman 16 Sep '13

16 Sep '13

The first patch fixes how default language is set and also cleans up the default language setting code quite a bit. The second patch moves all languages found for the given territory reported by GeoIP to the top of the language list, above the separator, as suggested during the usability testing[1]. It also fixes locale variant preselection (so that for the GB territory, language is set to English, but locale to English(UK)). And finally the patch cleans-up the locale and language handling in Welcome spoke quite a bit. [1] https://fedoraproject.org/wiki/Anaconda/UX_Redesign/Usability_Test_Suggesti… Martin Kolman (2): Don't set ksdata.lang.seen to True if using default value Move all languages found by geoip to the top in Welcome spoke anaconda | 3 +- pyanaconda/kickstart.py | 5 --- pyanaconda/ui/gui/spokes/welcome.py | 70 +++++++++++++++++++++++++------------ 3 files changed, 49 insertions(+), 29 deletions(-) -- 1.8.3.1

3 7

[master][PATCH] Create the XklWrapper singleton in background
by Vratislav Podzimek 16 Sep '13

16 Sep '13

Creating the XklWrapper instance takes quite a lot of time (~4 seconds on a VM). Instead of doing when the first spoke needs it, we can create the instance in background as soon as the X server is started. Since it includes a lot of I/O operations, threading makes a real difference (at least 2 seconds on a VM). But the main advantage is that this long action happens before we show anything to user and not when some grey screen is shown. --- anaconda | 15 +++++++++++++++ pyanaconda/constants.py | 1 + pyanaconda/keyboard.py | 7 +++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index 3e745e3..8b0dfc9 100755 --- a/anaconda +++ b/anaconda @@ -85,6 +85,19 @@ def startSpiceVDAgent(): else: log.info("Started spice-vdagent.") +def backgroundXklWrapperInitialize(): + """ + Create the XklWrapper singleton instance in a separate thread to save time + when it's really needed. + + """ + + from pyanaconda.constants import THREAD_XKL_WRAPPER_INIT + from pyanaconda.keyboard import XklWrapper + from pyanaconda.threads import threadMgr, AnacondaThread + + threadMgr.add(AnacondaThread(name=THREAD_XKL_WRAPPER_INIT, target=XklWrapper.get_instance)) + def startMetacityWM(): childpid = os.fork() if not childpid: @@ -144,6 +157,8 @@ def doExtraX11Actions(runres): startSpiceVDAgent() + backgroundXklWrapperInitialize() + def setupPythonUpdates(): from distutils.sysconfig import get_python_lib import gi.overrides diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py index d4d8708..dfb9200 100644 --- a/pyanaconda/constants.py +++ b/pyanaconda/constants.py @@ -117,6 +117,7 @@ THREAD_ISCSI_LOGIN = "AnaIscsiLoginThread" THREAD_GEOLOCATION_REFRESH = "AnaGeolocationRefreshThread" THREAD_DATE_TIME = "AnaDateTimeThread" THREAD_TIME_INIT = "AnaTimeInitThread" +THREAD_XKL_WRAPPER_INIT = "AnaXklWrapperInitThread" # Geolocation constants diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index e5b7793..cf3f5d8 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -38,6 +38,7 @@ import re import shutil import ctypes import gettext +import threading from collections import namedtuple @@ -363,11 +364,13 @@ class XklWrapper(object): """ _instance = None + _instance_lock = threading.Lock() @staticmethod def get_instance(): - if not XklWrapper._instance: - XklWrapper._instance = XklWrapper() + with XklWrapper._instance_lock: + if not XklWrapper._instance: + XklWrapper._instance = XklWrapper() return XklWrapper._instance -- 1.7.11.7

3 5

[PATCH] network: ifcfg files handling cleanup
by Radek Vykydal 16 Sep '13

16 Sep '13

The cleanup itself is in [1/7]. Then there are some patches fixing issues I came across while testing the patch (text mode, wifi, vlan, bonding, no link). And a bit more of tui improvement and code consolidation in [6/7].

3 11

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013