- Fix typo in installkernel script (bsc#1032576)

- Drop binutils dependency in favor of elfutils
* add 0512-Make-binutils-optional-when-elfutils-are-available.patch
old: openSUSE:Factory/dracut
new: Base:System/dracut rev 297
Index: dracut-installkernel
===================================================================
--- dracut-installkernel (revision 105)
+++ dracut-installkernel (revision 297)
@@ -75,7 +75,7 @@

cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION
cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION
-[ -f .config] && cp -fp .config $INSTALL_PATH/$CONFIGFILE
+[ -f .config ] && cp -fp .config $INSTALL_PATH/$CONFIGFILE


# If the kernel has module support, recreate modules.dep using depmod
Index: dracut.changes
===================================================================
--- dracut.changes (revision 105)
+++ dracut.changes (revision 297)
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Thu Apr 6 09:35:11 UTC 2017 - daniel.molkentin@suse.com
+
+- Fix typo in installkernel script (bsc#1032576)
+
+-------------------------------------------------------------------
+Mon Apr 3 13:30:20 UTC 2017 - daniel.molkentin@suse.com
+
+- Drop binutils dependency in favor of elfutils
+ * add 0512-Make-binutils-optional-when-elfutils-are-available.patch
+
+-------------------------------------------------------------------
Fri Mar 17 10:09:57 UTC 2017 - daniel.molkentin@suse.com

- 01fips: Make init on non-x86_64, specifically s390x, pass (bsc#1021687)
@@ -56,7 +67,7 @@
-------------------------------------------------------------------
Mon Jan 16 19:44:07 UTC 2017 - daniel.molkentin@suse.com

-- Add md4 and arc4 modules for ntlm authentication
+- Add md4 and arc4 modules for ntlm authentication
* add 0454-Add-md4-and-arc4-modules-for-ntlm.patch

-------------------------------------------------------------------
@@ -101,7 +112,7 @@

- systemd-initrd: Add initrd-root-device.target. Cherry-pick to get
systemd v230 into factory (bsc1009089)
- * add 0451-systemd-initrd-add-initrd-root-device.target.patch
+ * add 0451-systemd-initrd-add-initrd-root-device.target.patch

-------------------------------------------------------------------
Mon Nov 7 15:54:09 UTC 2016 - dmolkentin@suse.de
@@ -216,7 +227,7 @@
Wed Aug 31 19:06:19 UTC 2016 - trenn@suse.de

- Add missing whitespace for md raid suse kernel param parsing (bsc#970215)
-*modify: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch
+*modify: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch
- Fix IFS separater in net-lib.sh (bsc#996141)
*modify: 0125-40network-separate-mask-and-prefix.patch

@@ -257,7 +268,7 @@
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
* Add 0306-90multipath-add-shutdown-script.patch
-
+
-------------------------------------------------------------------
Tue Aug 23 13:36:18 CEST 2016 - hare@suse.de

@@ -651,7 +662,7 @@

- Always install dm-snaphost module if lvm dracut module is needed,
even if dm-snampshot is not loaded on the host yet (bsc#947518)
-A 0128-90lvm-Install-dm-snapshot-module.patch
+A 0128-90lvm-Install-dm-snapshot-module.patch

-------------------------------------------------------------------
Tue Oct 6 10:28:35 UTC 2015 - fvogt@suse.com
@@ -689,7 +700,7 @@

- Add patch 0182-fix-include-parsing.patch:
- Fix parsing of "-i" and "--include"
-- Fixes boo#908452
+- Fixes boo#908452

-------------------------------------------------------------------
Mon Sep 21 10:45:14 UTC 2015 - fvogt@suse.com
@@ -716,7 +727,7 @@
Fri Sep 11 11:06:46 UTC 2015 - fvogt@suse.com

- Add 0401-mount_option_mountpoint.patch:
- Make it possible to use a mountpoint as --mount parameter
+ Make it possible to use a mountpoint as --mount parameter

-------------------------------------------------------------------
Fri Sep 11 10:56:42 UTC 2015 - fvogt@suse.com
@@ -976,7 +987,7 @@
0102-Align-dev_unit_name-with-systemd-s-function.patch
0001-kernel-modules-Fix-storage-module-selection-for-sdhc.patch

-- Added dracut_v041_to_HEAD.patch: new patch from v041 against our git
+- Added dracut_v041_to_HEAD.patch: new patch from v041 against our git

-------------------------------------------------------------------
Fri Feb 27 18:37:56 UTC 2015 - sfalken@opensuse.org
@@ -984,7 +995,7 @@
- Add patch to load logitech-hidpp module in default initrd, fixes
issues with not being able to enter LUKS password with logitech
wireless keyboards (boo#918938)
- + Added: 0170-enable-logitech-hidpp.patch
+ + Added: 0170-enable-logitech-hidpp.patch

-------------------------------------------------------------------
Mon Feb 23 16:13:16 UTC 2015 - meissner@suse.com
@@ -1040,17 +1051,17 @@
-------------------------------------------------------------------
Wed Oct 15 16:07:47 UTC 2014 - trenn@suse.de

-- dracut-initrd-restore.patch: dracut-shutdown.service invokes
- dracut-initramfs-restore script which will never work in
+- dracut-initrd-restore.patch: dracut-shutdown.service invokes
+ dracut-initramfs-restore script which will never work in
openSUSE because initrd images are named initrd not initramfs.
Patch is from: Cristian Rodríguez
-* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
+* Add 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch

-------------------------------------------------------------------
Wed Oct 8 17:29:35 UTC 2014 - spargaonkar@suse.com

- Overwrite/generate modules.dep file using depmod since the file
- modules.dep is not portable across releases (bsc#874621).
+ modules.dep is not portable across releases (bsc#874621).

-------------------------------------------------------------------
Thu Oct 2 14:33:20 UTC 2014 - trenn@suse.de
@@ -1735,21 +1746,21 @@
-------------------------------------------------------------------
Wed Apr 9 16:47:27 UTC 2014 - crrodriguez@opensuse.org

-- Remove the bootchart module, note that we still keep
+- Remove the bootchart module, note that we still keep
the systemd-bootchart one which provides similar functionality.

-------------------------------------------------------------------
Wed Apr 9 16:42:49 UTC 2014 - crrodriguez@opensuse.org

-- Remove the busybox module we have all basic tools already
+- Remove the busybox module we have all basic tools already
in the initrd
-- _unitdir is always defined nowadays, remove the conditionals.
+- _unitdir is always defined nowadays, remove the conditionals.

-------------------------------------------------------------------
Wed Apr 9 14:48:12 UTC 2014 - sfalken@opensuse.org

- Replaced dracut tarball with proper upstream tarball
- Add: dracut-037.tar.xz
+ Add: dracut-037.tar.xz

-------------------------------------------------------------------
Tue Apr 8 10:16:16 CEST 2014 - hare@suse.de
@@ -1777,14 +1788,14 @@
-------------------------------------------------------------------
Thu Apr 3 23:59:31 UTC 2014 - crrodriguez@opensuse.org

-- revert last change, ucode-intel is not mandatory and
+- revert last change, ucode-intel is not mandatory and
will get installed by default anyway, either via patterns
or by modalias dependencies in the package itself.

-------------------------------------------------------------------
Thu Apr 3 19:07:30 UTC 2014 - crrodriguez@opensuse.org

-- Require package ucode-intel in x86*
+- Require package ucode-intel in x86*

-------------------------------------------------------------------
Tue Apr 1 06:23:28 UTC 2014 - nfbrown@suse.com
@@ -1812,7 +1823,7 @@
Fri Mar 14 19:49:38 UTC 2014 - rmilasan@suse.com

- Add support for 70-persistent-net.rules in dracut (bnc#868375)
- Add: dracut-install-persistent-rule.patch
+ Add: dracut-install-persistent-rule.patch

-------------------------------------------------------------------
Fri Mar 14 15:09:37 UTC 2014 - trenn@suse.de
@@ -1839,7 +1850,7 @@
* In case of no network related params are specified, but rd.neednet=1
is set, default initqueue action is to wait until one of the network
interfaces is marked as set up properly. (bnc#866771)
- * It also helps with initqueue's race condition when network interface
+ * It also helps with initqueue's race condition when network interface
shows up late.
- replace_dhclient_with_wickedd_dhcp_supplicants.patch:
Add a missing network setup flag. (bnc#866771)
@@ -1932,22 +1943,22 @@
-------------------------------------------------------------------
Thu Feb 13 06:28:01 UTC 2014 - sfalken@opensuse.org

--Added bug number to previous changelog entry
+-Added bug number to previous changelog entry

-------------------------------------------------------------------
Thu Feb 13 05:40:32 UTC 2014 - sfalken@opensuse.org

--Updated suse_grub_manpage.patch to further correct for incorrect grub configuration paths
+-Updated suse_grub_manpage.patch to further correct for incorrect grub configuration paths
bnc#858448
-------------------------------------------------------------------
Wed Feb 12 21:42:55 UTC 2014 - sfalken@opensuse.org

--Updated suse_grub_manpage.patch for dracut-036
+-Updated suse_grub_manpage.patch for dracut-036

-------------------------------------------------------------------
Wed Feb 12 12:48:16 UTC 2014 - sfalken@opensuse.org

--Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2
+-Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2

- removed patches:
* dracut_git_v034_to_head.patch
@@ -2011,7 +2022,7 @@
Rebase: 0013-Correct-paths-for-openSUSE.patch

This is a rename of dracut-git-update.patch to:
-Add: dracut_git_v034_to_head.patch
+Add: dracut_git_v034_to_head.patch

-------------------------------------------------------------------
Fri Dec 20 14:17:54 UTC 2013 - trenn@suse.de
@@ -2090,38 +2101,38 @@
-------------------------------------------------------------------
Thu Oct 17 02:22:43 UTC 2013 - crrodriguez@opensuse.org

-- remove use_all_paths_udev.patch, /lib/udev.. is a symlink
+- 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.

-------------------------------------------------------------------
Mon Oct 14 03:48:40 UTC 2013 - crrodriguez@opensuse.org

-- version 034
+- version 034
* fcoe: add FCoE UEFI boot device support
-* rootfs-block: add support for the rootfallback= kernel
+* rootfs-block: add support for the rootfallback= kernel
cmdline option
* btrfs: use inst_hook to install the timeout hook

-------------------------------------------------------------------
Sun Oct 13 15:25:37 UTC 2013 - tittiatcoke@gmail.com

-- Correct patch mkinitrd-fix-boot-dir-detection. (";;" doesn't
+- Correct patch mkinitrd-fix-boot-dir-detection. (";;" doesn't
really work)

-------------------------------------------------------------------
Wed Oct 9 10:59:01 UTC 2013 - tittiatcoke@gmail.com

-- Updated the patch mkinitrd-fix-boot-dir-detection.patch to a
- more generic validation that the inidcated initrd file doesn't
- contain a path. If no path is given, then add the default
+- Updated the patch mkinitrd-fix-boot-dir-detection.patch to a
+ more generic validation that the inidcated initrd file doesn't
+ contain a path. If no path is given, then add the default
boot_dir.

-------------------------------------------------------------------
Tue Oct 8 18:59:30 UTC 2013 - tittiatcoke@gmail.com

- Fix again the mkinitrd script as that people don't seem to test.
- Added mkinitrd-fix-boot-dir-detection.patch so that an initrd
+ Added mkinitrd-fix-boot-dir-detection.patch so that an initrd
is created.

-------------------------------------------------------------------
@@ -2147,20 +2158,20 @@
-------------------------------------------------------------------
Fri Oct 4 17:23:19 UTC 2013 - tittiatcoke@gmail.com

-- Add patch mkinitrd_update_bootloader.diff so that after
+- Add patch mkinitrd_update_bootloader.diff so that after
generating the initrd, the update-bootloader is called to update
grub2.

-------------------------------------------------------------------
Fri Oct 4 16:26:20 UTC 2013 - tittiatcoke@gmail.com

-- Validate that the parameters passed with -i (initrd file) does
+- Validate that the parameters passed with -i (initrd file) does
not already contain the boot_dir.

-------------------------------------------------------------------
Fri Oct 4 09:58:17 UTC 2013 - tittiatcoke@gmail.com

-- Bring back the versioned Provides/Obsoletes for mkinitrd.
+- Bring back the versioned Provides/Obsoletes for mkinitrd.
Otherwise we run into issues as that udev is conflicting with
mkinitrd < 2.7.0

@@ -2220,13 +2231,13 @@
-------------------------------------------------------------------
Sat Sep 21 17:36:13 UTC 2013 - crrodriguez@opensuse.org

-- save a few seconds on boot by always including the autofs4
+- save a few seconds on boot by always including the autofs4
kernel module in the initrd

-------------------------------------------------------------------
Sat Sep 21 17:31:15 UTC 2013 - crrodriguez@opensuse.org

-- dracut 033
+- dracut 033
- improved hostonly device recognition
- improved hostonly module recognition
- do not install udev rules from /etc in generic mode
@@ -2246,7 +2257,7 @@
-------------------------------------------------------------------
Mon Sep 9 00:23:56 UTC 2013 - crrodriguez@opensuse.org

-- version 032
+- version 032
- add parameter --print-cmdline
- dracut now creates the initramfs without udevadm
that means the udev database does not have to populated
@@ -2282,14 +2293,14 @@
-------------------------------------------------------------------
Sat Aug 3 07:10:55 UTC 2013 - tittiatcoke@gmail.com

-- Drop the buildrequire for the microcode_ctl. This package
- is no longer in Factory and with the latest kernel (3.11)
+- Drop the buildrequire for the microcode_ctl. This package
+ is no longer in Factory and with the latest kernel (3.11)
no longer required.

-------------------------------------------------------------------
Sun Jul 28 00:39:55 UTC 2013 - crrodriguez@opensuse.org

-- version 030_git201307241235
+- version 030_git201307241235
* systemd: Replace prefdm.service with display-manager.service
* modsign: do not install, if no keys present
* bcache: add support for bcache
@@ -2298,9 +2309,9 @@
-------------------------------------------------------------------
Sun Jul 21 17:17:58 UTC 2013 - tittiatcoke@gmail.com

-- Remove the http link for the Source0. Git snapshots can
- not be obtained that way.
-
+- Remove the http link for the Source0. Git snapshots can
+ not be obtained that way.
+
-------------------------------------------------------------------
Wed Jul 17 20:25:58 UTC 2013 - crrodriguez@opensuse.org

@@ -2310,12 +2321,12 @@
-------------------------------------------------------------------
Thu Jun 27 19:41:46 UTC 2013 - crrodriguez@opensuse.org

-- Require pigz instead of gzip
+- Require pigz instead of gzip

-------------------------------------------------------------------
Tue Jun 18 00:48:24 UTC 2013 - crrodriguez@opensuse.org

-- version 029
+- version 029
* fixes for the networking modules
* fixes for systemd integration
* fixes for the i18n module (removes dracut-font.patch now upstream)
@@ -2331,12 +2342,12 @@
-------------------------------------------------------------------
Wed May 8 23:05:40 UTC 2013 - crrodriguez@opensuse.org

-- Recommend pigz for faster/parallel compression
+- Recommend pigz for faster/parallel compression

-------------------------------------------------------------------
Sat Apr 20 14:55:20 UTC 2013 - crrodriguez@opensuse.org

-- Ensure we use display-manager.service instead of prefdm.
+- Ensure we use display-manager.service instead of prefdm.

-------------------------------------------------------------------
Mon Apr 15 00:59:59 UTC 2013 - crrodriguez@opensuse.org
@@ -2371,7 +2382,7 @@
- Update to 026_git201303180829
* bugfixes
* adds bash completion Support
-- Most importantly, fix the (silly) compatibility patch
+- Most importantly, fix the (silly) compatibility patch
that changes the name from initramfs to initrd that went broken
in last update (all initrds were suffixed by .img)

@@ -2399,7 +2410,7 @@
- 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
+- fixed udev rule installation

-------------------------------------------------------------------
Fri Feb 22 00:16:46 UTC 2013 - crrodriguez@opensuse.org
@@ -2422,7 +2433,7 @@
-------------------------------------------------------------------
Mon Jan 28 17:52:28 UTC 2013 - crrodriguez@opensuse.org

-- Require modutils instead of module-init-tools.
+- Require modutils instead of module-init-tools.

-------------------------------------------------------------------
Thu Jan 24 09:57:18 UTC 2013 - hrvoje.senjan@gmail.com
@@ -2439,29 +2450,29 @@
+ 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
+ + "--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
+ + lots of small bugfixes

-------------------------------------------------------------------
Thu Dec 6 20:15:41 UTC 2012 - crrodriguez@opensuse.org

- dracut wants "strip" installed which is part of binutils
- recommend that package
+ recommend that package

-------------------------------------------------------------------
Mon Nov 5 08:44:30 UTC 2012 - tittiatcoke@gmail.com

-- Added additional patches to make dracut work in an openSUSE
+- Added additional patches to make dracut work in an openSUSE
environment.

- Added patch (use_all_paths_udev.patch) to use both /usr/lib/udev
and /lib/udev as long as not all packages migrated.
-- Added patch (use_initrd_insteadof_initramfs.patch) to change
+- Added patch (use_initrd_insteadof_initramfs.patch) to change
the naming of the generated initrd file to be more openSUSE
-- Added patch (use_sysconfig_values_correctly.patch) to read the
+- Added patch (use_sysconfig_values_correctly.patch) to read the
correct keymap value from /etc/sysconfig. (.gz extension)

-------------------------------------------------------------------
@@ -2471,7 +2482,7 @@
+ new dracut option "--device"
+ new dracut kernel command line options "rd.auto"
+ new dracut kernel command line options "rd.noverifyssl"
- + new dracut option "--kernel-cmdline" and "kernel_cmdline"
+ + new dracut option "--kernel-cmdline" and "kernel_cmdline"
option for default parameters
+ fixes for systemd and crypto
+ fix for kexec in shutdown, if not included in initramfs
@@ -2481,7 +2492,7 @@
+ various FIPS fixes
+ various dracut-install fixes

-- Added patch (correct-paths-for-opensuse.patch) to ensure correct
+- Added patch (correct-paths-for-opensuse.patch) to ensure correct
paths for openSUSE (Plymouth)

-------------------------------------------------------------------
Index: dracut.spec
===================================================================
--- dracut.spec (revision 105)
+++ dracut.spec (revision 297)
@@ -191,6 +191,7 @@
Patch505: 0505-Allow-booting-from-degraded-MD-RAID-arrays.patch
Patch507: 0507-Set-TaskMax-inifinite-for-the-emergency-shell.patch
Patch508: 0508-90multipath-start-before-local-fs-pre.target.patch
+Patch512: 0512-Make-binutils-optional-when-elfutils-are-available.patch

BuildRequires: asciidoc
BuildRequires: bash
@@ -201,9 +202,9 @@
Requires: %{_bindir}/get_kernel_version
Requires: bash
# systemd-sysvinit provides: poweroff, reboot, halt
-Requires: binutils
Requires: coreutils
Requires: cpio
+Requires: elfutils
Requires: file
Requires: filesystem
Requires: findutils
@@ -406,6 +407,7 @@
%patch509 -p1
%patch510 -p1
%patch511 -p1
+%patch512 -p1

%build
%configure\
@@ -537,6 +539,9 @@
%ifarch %ix86 x86_64
%config %{_sysconfdir}/dracut.conf.d/02-early-microcode.conf
%endif
+%ifarch s390 s390x
+%config %{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf
+%endif

%{_mandir}/man8/dracut.8*
%{_mandir}/man8/mkinitrd.8*
Index: 0512-Make-binutils-optional-when-elfutils-are-available.patch
===================================================================
--- 0512-Make-binutils-optional-when-elfutils-are-available.patch (added)
+++ 0512-Make-binutils-optional-when-elfutils-are-available.patch (revision 297)
@@ -0,0 +1,51 @@
+From f8d2fa4312ba7989e30b60e5f287c91a1f4b7450 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin
+Date: Mon, 3 Apr 2017 15:23:37 +0200
+Subject: [PATCH] Make binutils optional when elfutils are available
+
+Binutils increase the size of initramfs by 36 MB. We only need "strip",
+which exists as eu-strip in elfutils, which in turn is < 1 MB in size.
+
+Note that the tests (TEST-04-FULL-SYSTEMD/test.sh) still depend on
+strip from binutils. It could use sstrip in the future.
+---
+ dracut.sh | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index d25da8e3..f4794d1d 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1624,7 +1624,11 @@ fi
+
+ # strip binaries
+ if [[ $do_strip = yes ]] ; then
+- for p in strip xargs find; do
++ # Prefer strip from elfutils for package size
++ declare strip_cmd=$(command -v eu-strip)
++ test -z "$strip_cmd" && strip_cmd="strip"
++
++ for p in $strip_cmd xargs find; do
+ if ! type -P $p >/dev/null; then
+ dinfo "Could not find '$p'. Not stripping the initramfs."
+ do_strip=no
+@@ -1636,14 +1640,14 @@ if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
+ dinfo "*** Stripping files ***"
+ find "$initdir" -type f \
+ -executable -not -path '*/lib/modules/*.ko' -print0 \
+- | xargs -r -0 strip -g 2>/dev/null
++ | xargs -r -0 $strip_cmd -g 2>/dev/null
+
+ # strip kernel modules, but do not touch signed modules
+ find "$initdir" -type f -path '*/lib/modules/*.ko' -print0 \
+ | while read -r -d $'\0' f || [ -n "$f" ]; do
+ SIG=$(tail -c 28 "$f" | tr -d '\000')
+ [[ $SIG == '~Module signature appended~' ]] || { printf "%s\000" "$f"; }
+- done | xargs -r -0 strip -g
++ done | xargs -r -0 $strip_cmd -g
+
+ dinfo "*** Stripping files done ***"
+ fi
+--
+2.12.0
+