Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-01-14 13:37:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-01-03
19:43:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-01-14
13:37:46.000000000 +0100
@@ -1,0 +2,32 @@
+Mon Jan 13 17:52:51 UTC 2014 - tr...@suse.de
+
+Exit without calling update-bootloader (bnc#858268):
+Add: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
+
+Adding:
+Requires: systemd-sysvinit
+which has reboot, halt and other binaries dracut likes to add to the initrd.
+
+Cleanup and adjust to latest mainline:
+Dropping as these are included in the latest update_git_v034_to_head patch:
+Drop: 0001-95dasd-Install-kernel-modules-only-once.patch
+Drop: 0002-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch
+Drop: 0003-95dasd_mod-make-dasd_cio_free-optional.patch
+Drop: 0004-95zfcp-Make-installation-optional.patch
+Drop: 0005-95znet-Make-installation-optional.patch
+Drop: 0007-Fixup-keymap-setting-for-openSUSE.patch
+Drop: 0008-Add-DASD-configuration-for-SuSE.patch
+Drop: 0009-Add-zfcp-scripts-for-SUSE.patch
+Drop: 0010-Make-logfile-configurable.patch
+Drop: 0011-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch
+Drop: 0012-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch
+Drop: 0015-Fixup-script-permissions.patch
+Drop: 0016-Remove-shebang-from-shell-completion-files.patch
+Drop: dracut-git-update.patch
+
+Rebase: 0013-Correct-paths-for-openSUSE.patch
+
+This is a rename of dracut-git-update.patch to:
+Add: dracut_git_v034_to_head.patch
+
+-------------------------------------------------------------------
Old:
----
0001-95dasd-Install-kernel-modules-only-once.patch
0002-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch
0003-95dasd_mod-make-dasd_cio_free-optional.patch
0004-95zfcp-Make-installation-optional.patch
0005-95znet-Make-installation-optional.patch
0007-Fixup-keymap-setting-for-openSUSE.patch
0008-Add-DASD-configuration-for-SuSE.patch
0009-Add-zfcp-scripts-for-SUSE.patch
0010-Make-logfile-configurable.patch
0011-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch
0012-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch
0015-Fixup-script-permissions.patch
0016-Remove-shebang-from-shell-completion-files.patch
dracut-git-update.patch
New:
----
dracut_do_not_update_booloader_if_no_kernel_is_found.patch
dracut_git_v034_to_head.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.mbi7Zf/_old 2014-01-14 13:37:47.000000000 +0100
+++ /var/tmp/diff_new_pack.mbi7Zf/_new 2014-01-14 13:37:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dracut
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -35,27 +35,12 @@
Source4: purge-kernels
Source5: purge-kernels.service
-Patch0: dracut-git-update.patch
# S/390 fixes, send to upstream
-Patch1: 0001-95dasd-Install-kernel-modules-only-once.patch
-Patch2: 0002-95dasd-Only-install-module-if-normalize_dasd_arg-is-.patch
-Patch3: 0003-95dasd_mod-make-dasd_cio_free-optional.patch
-Patch4: 0004-95zfcp-Make-installation-optional.patch
-Patch5: 0005-95znet-Make-installation-optional.patch
-Patch6: 0006-Install-bin-mount.patch
-Patch7: 0007-Fixup-keymap-setting-for-openSUSE.patch
-Patch8: 0008-Add-DASD-configuration-for-SuSE.patch
-Patch9: 0009-Add-zfcp-scripts-for-SUSE.patch
-Patch10: 0010-Make-logfile-configurable.patch
-Patch11: 0011-mkinitrd-suse-Add-SUSE-compability-wrapper-for-dracu.patch
-Patch12: 0012-mkinitrd-suse.8.asc-Add-manpage-for-SUSE-compat-mkin.patch
-
-# SUSE specific patches
-Patch20: 0013-Correct-paths-for-openSUSE.patch
-Patch21: 0014-Check-for-plymouth-lib-directories.patch
-Patch22: 0015-Fixup-script-permissions.patch
-Patch23: 0016-Remove-shebang-from-shell-completion-files.patch
-
+Patch1: dracut_git_v034_to_head.patch
+Patch10: 0006-Install-bin-mount.patch
+Patch11: 0013-Correct-paths-for-openSUSE.patch
+Patch12: 0014-Check-for-plymouth-lib-directories.patch
+Patch13: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
BuildRequires: bash
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,6 +66,8 @@
Requires: udev > 166
Requires: util-linux >= 2.21
Requires: xz
+# systemd-sysvinit provides: poweroff, reboot, halt
+Requires: systemd-sysvinit
Recommends: binutils
Recommends: logrotate
Requires: pigz
@@ -125,23 +112,11 @@
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
+%patch13 -p1
%build
%configure\
@@ -215,7 +190,6 @@
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
%{_bindir}/dracut
/sbin/purge-kernels
-%{_unitdir}/purge-kernels.service
/sbin/mkinitrd
/sbin/mkinitrd_setup
%{_bindir}/lsinitrd
@@ -337,6 +311,8 @@
%{dracutlibdir}/modules.d/95ssh-client
%{dracutlibdir}/modules.d/45ifcfg
%{dracutlibdir}/modules.d/95znet
+%{dracutlibdir}/modules.d/95fcoe-uefi
+%{dracutlibdir}/modules.d/99uefi-lib
%files caps
%defattr(-,root,root,0755)
++++++ 0013-Correct-paths-for-openSUSE.patch ++++++
--- /var/tmp/diff_new_pack.mbi7Zf/_old 2014-01-14 13:37:47.000000000 +0100
+++ /var/tmp/diff_new_pack.mbi7Zf/_new 2014-01-14 13:37:47.000000000 +0100
@@ -14,11 +14,11 @@
modules.d/98systemd/rescue.service | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/dracut.sh b/dracut.sh
-index 5f63d94..8680874 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -683,7 +683,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
+Index: dracut-034/dracut.sh
+===================================================================
+--- dracut-034.orig/dracut.sh
++++ dracut-034/dracut.sh
+@@ -683,7 +683,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
@@ -27,11 +27,11 @@
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
-diff --git a/modules.d/10i18n/module-setup.sh
b/modules.d/10i18n/module-setup.sh
-index f07b148..3854a38 100755
---- a/modules.d/10i18n/module-setup.sh
-+++ b/modules.d/10i18n/module-setup.sh
-@@ -102,6 +102,8 @@ install() {
+Index: dracut-034/modules.d/10i18n/module-setup.sh
+===================================================================
+--- dracut-034.orig/modules.d/10i18n/module-setup.sh
++++ dracut-034/modules.d/10i18n/module-setup.sh
+@@ -98,6 +98,8 @@ install() {
install_base() {
inst_multiple setfont loadkeys kbd_mode stty
@@ -40,10 +40,10 @@
if ! dracut_module_included "systemd"; then
inst ${moddir}/console_init.sh /lib/udev/console_init
-diff --git a/modules.d/98systemd/rescue.service
b/modules.d/98systemd/rescue.service
-index edc2461..d80900f 100644
---- a/modules.d/98systemd/rescue.service
-+++ b/modules.d/98systemd/rescue.service
+Index: dracut-034/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
@@ -53,6 +53,3 @@
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f -- /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
---
-1.8.1.4
-
++++++ dracut_do_not_update_booloader_if_no_kernel_is_found.patch ++++++
Index: dracut-034/mkinitrd-suse.sh
===================================================================
--- dracut-034.orig/mkinitrd-suse.sh
+++ dracut-034/mkinitrd-suse.sh
@@ -291,7 +291,7 @@ while (($# > 0)); do
done
[[ $targets && $kernels ]] || default_kernel_images
-[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)
+[[ $targets && $kernels ]] || error "No kernel found in $boot_dir" && usage -n
# We can have several targets/kernels, transform the list to an array
targets=( $targets )
++++++ dracut_git_v034_to_head.patch ++++++
++++ 8857 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
