Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2013-10-17 14:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2013-10-14 14:26:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-10-17 14:01:58.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 17 02:22:43 UTC 2013 - [email protected] + +- remove use_all_paths_udev.patch, /lib/udev.. is a symlink + to /usr nowadays this confuses other parts of the code causing + errors/warnings during the initrd generation. + +------------------------------------------------------------------- Old: ---- use_all_paths_udev.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -42,8 +42,6 @@ Patch1: use_initrd_insteadof_initramfs.patch # PATCH-FIX-OPENSUSE Strip the gz extension from the keymap mentioned in /etc/sysconfig/keyboard - [email protected] Patch2: use_sysconfig_values_correctly.patch -# PATCH-FIX-OPENSUSE At the moment we have 2 paths that contain udev files (/lib/udev and /usr/lib/udev) - [email protected] -Patch3: use_all_paths_udev.patch # PATCH-FIX-OPENSUSE Write caller and used parameters to syslog if mkinitrd is called - [email protected] Patch4: suse_only_logger.patch # PATCH-FIX-OPENSUSE Call the update-bootloader after dracut finished creating the initrd - [email protected] @@ -126,7 +124,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 ++++++ correct-paths-for-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,6 +1,6 @@ ---- dracut-033.orig/dracut.sh -+++ dracut-033/dracut.sh -@@ -661,7 +661,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l +--- dracut-034.orig/dracut.sh ++++ dracut-034/dracut.sh +@@ -669,7 +669,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -9,8 +9,8 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l ---- dracut-033.orig/modules.d/10i18n/module-setup.sh -+++ dracut-033/modules.d/10i18n/module-setup.sh +--- dracut-034.orig/modules.d/10i18n/module-setup.sh ++++ dracut-034/modules.d/10i18n/module-setup.sh @@ -99,6 +99,8 @@ install() { install_base() { @@ -20,8 +20,8 @@ if ! dracut_module_included "systemd"; then inst ${moddir}/console_init.sh /lib/udev/console_init ---- dracut-033.orig/modules.d/50plymouth/module-setup.sh -+++ dracut-033/modules.d/50plymouth/module-setup.sh +--- dracut-034.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-034/modules.d/50plymouth/module-setup.sh @@ -12,12 +12,12 @@ depends() { } @@ -38,8 +38,8 @@ fi inst_hook emergency 50 "$moddir"/plymouth-emergency.sh ---- dracut-033.orig/modules.d/90kernel-modules/module-setup.sh -+++ dracut-033/modules.d/90kernel-modules/module-setup.sh +--- dracut-034.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-034/modules.d/90kernel-modules/module-setup.sh @@ -74,7 +74,7 @@ installkernel() { } @@ -49,8 +49,8 @@ [[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf if ! dracut_module_included "systemd"; then inst_hook cmdline 01 "$moddir/parse-kernel.sh" ---- dracut-033.orig/modules.d/95udev-rules/module-setup.sh -+++ dracut-033/modules.d/95udev-rules/module-setup.sh +--- dracut-034.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-034/modules.d/95udev-rules/module-setup.sh @@ -11,6 +11,8 @@ install() { inst_multiple udevadm cat uname blkid \ /etc/udev/udev.conf @@ -60,8 +60,8 @@ [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do [ -x "$_i" ] || continue ---- dracut-033.orig/modules.d/98systemd/rescue.service -+++ dracut-033/modules.d/98systemd/rescue.service +--- dracut-034.orig/modules.d/98systemd/rescue.service ++++ dracut-034/modules.d/98systemd/rescue.service @@ -16,7 +16,7 @@ Environment=HOME=/ Environment=DRACUT_SYSTEMD=1 Environment=NEWROOT=/sysroot @@ -71,8 +71,8 @@ ExecStart=-/bin/sh -i -l ExecStopPost=-/bin/rm -f -- /.console_lock ExecStopPost=-/usr/bin/systemctl --fail --no-block default ---- dracut-033.orig/modules.d/99fs-lib/module-setup.sh -+++ dracut-033/modules.d/99fs-lib/module-setup.sh +--- dracut-034.orig/modules.d/99fs-lib/module-setup.sh ++++ dracut-034/modules.d/99fs-lib/module-setup.sh @@ -81,4 +81,5 @@ install() { fi ++++++ mkinitrd-fix-boot-dir-detection.patch ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,7 +1,6 @@ -diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh ---- dracut-033/mkinitrd-dracut.sh 2013-10-04 13:57:15.000000000 +0200 -+++ new/mkinitrd-dracut.sh 2013-10-08 20:55:59.280035248 +0200 -@@ -172,7 +172,14 @@ +--- dracut-034.orig/mkinitrd-dracut.sh ++++ dracut-034/mkinitrd-dracut.sh +@@ -179,7 +179,14 @@ while (($# > 0)); do ;; -i) read_arg initrd_images "$@" || shift $? for initrd_image in $initrd_images;do ++++++ mkinitrd_update_bootloader.diff ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,7 +1,6 @@ -diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh ---- dracut-033/mkinitrd-dracut.sh 2013-10-04 19:12:51.654775024 +0200 -+++ new/mkinitrd-dracut.sh 2013-10-04 19:14:25.088173450 +0200 -@@ -236,3 +236,10 @@ +--- dracut-034.orig/mkinitrd-dracut.sh ++++ dracut-034/mkinitrd-dracut.sh +@@ -231,3 +231,10 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d fi fi done ++++++ suse_only_logger.patch ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,7 +1,5 @@ -diff --git a/mkinitrd-dracut.sh b/mkinitrd-dracut.sh -index a1519ea..dacba60 100755 ---- a/mkinitrd-dracut.sh -+++ b/mkinitrd-dracut.sh +--- dracut-034.orig/mkinitrd-dracut.sh ++++ dracut-034/mkinitrd-dracut.sh @@ -110,6 +110,13 @@ default_kernel_images() { force=1 } ++++++ use_initrd_insteadof_initramfs.patch ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,5 +1,5 @@ ---- dracut-033.orig/dracut.8.asc -+++ dracut-033/dracut.8.asc +--- dracut-034.orig/dracut.8.asc ++++ dracut-034/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-033.orig/dracut.asc -+++ dracut-033/dracut.asc +--- dracut-034.orig/dracut.asc ++++ dracut-034/dracut.asc @@ -153,7 +153,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-033.orig/dracut-initramfs-restore.sh -+++ dracut-033/dracut-initramfs-restore.sh +--- dracut-034.orig/dracut-initramfs-restore.sh ++++ dracut-034/dracut-initramfs-restore.sh @@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)" if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -118,9 +118,9 @@ cd /run/initramfs ---- dracut-033.orig/dracut.sh -+++ dracut-033/dracut.sh -@@ -507,7 +507,7 @@ if ! [[ $outfile ]]; then +--- dracut-034.orig/dracut.sh ++++ dracut-034/dracut.sh +@@ -513,7 +513,7 @@ if ! [[ $outfile ]]; then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" else @@ -129,9 +129,9 @@ fi fi ---- dracut-033.orig/mkinitrd-dracut.sh -+++ dracut-033/mkinitrd-dracut.sh -@@ -11,7 +11,7 @@ usage () { +--- dracut-034.orig/mkinitrd-dracut.sh ++++ dracut-034/mkinitrd-dracut.sh +@@ -16,7 +16,7 @@ usage () { $cmd " [--nocompress]" $cmd " <initrd-image> <kernel-version>" $cmd "" @@ -140,8 +140,8 @@ [[ $1 = '-n' ]] && exit 0 exit 1 ---- dracut-033.orig/lsinitrd.1.asc -+++ dracut-033/lsinitrd.1.asc +--- dracut-034.orig/lsinitrd.1.asc ++++ dracut-034/lsinitrd.1.asc @@ -18,7 +18,7 @@ DESCRIPTION ----------- lsinitrd shows the contents of an initramfs image. if <image> is omitted, then @@ -151,8 +151,8 @@ OPTIONS ------- ---- dracut-033.orig/lsinitrd.sh -+++ dracut-033/lsinitrd.sh +--- dracut-034.orig/lsinitrd.sh ++++ dracut-034/lsinitrd.sh @@ -84,7 +84,7 @@ else && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -162,8 +162,8 @@ fi fi ---- dracut-033.orig/51-dracut-rescue-postinst.sh -+++ dracut-033/51-dracut-rescue-postinst.sh +--- dracut-034.orig/51-dracut-rescue-postinst.sh ++++ dracut-034/51-dracut-rescue-postinst.sh @@ -18,7 +18,7 @@ fi [[ $MACHINE_ID ]] || exit 1 [[ -f $KERNEL_IMAGE ]] || exit 1 ++++++ use_sysconfig_values_correctly.patch ++++++ --- /var/tmp/diff_new_pack.6RotZ9/_old 2013-10-17 14:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6RotZ9/_new 2013-10-17 14:01:59.000000000 +0200 @@ -1,5 +1,5 @@ ---- dracut-033.orig/modules.d/10i18n/module-setup.sh -+++ dracut-033/modules.d/10i18n/module-setup.sh +--- dracut-034.orig/modules.d/10i18n/module-setup.sh ++++ dracut-034/modules.d/10i18n/module-setup.sh @@ -160,6 +160,9 @@ install() { # Gentoo user may have KEYMAP set to something like "-u pl2", KEYMAP=${KEYMAP#-* } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
