Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2013-03-14 10:56:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-23 16:33:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-03-14 10:56:06.000000000 +0100 @@ -1,0 +2,26 @@ +Tue Mar 12 22:01:14 UTC 2013 - crrodrig...@opensuse.org + +- dracut-026 +- introduce /usr/lib/dracut/dracut.conf.d/ drop-in directory + + /usr/lib/dracut/dracut.conf.d/*.conf can be overwritten by the same + filenames in /etc/dracut.conf.d. + + Packages should use /usr/lib/dracut/dracut.conf.d rather than + /etc/dracut.conf.d for drop-in configuration files. + + /etc/dracut.conf and /etc/dracut.conf.d belong to the system administrator. + +- uses systemd-198 native initrd units +- totally rely on the fstab-generator in systemd mode for block devices +- dracut systemd now uses dracut.target rather than basic.target +- dracut systemd services optimize themselves away +- fixed hostonly parameter generation +- turn off curl globbing (fixes IPv6) +- modify the udev rules on install and not runtime time +- enable initramfs building without kernel modules (fixed regression) +- in the initqueue/timeout, + reset the main loop counter, as we see new udev events or initqueue/work +- fixed udev rule installation + +------------------------------------------------------------------- Old: ---- dracut-025_git201302211113.tar.xz New: ---- dracut-026_git201303111758.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.hwIOJo/_old 2013-03-14 10:56:07.000000000 +0100 +++ /var/tmp/diff_new_pack.hwIOJo/_new 2013-03-14 10:56:07.000000000 +0100 @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 025_git201302211113 +Version: 026_git201303111758 Release: 0 Summary: Initramfs generator using udev @@ -209,9 +209,18 @@ %{_mandir}/man8/dracut-pre-pivot.service.8* %{_mandir}/man8/dracut-pre-trigger.service.8* %{_mandir}/man8/dracut-pre-udev.service.8* -%{_mandir}/man8/initrd-switch-root.service.8* %{_mandir}/man8/udevadm-cleanup-db.service.8* +%{_mandir}/man8/dracut-mount.service.8.* +%{_mandir}/man8/dracut-pre-mount.service.8.* %{_mandir}/man5/dracut.conf.5* +%dir /usr/lib/kernel +%dir /usr/lib/kernel/install.d +/usr/lib/kernel/install.d/50-dracut.install +/usr/lib/kernel/install.d/51-dracut-rescue.install +%dir %{dracutlibdir}/modules.d/00systemd-bootchart +%dir %{dracutlibdir}/modules.d/03rescue +%{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh +%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/00bootchart %{dracutlibdir}/modules.d/00dash %{dracutlibdir}/modules.d/04watchdog ++++++ correct-paths-for-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.hwIOJo/_old 2013-03-14 10:56:07.000000000 +0100 +++ /var/tmp/diff_new_pack.hwIOJo/_new 2013-03-14 10:56:07.000000000 +0100 @@ -1,6 +1,6 @@ ---- dracut-025_git201302211113.orig/dracut.sh -+++ dracut-025_git201302211113/dracut.sh -@@ -584,7 +584,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l +--- dracut-026_git201303111758.orig/dracut.sh ++++ dracut-026_git201303111758/dracut.sh +@@ -590,7 +590,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -9,19 +9,19 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l ---- dracut-025_git201302211113.orig/modules.d/10i18n/module-setup.sh -+++ dracut-025_git201302211113/modules.d/10i18n/module-setup.sh -@@ -86,6 +86,8 @@ install() { +--- dracut-026_git201303111758.orig/modules.d/10i18n/module-setup.sh ++++ dracut-026_git201303111758/modules.d/10i18n/module-setup.sh +@@ -85,6 +85,8 @@ install() { + install_base() { dracut_install setfont loadkeys kbd_mode stty - + inst /usr/bin/setfont /bin/setfont + inst /usr/bin/loadkeys /bin/loadkeys - inst ${moddir}/console_init.sh /lib/udev/console_init - inst_rules ${moddir}/10-console.rules - inst_hook cmdline 20 "${moddir}/parse-i18n.sh" ---- dracut-025_git201302211113.orig/modules.d/50plymouth/module-setup.sh -+++ dracut-025_git201302211113/modules.d/50plymouth/module-setup.sh + + if ! dracut_module_included "systemd"; then + inst ${moddir}/console_init.sh /lib/udev/console_init +--- dracut-026_git201303111758.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-026_git201303111758/modules.d/50plymouth/module-setup.sh @@ -4,7 +4,7 @@ check() { @@ -47,16 +47,16 @@ fi inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh ---- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-emergency.sh -+++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-emergency.sh +--- dracut-026_git201303111758.orig/modules.d/50plymouth/plymouth-emergency.sh ++++ dracut-026_git201303111758/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 ---- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-newroot.sh -+++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-newroot.sh +--- dracut-026_git201303111758.orig/modules.d/50plymouth/plymouth-newroot.sh ++++ dracut-026_git201303111758/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 @@ -66,8 +66,8 @@ +if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then + /usr/bin/plymouth --newroot=$NEWROOT fi ---- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-populate-initrd.sh -+++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-populate-initrd.sh +--- dracut-026_git201303111758.orig/modules.d/50plymouth/plymouth-populate-initrd.sh ++++ dracut-026_git201303111758/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) @@ -79,8 +79,8 @@ "${PLYMOUTH_LOGO_FILE}" \ /etc/system-release ---- dracut-025_git201302211113.orig/modules.d/50plymouth/plymouth-pretrigger.sh -+++ dracut-025_git201302211113/modules.d/50plymouth/plymouth-pretrigger.sh +--- dracut-026_git201303111758.orig/modules.d/50plymouth/plymouth-pretrigger.sh ++++ dracut-026_git201303111758/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 @@ -101,8 +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 ---- dracut-025_git201302211113.orig/modules.d/90crypt/crypt-lib.sh -+++ dracut-025_git201302211113/modules.d/90crypt/crypt-lib.sh +--- dracut-026_git201303111758.orig/modules.d/90crypt/crypt-lib.sh ++++ dracut-026_git201303111758/modules.d/90crypt/crypt-lib.sh @@ -47,8 +47,8 @@ ask_for_password() { { flock -s 9; @@ -114,8 +114,8 @@ --prompt "$ply_prompt" --number-of-tries=$ply_tries \ --command="$ply_cmd" ret=$? ---- dracut-025_git201302211113.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh -+++ dracut-025_git201302211113/modules.d/90dmsquash-live/dmsquash-live-root.sh +--- dracut-026_git201303111758.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh ++++ dracut-026_git201303111758/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="" @@ -134,19 +134,19 @@ fi ln -s $livedev /run/initramfs/livedev ---- 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() { +--- dracut-026_git201303111758.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-026_git201303111758/modules.d/90kernel-modules/module-setup.sh +@@ -75,7 +75,7 @@ installkernel() { } install() { - dracut_install -o /lib/modprobe.d/*.conf + dracut_install -o /etc/modprobe.d/*.conf [[ $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 ---- dracut-025_git201302211113.orig/modules.d/95udev-rules/module-setup.sh -+++ dracut-025_git201302211113/modules.d/95udev-rules/module-setup.sh + if ! dracut_module_included "systemd"; then + inst_hook cmdline 01 "$moddir/parse-kernel.sh" +--- dracut-026_git201303111758.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-026_git201303111758/modules.d/95udev-rules/module-setup.sh @@ -11,6 +11,8 @@ install() { dracut_install udevadm cat uname blkid \ /etc/udev/udev.conf @@ -156,19 +156,8 @@ [ -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 ---- 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=/ --ExecStartPre=-/bin/plymouth quit -+ExecStartPre=-/usr/bin/plymouth quit - 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 ---- dracut-025_git201302211113.orig/modules.d/98systemd/rescue.service -+++ dracut-025_git201302211113/modules.d/98systemd/rescue.service +--- dracut-026_git201303111758.orig/modules.d/98systemd/rescue.service ++++ dracut-026_git201303111758/modules.d/98systemd/rescue.service @@ -14,7 +14,7 @@ DefaultDependencies=no [Service] Environment=HOME=/ ++++++ dracut-025_git201302211113.tar.xz -> dracut-026_git201303111758.tar.xz ++++++ ++++ 3890 lines of diff (skipped) ++++++ use_all_paths_udev.patch ++++++ --- /var/tmp/diff_new_pack.hwIOJo/_old 2013-03-14 10:56:08.000000000 +0100 +++ /var/tmp/diff_new_pack.hwIOJo/_new 2013-03-14 10:56:08.000000000 +0100 @@ -1,6 +1,6 @@ ---- dracut-025_git201302211113.orig/dracut-functions.sh -+++ dracut-025_git201302211113/dracut-functions.sh -@@ -941,7 +941,7 @@ inst_rules() { +--- dracut-026_git201303111758.orig/dracut-functions.sh ++++ dracut-026_git201303111758/dracut-functions.sh +@@ -947,7 +947,7 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then ++++++ use_initrd_insteadof_initramfs.patch ++++++ --- /var/tmp/diff_new_pack.hwIOJo/_old 2013-03-14 10:56:08.000000000 +0100 +++ /var/tmp/diff_new_pack.hwIOJo/_new 2013-03-14 10:56:08.000000000 +0100 @@ -1,5 +1,5 @@ ---- dracut-025_git201302211113.orig/dracut.8.asc -+++ dracut-025_git201302211113/dracut.8.asc +--- dracut-026_git201303111758.orig/dracut.8.asc ++++ dracut-026_git201303111758/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 @@ -18,8 +18,8 @@ contains the kernel modules of the currently active kernel with version _++<kernel version>++_. ---- dracut-025_git201302211113.orig/dracut.asc -+++ dracut-025_git201302211113/dracut.asc +--- dracut-026_git201303111758.orig/dracut.asc ++++ dracut-026_git201303111758/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 @@ -107,8 +107,8 @@ ---- This will reduce the size of the initramfs image significantly. ---- dracut-025_git201302211113.orig/dracut-initramfs-restore.sh -+++ dracut-025_git201302211113/dracut-initramfs-restore.sh +--- dracut-026_git201303111758.orig/dracut-initramfs-restore.sh ++++ dracut-026_git201303111758/dracut-initramfs-restore.sh @@ -4,7 +4,7 @@ set -e @@ -118,41 +118,19 @@ [ -f .need_shutdown -a -f "$IMG" ] || exit 1 if zcat "$IMG" | cpio -id >/dev/null 2>&1; then rm .need_shutdown ---- dracut-025_git201302211113.orig/dracut.sh -+++ dracut-025_git201302211113/dracut.sh -@@ -442,7 +442,7 @@ if ! [[ $kernel ]]; then +--- dracut-026_git201303111758.orig/dracut.sh ++++ dracut-026_git201303111758/dracut.sh +@@ -447,7 +447,7 @@ if ! [[ $outfile ]]; then + if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then + outfile="/boot/${MACHINE_ID}/$kernel/initrd" + else +- outfile="/boot/initramfs-$kernel.img" ++ outfile="/boot/initrd-$kernel.img" + fi fi - if ! [[ $outfile ]]; then -- outfile="/boot/initramfs-$kernel.img" -+ outfile="/boot/initrd-$kernel" - fi - - for i in /usr/sbin /sbin /usr/bin /bin; do ---- 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 --lsinitrd uses the default image /boot/initramfs-<kernel version>.img. -+lsinitrd uses the default image /boot/initrd-<kernel version>. - - OPTIONS - ------- ---- dracut-025_git201302211113.orig/lsinitrd.sh -+++ dracut-025_git201302211113/lsinitrd.sh -@@ -36,7 +36,7 @@ while getopts "s" opt; do - done - shift $((OPTIND-1)) - --image="${1:-/boot/initramfs-$(uname -r).img}" -+image="${1:-/boot/initrd-$(uname -r)}" - [[ -f "$image" ]] || { echo "$image does not exist" ; exit 1 ; } - - CAT=zcat ---- dracut-025_git201302211113.orig/mkinitrd-dracut.sh -+++ dracut-025_git201302211113/mkinitrd-dracut.sh +--- dracut-026_git201303111758.orig/mkinitrd-dracut.sh ++++ dracut-026_git201303111758/mkinitrd-dracut.sh @@ -11,7 +11,7 @@ usage () { $cmd " [--nocompress]" $cmd " <initrd-image> <kernel-version>" @@ -162,3 +140,25 @@ [[ $1 = '-n' ]] && exit 0 exit 1 +--- dracut-026_git201303111758.orig/lsinitrd.1.asc ++++ dracut-026_git201303111758/lsinitrd.1.asc +@@ -16,7 +16,7 @@ DESCRIPTION + ----------- + lsinitrd shows the contents of an initramfs image. if <image> is omitted, then + lsinitrd uses the default image _/boot/<machine-id>/<kernel-version>/initrd_ or +-_/boot/initramfs-<kernel-version>.img_. ++_/boot/initrd-<kernel-version>.img_. + + OPTIONS + ------- +--- dracut-026_git201303111758.orig/lsinitrd.sh ++++ dracut-026_git201303111758/lsinitrd.sh +@@ -60,7 +60,7 @@ else + if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then + image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + else +- image="/boot/initramfs-${KERNEL_VERSION}.img" ++ image="/boot/initrd-${KERNEL_VERSION}.img" + fi + fi + ++++++ use_sysconfig_values_correctly.patch ++++++ --- /var/tmp/diff_new_pack.hwIOJo/_old 2013-03-14 10:56:08.000000000 +0100 +++ /var/tmp/diff_new_pack.hwIOJo/_new 2013-03-14 10:56:08.000000000 +0100 @@ -1,6 +1,6 @@ ---- dracut-025_git201302211113.orig/modules.d/10i18n/module-setup.sh -+++ dracut-025_git201302211113/modules.d/10i18n/module-setup.sh -@@ -144,6 +144,9 @@ install() { +--- dracut-026_git201303111758.orig/modules.d/10i18n/module-setup.sh ++++ dracut-026_git201303111758/modules.d/10i18n/module-setup.sh +@@ -146,6 +146,9 @@ install() { # Gentoo user may have KEYMAP set to something like "-u pl2", KEYMAP=${KEYMAP#-* } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org