Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2013-04-24 16:04:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-21 10:38:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-04-24 16:04:46.000000000 +0200 @@ -1,0 +2,32 @@ +Sat Apr 20 14:55:20 UTC 2013 - crrodrig...@opensuse.org + +- Ensure we use display-manager.service instead of prefdm. + +------------------------------------------------------------------- +Mon Apr 15 00:59:59 UTC 2013 - crrodrig...@opensuse.org + +- Update to 027_git201304121327 +* much of patch correct-paths-for-opensuse.patch is no longer + need so it has shrinked significantly. +* since PRE-027 dracut requires systemd >= 199 reflect that in + in the rpm buildRequires. + +------------------------------------------------------------------- +Wed Apr 3 09:23:22 UTC 2013 - tittiatc...@gmail.com + +- dracut-027 + * systemd module now requires systemd >= 199 + * dracut makes use of native systemd initrd units + * added hooks for new-kernel-pkg and kernel-install + * hostonly is now default for fedora + * comply with the BootLoaderSpec paths + http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec + * added rescue module + * host_fs_types is now a hashmap + * new dracut argument "--regenerate-all" + * new dracut argument "--noimageifnotneeded" + * new man page dracut.bootup + * install all host filesystem drivers + * use -D_FILE_OFFSET_BITS=64 to build dracut-install + +------------------------------------------------------------------- Old: ---- dracut-026_git201303180829.tar.xz New: ---- dracut-027_git201304121327.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.Sx75fY/_old 2013-04-24 16:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Sx75fY/_new 2013-04-24 16:04:49.000000000 +0200 @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 026_git201303180829 +Version: 027_git201304121327 Release: 0 Summary: Initramfs generator using udev @@ -52,7 +52,7 @@ BuildRequires: asciidoc BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(systemd) >= 199 %if %{replace_mkinitrd} Obsoletes: mkinitrd <= 2.7.2 Provides: mkinitrd = 2.7.2 @@ -70,10 +70,12 @@ Requires: logrotate Requires: modutils Requires: sed +Requires: systemd > 198 Requires: udev > 166 Requires: util-linux >= 2.21 Requires: xz Recommends: binutils +%{?systemd_requires} %description Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. @@ -119,16 +121,14 @@ %patch3 -p1 %build -make all -e CFLAGS="%{optflags}" +%configure\ + --systemdsystemunitdir=%{_unitdir}\ + --bashcompletiondir=%{_sysconfdir}/bash_completion.d\ + --libdir=%{_prefix}/lib +make all -e CFLAGS="%{optflags}" %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} \ - libdir=%{_prefix}/lib \ - bindir=%{_bindir} \ -%if %{defined _unitdir} - systemdsystemunitdir=%{_unitdir} \ -%endif - sysconfdir=/etc mandir=%{_mandir} bashcompletiondir=%{_sysconfdir}/bash_completion.d +make %{?_smp_mflags} install DESTDIR=%{buildroot} echo "DRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh @@ -172,6 +172,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut +find %buildroot -type f -name "*.service" -exec sed -i -e 's@prefdm.service@display-manager.service@g' {} + + %clean rm -rf %{buildroot} @@ -203,13 +205,12 @@ %endif %{_mandir}/man7/dracut.kernel.7* %{_mandir}/man7/dracut.cmdline.7* +%{_mandir}/man7/dracut.bootup.7* %{_mandir}/man8/dracut-cmdline.service.8* %{_mandir}/man8/dracut-initqueue.service.8* -%{_mandir}/man8/dracut-initqueue.service.8* %{_mandir}/man8/dracut-pre-pivot.service.8* %{_mandir}/man8/dracut-pre-trigger.service.8* %{_mandir}/man8/dracut-pre-udev.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* @@ -273,8 +274,8 @@ %{dracutlibdir}/modules.d/99suse %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log -# %dir %{_localstatedir}/initramfs %if %{defined _unitdir} +%dir %{_unitdir}/initrd.target.wants %{_unitdir}/*.service %{_unitdir}/*/*.service %endif ++++++ correct-paths-for-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.Sx75fY/_old 2013-04-24 16:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Sx75fY/_new 2013-04-24 16:04:49.000000000 +0200 @@ -1,6 +1,8 @@ ---- dracut-026_git201303180829.orig/dracut.sh -+++ dracut-026_git201303180829/dracut.sh -@@ -621,7 +621,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l +Index: dracut-027_git201304121327/dracut.sh +=================================================================== +--- dracut-027_git201304121327.orig/dracut.sh ++++ dracut-027_git201304121327/dracut.sh +@@ -627,7 +627,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -9,8 +11,10 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l ---- dracut-026_git201303180829.orig/modules.d/10i18n/module-setup.sh -+++ dracut-026_git201303180829/modules.d/10i18n/module-setup.sh +Index: dracut-027_git201304121327/modules.d/10i18n/module-setup.sh +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/10i18n/module-setup.sh ++++ dracut-027_git201304121327/modules.d/10i18n/module-setup.sh @@ -85,6 +85,8 @@ install() { install_base() { @@ -20,17 +24,10 @@ if ! dracut_module_included "systemd"; then inst ${moddir}/console_init.sh /lib/udev/console_init ---- dracut-026_git201303180829.orig/modules.d/50plymouth/module-setup.sh -+++ dracut-026_git201303180829/modules.d/50plymouth/module-setup.sh -@@ -4,7 +4,7 @@ - - check() { - [[ "$mount_needs" ]] && return 1 -- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]] -+ [[ -x /usr/sbin/plymouthd && -x /usr/bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]] - } - - depends() { +Index: dracut-027_git201304121327/modules.d/50plymouth/module-setup.sh +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-027_git201304121327/modules.d/50plymouth/module-setup.sh @@ -12,12 +12,12 @@ depends() { } @@ -47,95 +44,10 @@ fi inst_hook emergency 50 "$moddir"/plymouth-emergency.sh ---- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-emergency.sh -+++ dracut-026_git201303180829/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-026_git201303180829.orig/modules.d/50plymouth/plymouth-newroot.sh -+++ dracut-026_git201303180829/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 - --if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then -- /bin/plymouth --newroot=$NEWROOT -+if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then -+ /usr/bin/plymouth --newroot=$NEWROOT - fi ---- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-populate-initrd.sh -+++ dracut-026_git201303180829/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) - --inst /sbin/plymouthd /bin/plymouthd --dracut_install /bin/plymouth \ -+inst /usr/sbin/plymouthd /usr/sbin/plymouthd -+dracut_install /usr/bin/plymouth \ - "${PLYMOUTH_LOGO_FILE}" \ - /etc/system-release - ---- dracut-026_git201303180829.orig/modules.d/50plymouth/plymouth-pretrigger.sh -+++ dracut-026_git201303180829/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 - --if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then -+if [ -x /usr/sbin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then - 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_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" -- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid -- /bin/plymouth --show-splash 2>&1 | vinfo -+ [ -x /usr/sbin/plymouthd ] && /usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid -+ /usr/bin/plymouth --show-splash 2>&1 | vinfo - # reset tty after plymouth messed with it - [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev" - fi ---- dracut-026_git201303180829.orig/modules.d/90crypt/crypt-lib.sh -+++ dracut-026_git201303180829/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. -- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then -- /bin/plymouth ask-for-password \ -+ if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping; then -+ /usr/bin/plymouth ask-for-password \ - --prompt "$ply_prompt" --number-of-tries=$ply_tries \ - --command="$ply_cmd" - ret=$? ---- dracut-026_git201303180829.orig/modules.d/90dmsquash-live/dmsquash-live-root.sh -+++ dracut-026_git201303180829/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 -- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash -+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash - 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 -- [ -x /bin/plymouth ] && /bin/plymouth --show-splash -+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash - fi - - ln -s $livedev /run/initramfs/livedev ---- dracut-026_git201303180829.orig/modules.d/90kernel-modules/module-setup.sh -+++ dracut-026_git201303180829/modules.d/90kernel-modules/module-setup.sh +Index: dracut-027_git201304121327/modules.d/90kernel-modules/module-setup.sh +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-027_git201304121327/modules.d/90kernel-modules/module-setup.sh @@ -74,7 +74,7 @@ installkernel() { } @@ -145,19 +57,23 @@ [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf if ! dracut_module_included "systemd"; then inst_hook cmdline 01 "$moddir/parse-kernel.sh" ---- dracut-026_git201303180829.orig/modules.d/95udev-rules/module-setup.sh -+++ dracut-026_git201303180829/modules.d/95udev-rules/module-setup.sh +Index: dracut-027_git201304121327/modules.d/95udev-rules/module-setup.sh +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-027_git201304121327/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 + [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir + for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do [ -x "$_i" ] || continue ---- dracut-026_git201303180829.orig/modules.d/98systemd/rescue.service -+++ dracut-026_git201303180829/modules.d/98systemd/rescue.service +Index: dracut-027_git201304121327/modules.d/98systemd/rescue.service +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/98systemd/rescue.service ++++ dracut-027_git201304121327/modules.d/98systemd/rescue.service @@ -14,7 +14,7 @@ DefaultDependencies=no [Service] Environment=HOME=/ ++++++ dracut-026_git201303180829.tar.xz -> dracut-027_git201304121327.tar.xz ++++++ ++++ 2744 lines of diff (skipped) ++++++ use_all_paths_udev.patch ++++++ --- /var/tmp/diff_new_pack.Sx75fY/_old 2013-04-24 16:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Sx75fY/_new 2013-04-24 16:04:49.000000000 +0200 @@ -1,6 +1,8 @@ ---- dracut-026_git201303180829.orig/dracut-functions.sh -+++ dracut-026_git201303180829/dracut-functions.sh -@@ -961,7 +961,7 @@ inst_rules() { +Index: dracut-027_git201304121327/dracut-functions.sh +=================================================================== +--- dracut-027_git201304121327.orig/dracut-functions.sh ++++ dracut-027_git201304121327/dracut-functions.sh +@@ -926,7 +926,7 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then ++++++ use_initrd_insteadof_initramfs.patch ++++++ --- /var/tmp/diff_new_pack.Sx75fY/_old 2013-04-24 16:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Sx75fY/_new 2013-04-24 16:04:49.000000000 +0200 @@ -1,5 +1,7 @@ ---- dracut-026_git201303180829.orig/dracut.8.asc -+++ dracut-026_git201303180829/dracut.8.asc +Index: dracut-027_git201304121327/dracut.8.asc +=================================================================== +--- dracut-027_git201304121327.orig/dracut.8.asc ++++ dracut-027_git201304121327/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,9 +20,11 @@ contains the kernel modules of the currently active kernel with version _++<kernel version>++_. ---- dracut-026_git201303180829.orig/dracut.asc -+++ dracut-026_git201303180829/dracut.asc -@@ -150,7 +150,7 @@ To create a initramfs image, the most si +Index: dracut-027_git201304121327/dracut.asc +=================================================================== +--- dracut-027_git201304121327.orig/dracut.asc ++++ dracut-027_git201304121327/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 functionality resulting of the combination of the installed dracut modules and @@ -29,7 +33,7 @@ contains the kernel modules of the currently active kernel with version _++<kernel version>++_. -@@ -190,12 +190,12 @@ kernel) as a fallback to rescue your sys +@@ -193,12 +193,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. ---- @@ -44,7 +48,7 @@ include ld.so.conf.d/*.conf ---- -@@ -206,7 +206,7 @@ _/etc/dracut.conf_ or _/etc/dracut.conf. +@@ -209,7 +209,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: ---- @@ -53,7 +57,7 @@ ---- To see a list of available dracut modules, use the --list-modules option: -@@ -235,7 +235,7 @@ automatically picked up by dracut, you h +@@ -238,7 +238,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>>): ---- @@ -62,7 +66,7 @@ ---- == Boot parameters -@@ -348,7 +348,7 @@ To add your own files to the initramfs i +@@ -351,7 +351,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 ---- @@ -71,7 +75,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. -@@ -370,7 +370,7 @@ rd.live.overlay/ +@@ -373,7 +373,7 @@ rd.live.overlay/ └── conf.d └── testvar.conf @@ -80,7 +84,7 @@ ---- This will put the contents of the rd.live.overlay directory into the root of the -@@ -382,7 +382,7 @@ creation time. +@@ -385,7 +385,7 @@ creation time. ---- @@ -89,7 +93,7 @@ ---- This will create an initramfs with the strace, fsck.ext3 and ssh executables, -@@ -434,7 +434,7 @@ For example for a NFS image, you would d +@@ -437,7 +437,7 @@ For example for a NFS image, you would d ---- @@ -98,7 +102,7 @@ ---- Then you would boot from this image with your target machine and reduce the size -@@ -442,7 +442,7 @@ once more by creating it on the target m +@@ -445,7 +445,7 @@ once more by creating it on the target m ---- @@ -107,8 +111,10 @@ ---- This will reduce the size of the initramfs image significantly. ---- dracut-026_git201303180829.orig/dracut-initramfs-restore.sh -+++ dracut-026_git201303180829/dracut-initramfs-restore.sh +Index: dracut-027_git201304121327/dracut-initramfs-restore.sh +=================================================================== +--- dracut-027_git201304121327.orig/dracut-initramfs-restore.sh ++++ dracut-027_git201304121327/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 +124,11 @@ cd /run/initramfs ---- dracut-026_git201303180829.orig/dracut.sh -+++ dracut-026_git201303180829/dracut.sh -@@ -478,7 +478,7 @@ if ! [[ $outfile ]]; then +Index: dracut-027_git201304121327/dracut.sh +=================================================================== +--- dracut-027_git201304121327.orig/dracut.sh ++++ dracut-027_git201304121327/dracut.sh +@@ -484,7 +484,7 @@ if ! [[ $outfile ]]; then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" else @@ -129,8 +137,10 @@ fi fi ---- dracut-026_git201303180829.orig/mkinitrd-dracut.sh -+++ dracut-026_git201303180829/mkinitrd-dracut.sh +Index: dracut-027_git201304121327/mkinitrd-dracut.sh +=================================================================== +--- dracut-027_git201304121327.orig/mkinitrd-dracut.sh ++++ dracut-027_git201304121327/mkinitrd-dracut.sh @@ -11,7 +11,7 @@ usage () { $cmd " [--nocompress]" $cmd " <initrd-image> <kernel-version>" @@ -140,8 +150,10 @@ [[ $1 = '-n' ]] && exit 0 exit 1 ---- dracut-026_git201303180829.orig/lsinitrd.1.asc -+++ dracut-026_git201303180829/lsinitrd.1.asc +Index: dracut-027_git201304121327/lsinitrd.1.asc +=================================================================== +--- dracut-027_git201304121327.orig/lsinitrd.1.asc ++++ dracut-027_git201304121327/lsinitrd.1.asc @@ -16,7 +16,7 @@ DESCRIPTION ----------- lsinitrd shows the contents of an initramfs image. if <image> is omitted, then @@ -151,8 +163,10 @@ OPTIONS ------- ---- dracut-026_git201303180829.orig/lsinitrd.sh -+++ dracut-026_git201303180829/lsinitrd.sh +Index: dracut-027_git201304121327/lsinitrd.sh +=================================================================== +--- dracut-027_git201304121327.orig/lsinitrd.sh ++++ dracut-027_git201304121327/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" @@ -162,14 +176,16 @@ fi fi ---- dracut-026_git201303180829.orig/51-dracut-rescue-postinst.sh -+++ dracut-026_git201303180829/51-dracut-rescue-postinst.sh -@@ -10,7 +10,7 @@ KERNEL_IMAGE="$2" - [[ -f /etc/os-release ]] && . /etc/os-release - [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id - --INITRDFILE="/boot/initramfs-${MACHINE_ID}-rescue.img" -+INITRDFILE="/boot/initrd-${MACHINE_ID}-rescue" - [[ -f $INITRDFILE ]] && exit 0 +Index: dracut-027_git201304121327/51-dracut-rescue-postinst.sh +=================================================================== +--- dracut-027_git201304121327.orig/51-dracut-rescue-postinst.sh ++++ dracut-027_git201304121327/51-dracut-rescue-postinst.sh +@@ -18,7 +18,7 @@ fi + [[ $MACHINE_ID ]] || exit 1 + [[ -f $KERNEL_IMAGE ]] || exit 1 + +-INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img" ++INITRDFILE="/boot/initrd-0-rescue-${MACHINE_ID}" + NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}" - dropindirs_sort() + [[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0 ++++++ use_sysconfig_values_correctly.patch ++++++ --- /var/tmp/diff_new_pack.Sx75fY/_old 2013-04-24 16:04:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Sx75fY/_new 2013-04-24 16:04:49.000000000 +0200 @@ -1,5 +1,7 @@ ---- dracut-026_git201303180829.orig/modules.d/10i18n/module-setup.sh -+++ dracut-026_git201303180829/modules.d/10i18n/module-setup.sh +Index: dracut-027_git201304121327/modules.d/10i18n/module-setup.sh +=================================================================== +--- dracut-027_git201304121327.orig/modules.d/10i18n/module-setup.sh ++++ dracut-027_git201304121327/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
