- up to 032

- updated plymouth-logo,prelink-libs patches

diff --git a/dracut.spec b/dracut.spec
index d99cece5b8058606fdcb4bc8edd6c158b865f536..02f098cf466b41f503dce27c31eee66411c0f510 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       030
+Version:       032
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 541c7f861b7fe64ae6114e546d75af4f
+# Source0-md5: 3e74a9429ea22bf4e92bf59c4ccdfe75
 Source1:       pld.conf
 Patch0:                bash-sh.patch
 Patch1:                plymouth-libexec.patch
@@ -253,6 +253,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/dracut-functions
 %attr(755,root,root) %{dracutlibdir}/dracut-logger.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore
+%dir %{dracutlibdir}/modules.d/00bash
+%attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh
 %dir %{dracutlibdir}/modules.d/00bootchart
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/00dash
@@ -261,6 +263,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/01bash
 %attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.sh
+%dir %{dracutlibdir}/modules.d/03modsign
+%attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
 %dir %{dracutlibdir}/modules.d/03rescue
 %attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh
 %dir %{dracutlibdir}/modules.d/04watchdog
@@ -279,6 +283,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
+%dir %{dracutlibdir}/modules.d/90bcache
+%attr(755,root,root) %{dracutlibdir}/modules.d/90bcache/module-setup.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh

diff --git a/plymouth-logo.patch b/plymouth-logo.patch
index 4daedad8fa4e81b3c38cce00a602e6048897f5c3..148428ce577322e6fa4c1801f353c6a9e0033e53 100644 (file)
--- a/plymouth-logo.patch
+++ b/plymouth-logo.patch
@@ -1,13 +1,13 @@
---- dracut-020/modules.d/50plymouth/plymouth-populate-initrd.sh~       2012-08-09 13:49:07.894845601 +0200
-+++ dracut-020/modules.d/50plymouth/plymouth-populate-initrd.sh        2012-08-09 13:50:43.211508906 +0200
-@@ -6,9 +6,10 @@
+--- dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh.orig   2013-08-26 21:31:12.615640993 +0200
++++ dracut-032/modules.d/50plymouth/plymouth-populate-initrd.sh        2013-08-27 15:35:36.416243854 +0200
+@@ -5,9 +5,10 @@
  PLYMOUTH_THEME=$(plymouth-set-default-theme)
  
- dracut_install plymouthd plymouth \
+ inst_multiple plymouthd plymouth \
 -    "${PLYMOUTH_LOGO_FILE}" \
      /etc/os-release
  
-+[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && dracut_install "${PLYMOUTH_LOGO_FILE}"
++[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && inst_multiple "${PLYMOUTH_LOGO_FILE}"
 +
  mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
  

diff --git a/prelink-libs.patch b/prelink-libs.patch
index 8db3952bac6f6ab2763b41d0ec9443b57ccb8e59..486e5f7662fc8ee0073d4a3248a8d65dad635537 100644 (file)
--- a/prelink-libs.patch
+++ b/prelink-libs.patch
@@ -1,15 +1,15 @@
---- dracut-029/dracut.sh~      2013-06-14 15:31:28.000000000 +0200
-+++ dracut-029/dracut.sh       2013-06-19 08:29:40.828089414 +0200
-@@ -1148,10 +1148,10 @@
+--- dracut-032/dracut.sh.orig  2013-08-27 15:36:03.692909358 +0200
++++ dracut-032/dracut.sh       2013-08-27 15:39:08.759568281 +0200
+@@ -1234,10 +1234,10 @@
  if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
      if [[ $DRACUT_FIPS_MODE ]]; then
          dinfo "*** Installing prelink files ***"
--        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
-+        dracut_install -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
+-        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
++        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache
      else
          dinfo "*** Pre-linking files ***"
--        dracut_install -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
-+        dracut_install -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
+-        inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
++        inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf
          chroot "$initdir" "$PRELINK_BIN" -a
-         rm -f "$initdir/$PRELINK_BIN"
-         rm -fr "$initdir"/etc/prelink.*
+         rm -f -- "$initdir/$PRELINK_BIN"
+         rm -fr -- "$initdir"/etc/prelink.*