Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2013-02-23 16:33:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2013-02-04 17:58:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-02-23 16:33:52.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 22 00:16:46 UTC 2013 - crrodriguez@opensuse.org + +- Update to 025_git201302211113 +* Support out-of-tree and updated drivers in initramfs creation +* shutdown: call "losetup -D" on shutdown +* Mount /proc before including dracut-lib.sh. +* dracut.sh: make /var/log a symlink to /run/log +* systemd/dracut-pre-pivot.sh: remove /dev/root symlink after shell +* kernel-modules: Add ehci support for kernel 3.8+ +* Other bugfixes + +------------------------------------------------------------------- Old: ---- dracut-025.tar.xz New: ---- dracut-025_git201302211113.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.r8yszt/_old 2013-02-23 16:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.r8yszt/_new 2013-02-23 16:33:56.000000000 +0100 @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 025 +Version: 025_git201302211113 Release: 0 Summary: Initramfs generator using udev @@ -54,8 +54,8 @@ BuildRequires: libxslt BuildRequires: pkgconfig(systemd) %if %{replace_mkinitrd} -Obsoletes: mkinitrd < 2.6.1 -Provides: mkinitrd = 2.6.1 +Obsoletes: mkinitrd <= 2.7.2 +Provides: mkinitrd = 2.7.2 %endif Requires: bash ++++++ correct-paths-for-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.r8yszt/_old 2013-02-23 16:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.r8yszt/_new 2013-02-23 16:33:56.000000000 +0100 @@ -1,8 +1,6 @@ -diff --git a/dracut.sh b/dracut.sh -index 469f408..2701a46 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -561,7 +561,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) +--- dracut-025_git201302211113.orig/dracut.sh ++++ dracut-025_git201302211113/dracut.sh +@@ -584,7 +584,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -11,10 +9,8 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index 1ed1db6..65b9ec9 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh +--- dracut-025_git201302211113.orig/modules.d/10i18n/module-setup.sh ++++ dracut-025_git201302211113/modules.d/10i18n/module-setup.sh @@ -86,6 +86,8 @@ install() { install_base() { dracut_install setfont loadkeys kbd_mode stty @@ -24,10 +20,8 @@ inst ${moddir}/console_init.sh /lib/udev/console_init inst_rules ${moddir}/10-console.rules inst_hook cmdline 20 "${moddir}/parse-i18n.sh" -diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh -index 1c5dad5..1e128db 100755 ---- a/modules.d/50plymouth/module-setup.sh -+++ b/modules.d/50plymouth/module-setup.sh +--- dracut-025_git201302211113.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-025_git201302211113/modules.d/50plymouth/module-setup.sh @@ -4,7 +4,7 @@ check() { @@ -53,20 +47,16 @@ fi inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh -diff --git a/modules.d/50plymouth/plymouth-emergency.sh b/modules.d/50plymouth/plymouth-emergency.sh -index 68955b8..c86b1bb 100755 ---- a/modules.d/50plymouth/plymouth-emergency.sh -+++ b/modules.d/50plymouth/plymouth-emergency.sh +--- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-emergency.sh ++++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-emergency.sh @@ -1,4 +1,4 @@ #!/bin/sh # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -[ -x /bin/plymouth ] && /bin/plymouth --hide-splash +[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash -diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh -index 2311b47..89aaf40 100755 ---- a/modules.d/50plymouth/plymouth-newroot.sh -+++ b/modules.d/50plymouth/plymouth-newroot.sh +--- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-newroot.sh ++++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-newroot.sh @@ -2,6 +2,6 @@ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh @@ -76,10 +66,8 @@ +if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then + /usr/bin/plymouth --newroot=$NEWROOT fi -diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh -index 1e2ffe7..9c10d83 100755 ---- a/modules.d/50plymouth/plymouth-populate-initrd.sh -+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh +--- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-populate-initrd.sh ++++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-populate-initrd.sh @@ -4,8 +4,8 @@ PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png" PLYMOUTH_THEME=$(plymouth-set-default-theme) @@ -91,10 +79,8 @@ "${PLYMOUTH_LOGO_FILE}" \ /etc/system-release -diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh -index 0e3cb02..fc835b7 100755 ---- a/modules.d/50plymouth/plymouth-pretrigger.sh -+++ b/modules.d/50plymouth/plymouth-pretrigger.sh +--- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-pretrigger.sh ++++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-pretrigger.sh @@ -2,7 +2,7 @@ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh @@ -104,7 +90,7 @@ if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then # first trigger graphics subsystem udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1 -@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then +@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SY read consoledev rest < /sys/class/tty/console/active consoledev=${consoledev:-tty0} [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev" @@ -115,10 +101,8 @@ # reset tty after plymouth messed with it [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev" fi -diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh -index d66ba88..ee90199 100755 ---- a/modules.d/90crypt/crypt-lib.sh -+++ b/modules.d/90crypt/crypt-lib.sh +--- dracut-025_git201302211113.orig/modules.d/90crypt/crypt-lib.sh ++++ dracut-025_git201302211113/modules.d/90crypt/crypt-lib.sh @@ -47,8 +47,8 @@ ask_for_password() { { flock -s 9; @@ -130,11 +114,9 @@ --prompt "$ply_prompt" --number-of-tries=$ply_tries \ --command="$ply_cmd" ret=$? -diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh -index f302d44..f987d4f 100755 ---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh -+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh -@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then +--- dracut-025_git201302211113.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ dracut-025_git201302211113/modules.d/90dmsquash-live/dmsquash-live-root.sh +@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" fi getarg rd.live.check -d check || check="" if [ -n "$check" ]; then @@ -152,11 +134,9 @@ fi ln -s $livedev /run/initramfs/livedev -diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh -index 633a59d..c78fe73 100755 ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -69,7 +69,7 @@ installkernel() { +--- dracut-025_git201302211113.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-025_git201302211113/modules.d/90kernel-modules/module-setup.sh +@@ -70,7 +70,7 @@ installkernel() { } install() { @@ -165,10 +145,8 @@ [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf inst_hook cmdline 01 "$moddir/parse-kernel.sh" inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh -diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index 54a192e..d405217 100755 ---- a/modules.d/95udev-rules/module-setup.sh -+++ b/modules.d/95udev-rules/module-setup.sh +--- dracut-025_git201302211113.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-025_git201302211113/modules.d/95udev-rules/module-setup.sh @@ -11,6 +11,8 @@ install() { dracut_install udevadm cat uname blkid \ /etc/udev/udev.conf @@ -178,11 +156,9 @@ [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do [ -x "$_i" ] || continue -diff --git a/modules.d/98systemd/dracut-emergency.service b/modules.d/98systemd/dracut-emergency.service -index d08bfe7..01e49a4 100644 ---- a/modules.d/98systemd/dracut-emergency.service -+++ b/modules.d/98systemd/dracut-emergency.service -@@ -14,7 +14,7 @@ DefaultDependencies=no +--- dracut-025_git201302211113.orig/modules.d/98systemd/dracut-emergency.service ++++ dracut-025_git201302211113/modules.d/98systemd/dracut-emergency.service +@@ -16,7 +16,7 @@ Wants=systemd-vconsole-setup.service [Service] Environment=HOME=/ WorkingDirectory=/ @@ -191,10 +167,8 @@ ExecStartPre=-/sbin/sosreport ExecStartPre=-/bin/echo -e '\n\nEntering emergency mode. Exit the shell to continue.\nType "journalctl" to view system logs.\nYou might want to save "/run/initramfs/sosreport.txt" to a USB stick or /boot\nafter mounting them and attach it to a bug report.\n\n' ExecStart=-/bin/sh -i -l -diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service -index b5fb663..7693c2d 100644 ---- a/modules.d/98systemd/rescue.service -+++ b/modules.d/98systemd/rescue.service +--- dracut-025_git201302211113.orig/modules.d/98systemd/rescue.service ++++ dracut-025_git201302211113/modules.d/98systemd/rescue.service @@ -14,7 +14,7 @@ DefaultDependencies=no [Service] Environment=HOME=/ @@ -204,4 +178,3 @@ ExecStart=-/bin/sh -i -l ExecStopPost=-/bin/rm -f /.console_lock ExecStopPost=-/usr/bin/systemctl --fail --no-block default - ++++++ use_all_paths_udev.patch ++++++ --- /var/tmp/diff_new_pack.r8yszt/_old 2013-02-23 16:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.r8yszt/_new 2013-02-23 16:33:56.000000000 +0100 @@ -1,8 +1,6 @@ -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 5481368..1e3255b 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -901,7 +901,7 @@ inst_rules() { +--- dracut-025_git201302211113.orig/dracut-functions.sh ++++ dracut-025_git201302211113/dracut-functions.sh +@@ -941,7 +941,7 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then @@ -11,4 +9,3 @@ if [[ -f $r/$_rule ]]; then _found="$r/$_rule" inst_rule_programs "$_found" - ++++++ use_initrd_insteadof_initramfs.patch ++++++ --- /var/tmp/diff_new_pack.r8yszt/_old 2013-02-23 16:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.r8yszt/_new 2013-02-23 16:33:56.000000000 +0100 @@ -1,7 +1,6 @@ -diff -urB dracut-024/dracut.8.asc new/dracut.8.asc ---- dracut-024/dracut.8.asc 2012-10-16 16:31:06.000000000 +0200 -+++ new/dracut.8.asc 2012-11-02 14:34:30.037441264 +0100 -@@ -18,7 +18,7 @@ +--- dracut-025_git201302211113.orig/dracut.8.asc ++++ dracut-025_git201302211113/dracut.8.asc +@@ -18,7 +18,7 @@ DESCRIPTION Create an initramfs <image> for the kernel with the version <kernel version>. If <kernel version> is omitted, then the version of the actual running kernel is used. If <image> is omitted or empty, then the default location @@ -10,7 +9,7 @@ dracut creates an initial image used by the kernel for preloading the block device modules (such as IDE, SCSI or RAID) which are needed to access the root -@@ -40,7 +40,7 @@ +@@ -47,7 +47,7 @@ To create a initramfs image, the most si This will generate a general purpose initramfs image, with all possible functionality resulting of the combination of the installed dracut modules and @@ -19,10 +18,9 @@ contains the kernel modules of the currently active kernel with version _++<kernel version>++_. -diff -urB dracut-024/dracut.asc new/dracut.asc ---- dracut-024/dracut.asc 2012-10-16 16:31:06.000000000 +0200 -+++ new/dracut.asc 2012-11-02 14:35:49.947445131 +0100 -@@ -130,7 +130,7 @@ +--- dracut-025_git201302211113.orig/dracut.asc ++++ dracut-025_git201302211113/dracut.asc +@@ -150,7 +150,7 @@ To create a initramfs image, the most si This will generate a general purpose initramfs image, with all possible functionality resulting of the combination of the installed dracut modules and @@ -31,7 +29,7 @@ contains the kernel modules of the currently active kernel with version _++<kernel version>++_. -@@ -170,12 +170,12 @@ +@@ -190,12 +190,12 @@ kernel) as a fallback to rescue your sys === Inspecting the Contents To see the contents of the image created by dracut, you can use the lsinitrd tool. ---- @@ -46,7 +44,7 @@ include ld.so.conf.d/*.conf ---- -@@ -186,7 +186,7 @@ +@@ -206,7 +206,7 @@ _/etc/dracut.conf_ or _/etc/dracut.conf. You can also add dracut modules on the command line by using the -a or --add option: ---- @@ -55,7 +53,7 @@ ---- To see a list of available dracut modules, use the --list-modules option: -@@ -215,7 +215,7 @@ +@@ -235,7 +235,7 @@ automatically picked up by dracut, you h on the command line or the drivers vaiable in the _/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <<dracutconf5>>): ---- @@ -64,7 +62,7 @@ ---- == Boot parameters -@@ -328,7 +328,7 @@ +@@ -348,7 +348,7 @@ To add your own files to the initramfs i The --include option let you specify a source path and a target path. For example ---- @@ -73,7 +71,7 @@ ---- will create an initramfs image, where the file cmdline-preset will be copied inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once. -@@ -350,7 +350,7 @@ +@@ -370,7 +370,7 @@ rd.live.overlay/ └── conf.d └── testvar.conf @@ -82,7 +80,7 @@ ---- This will put the contents of the rd.live.overlay directory into the root of the -@@ -362,7 +362,7 @@ +@@ -382,7 +382,7 @@ creation time. ---- @@ -91,7 +89,7 @@ ---- This will create an initramfs with the strace, fsck.ext3 and ssh executables, -@@ -414,7 +414,7 @@ +@@ -434,7 +434,7 @@ For example for a NFS image, you would d ---- @@ -100,7 +98,7 @@ ---- Then you would boot from this image with your target machine and reduce the size -@@ -422,7 +422,7 @@ +@@ -442,7 +442,7 @@ once more by creating it on the target m ---- @@ -109,9 +107,8 @@ ---- This will reduce the size of the initramfs image significantly. -diff -urB dracut-024/dracut-initramfs-restore.sh new/dracut-initramfs-restore.sh ---- dracut-024/dracut-initramfs-restore.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/dracut-initramfs-restore.sh 2012-11-02 14:34:30.036441264 +0100 +--- dracut-025_git201302211113.orig/dracut-initramfs-restore.sh ++++ dracut-025_git201302211113/dracut-initramfs-restore.sh @@ -4,7 +4,7 @@ set -e @@ -121,10 +118,9 @@ [ -f .need_shutdown -a -f "$IMG" ] || exit 1 if zcat "$IMG" | cpio -id >/dev/null 2>&1; then rm .need_shutdown -diff -urB dracut-024/dracut.sh new/dracut.sh ---- dracut-024/dracut.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/dracut.sh 2012-11-02 14:34:30.038441264 +0100 -@@ -417,7 +417,7 @@ +--- dracut-025_git201302211113.orig/dracut.sh ++++ dracut-025_git201302211113/dracut.sh +@@ -442,7 +442,7 @@ if ! [[ $kernel ]]; then fi if ! [[ $outfile ]]; then @@ -133,10 +129,9 @@ fi for i in /usr/sbin /sbin /usr/bin /bin; do -diff -urB dracut-024/lsinitrd.1.asc new/lsinitrd.1.asc ---- dracut-024/lsinitrd.1.asc 2012-10-16 16:31:06.000000000 +0200 -+++ new/lsinitrd.1.asc 2012-11-02 14:34:30.039441264 +0100 -@@ -15,7 +15,7 @@ +--- dracut-025_git201302211113.orig/lsinitrd.1.asc ++++ dracut-025_git201302211113/lsinitrd.1.asc +@@ -15,7 +15,7 @@ SYNOPSIS DESCRIPTION ----------- lsinitrd shows the contents of an initramfs image. if <image> is omitted, then @@ -145,10 +140,9 @@ OPTIONS ------- -diff -urB dracut-024/lsinitrd.sh new/lsinitrd.sh ---- dracut-024/lsinitrd.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/lsinitrd.sh 2012-11-02 14:34:30.039441264 +0100 -@@ -36,7 +36,7 @@ +--- dracut-025_git201302211113.orig/lsinitrd.sh ++++ dracut-025_git201302211113/lsinitrd.sh +@@ -36,7 +36,7 @@ while getopts "s" opt; do done shift $((OPTIND-1)) @@ -157,10 +151,9 @@ [[ -f "$image" ]] || { echo "$image does not exist" ; exit 1 ; } CAT=zcat -diff -urB dracut-024/mkinitrd-dracut.sh new/mkinitrd-dracut.sh ---- dracut-024/mkinitrd-dracut.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/mkinitrd-dracut.sh 2012-11-02 14:34:30.039441264 +0100 -@@ -11,7 +11,7 @@ +--- dracut-025_git201302211113.orig/mkinitrd-dracut.sh ++++ dracut-025_git201302211113/mkinitrd-dracut.sh +@@ -11,7 +11,7 @@ usage () { $cmd " [--nocompress]" $cmd " <initrd-image> <kernel-version>" $cmd "" ++++++ use_sysconfig_values_correctly.patch ++++++ --- /var/tmp/diff_new_pack.r8yszt/_old 2013-02-23 16:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.r8yszt/_new 2013-02-23 16:33:56.000000000 +0100 @@ -1,7 +1,6 @@ -diff -urB new/modules.d/10i18n/module-setup.sh new1/modules.d/10i18n/module-setup.sh ---- new/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:30.082452541 +0100 -+++ new1/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:49.884453499 +0100 -@@ -144,6 +144,9 @@ +--- dracut-025_git201302211113.orig/modules.d/10i18n/module-setup.sh ++++ dracut-025_git201302211113/modules.d/10i18n/module-setup.sh +@@ -144,6 +144,9 @@ install() { # Gentoo user may have KEYMAP set to something like "-u pl2", KEYMAP=${KEYMAP#-* } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org