Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2013-01-29 12:06:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-11 11:23:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-01-29 12:06:55.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Jan 28 17:52:28 UTC 2013 - [email protected] + +- Require modutils instead of module-init-tools. + +------------------------------------------------------------------- +Thu Jan 24 09:57:18 UTC 2013 - [email protected] + +- Update to release 025: + + do not strip signed kernel modules + + add sosreport script and generate /run/initramfs/sosreport.txt + + make short uuid specification for allow-discards work + + turn off RateLimit for the systemd journal + + fixed MAC address assignment + + add systemd checkisomd5 service + + splitout drm kernel modules from plymouth module + + add 'swapoff' to initramfs to fix shutdown/reboot + + add team device support + + add pre-shutdown hook + + kill all processes in shutdown and report remaining ones + + "--device" changed to "--add-device" and "add_device=" added + for conf files + + add memory usage trace to different hook points + + cope with optional field #7 in /proc/self/mountinfo + + lots of small bugfixes + +------------------------------------------------------------------- Old: ---- dracut-024.tar.xz New: ---- dracut-025.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.8HH2o4/_old 2013-01-29 12:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.8HH2o4/_new 2013-01-29 12:06:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 024 +Version: 025 Release: 0 Summary: Initramfs generator using udev @@ -68,7 +68,7 @@ Requires: gzip Requires: hardlink Requires: logrotate -Requires: module-init-tools >= 3.8 +Requires: modutils Requires: sed Requires: udev > 166 Requires: util-linux >= 2.21 @@ -219,6 +219,7 @@ %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs %{dracutlibdir}/modules.d/45url-lib +%{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth %{dracutlibdir}/modules.d/80cms %{dracutlibdir}/modules.d/90btrfs ++++++ correct-paths-for-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.8HH2o4/_old 2013-01-29 12:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.8HH2o4/_new 2013-01-29 12:06:57.000000000 +0100 @@ -1,6 +1,21 @@ ---- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/10i18n/module-setup.sh 2012-11-01 19:52:37.196044993 +0100 -@@ -86,6 +86,8 @@ +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)) + [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l + [[ $lvmconf_l ]] && lvmconf=$lvmconf_l + [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut +-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" ++[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel" + [[ $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 +@@ -86,6 +86,8 @@ install() { install_base() { dracut_install setfont loadkeys kbd_mode stty @@ -9,8 +24,10 @@ inst ${moddir}/console_init.sh /lib/udev/console_init inst_rules ${moddir}/10-console.rules inst_hook cmdline 20 "${moddir}/parse-i18n.sh" ---- dracut-024/modules.d/50plymouth/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/50plymouth/module-setup.sh 2012-11-01 19:52:37.196044993 +0100 +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 @@ -4,7 +4,7 @@ check() { @@ -20,7 +37,7 @@ } depends() { -@@ -64,12 +64,12 @@ +@@ -12,12 +12,12 @@ depends() { } install() { @@ -36,16 +53,20 @@ fi inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh ---- dracut-024/modules.d/50plymouth/plymouth-emergency.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/50plymouth/plymouth-emergency.sh 2012-11-01 19:52:37.196044993 +0100 +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 @@ -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-024/modules.d/50plymouth/plymouth-newroot.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/50plymouth/plymouth-newroot.sh 2012-11-01 19:52:37.196044993 +0100 +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 @@ -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 @@ -55,8 +76,10 @@ +if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then + /usr/bin/plymouth --newroot=$NEWROOT fi ---- dracut-024/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-11-01 19:52:37.196044993 +0100 +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 @@ -4,8 +4,8 @@ PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png" PLYMOUTH_THEME=$(plymouth-set-default-theme) @@ -68,8 +91,10 @@ "${PLYMOUTH_LOGO_FILE}" \ /etc/system-release ---- dracut-024/modules.d/50plymouth/plymouth-pretrigger.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/50plymouth/plymouth-pretrigger.sh 2012-11-01 19:52:37.196044993 +0100 +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 @@ -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 @@ -79,7 +104,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 @@ +@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then 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" @@ -90,42 +115,11 @@ # reset tty after plymouth messed with it [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev" fi ---- dracut-024/modules.d/95udev-rules/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/95udev-rules/module-setup.sh 2012-11-01 19:53:58.859048946 +0100 -@@ -11,6 +11,8 @@ - dracut_install udevadm cat uname blkid \ - /etc/udev/udev.conf - -+ inst /usr/sbin/blkid /sbin/blkid -+ - [ -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 ---- a/dracut.sh -+++ b/dracut.sh -@@ -561,7 +561,7 @@ - [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l - [[ $lvmconf_l ]] && lvmconf=$lvmconf_l - [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut --[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" -+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp - [[ $compress_l ]] && compress=$compress_l ---- a/modules.d/90kernel-modules/module-setup.sh -+++ b/modules.d/90kernel-modules/module-setup.sh -@@ -69,7 +69,7 @@ - } - - 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-024/modules.d/90crypt/crypt-lib.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/90crypt/crypt-lib.sh 2012-11-02 23:39:56.702130681 +0100 -@@ -47,8 +47,8 @@ +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 +@@ -47,8 +47,8 @@ ask_for_password() { { flock -s 9; # Prompt for password with plymouth, if installed and running. @@ -136,16 +130,20 @@ --prompt "$ply_prompt" --number-of-tries=$ply_tries \ --command="$ply_cmd" ret=$? ---- dracut-024/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-11-02 23:40:31.807132380 +0100 -@@ -31,13 +31,13 @@ +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 fi getarg rd.live.check -d check || check="" if [ -n "$check" ]; then - [ -x /bin/plymouth ] && /bin/plymouth --hide-splash + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash - checkisomd5 --verbose $livedev - if [ $? -ne 0 ]; then + if [ -n "$DRACUT_SYSTEMD" ]; then + p=$(str_replace "$livedev" "-" '\x2d') + systemctl start checkisomd5@${p}.service +@@ -42,7 +42,7 @@ if [ -n "$check" ]; then die "CD check failed!" exit 1 fi @@ -154,20 +152,50 @@ fi ln -s $livedev /run/initramfs/livedev ---- dracut-024/modules.d/98systemd/dracut-emergency.service 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/98systemd/dracut-emergency.service 2012-11-02 23:41:13.214134384 +0100 -@@ -14,7 +14,7 @@ +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() { + } + + 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 +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 +@@ -11,6 +11,8 @@ install() { + dracut_install udevadm cat uname blkid \ + /etc/udev/udev.conf + ++ inst /usr/sbin/blkid /sbin/blkid ++ + [ -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 [Service] Environment=HOME=/ WorkingDirectory=/ -ExecStartPre=-/bin/plymouth quit +ExecStartPre=-/usr/bin/plymouth quit - ExecStartPre=-/bin/echo -e '\n\nEntering emergency mode. Exit the shell to continue.\nType "journalctl" to view system logs.\n' + 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 - ExecStopPost=-/bin/rm -f /.console_lock ---- dracut-024/modules.d/98systemd/rescue.service 2012-10-16 16:31:06.000000000 +0200 -+++ new/modules.d/98systemd/rescue.service 2012-11-02 23:42:36.401138410 +0100 -@@ -14,7 +14,7 @@ +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 +@@ -14,7 +14,7 @@ DefaultDependencies=no [Service] Environment=HOME=/ WorkingDirectory=/ @@ -176,3 +204,4 @@ 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.8HH2o4/_old 2013-01-29 12:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.8HH2o4/_new 2013-01-29 12:06:57.000000000 +0100 @@ -1,12 +1,14 @@ -diff -urB dracut-024/dracut-functions.sh new/dracut-functions.sh ---- dracut-024/dracut-functions.sh 2012-10-16 16:31:06.000000000 +0200 -+++ new/dracut-functions.sh 2012-11-04 00:20:30.736648962 +0100 -@@ -901,7 +901,7 @@ +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() { inst_dir "$_target" for _rule in "$@"; do - if [ "${rule#/}" = "$rule" ]; then + if [ "${_rule#/}" = "$_rule" ]; then - for r in ${udevdir}/rules.d /etc/udev/rules.d; do + for r in ${udevdir}/rules.d lib/udev/rules.d /etc/udev/rules.d; do if [[ -f $r/$_rule ]]; then _found="$r/$_rule" inst_rule_programs "$_found" + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
