commit 58d9125c31cec56cb33735ff88a9ba254b25119a
Author: Artur Frysiak <[email protected]>
Date: Wed Mar 27 23:21:16 2013 +0100
Up to 027
dracut.spec | 14 ++++++++++----
plymouth-libexec.patch | 12 ++++++------
systemd-paths.patch | 31 ++++++++++---------------------
3 files changed, 26 insertions(+), 31 deletions(-)
---
diff --git a/dracut.spec b/dracut.spec
index c3c3328..8491c6a 100644
--- 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: 026
-Release: 4
+Version: 027
+Release: 1
License: GPL v2+
Group: Base
Source0:
http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 269bfb2a0c755fe267ca3c1f5c9f7be0
+# Source0-md5: 37d791ca7e9c0fdc0bf8902f579b9e2b
Source1: pld.conf
Patch0: bash-sh.patch
Patch1: plymouth-libexec.patch
@@ -248,6 +248,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/03rescue
+%attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh
%dir %{dracutlibdir}/modules.d/04watchdog
%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
%dir %{dracutlibdir}/modules.d/05busybox
@@ -370,7 +372,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/dracut-pre-trigger.service.8*
%{_mandir}/man8/dracut-pre-udev.service.8*
%{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man8/udevadm-cleanup-db.service.8*
+%{_mandir}/man7/dracut.bootup.7.gz
+
+#/usr/lib/kernel/install.d/50-dracut.install
+#/usr/lib/kernel/install.d/51-dracut-rescue.install
+#/usr/share/bash-completion/completions/dracut
%files network
%defattr(644,root,root,755)
diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch
index 4c2c0e6..fb35e63 100644
--- a/plymouth-libexec.patch
+++ b/plymouth-libexec.patch
@@ -1,6 +1,6 @@
---- dracut-017/modules.d/./50plymouth/module-setup.sh~ 2012-03-23
00:34:27.000000000 +0200
-+++ dracut-017/modules.d/./50plymouth/module-setup.sh 2012-03-23
00:34:29.115606192 +0200
-@@ -35,12 +35,12 @@
+--- dracut-027/modules.d/50plymouth/module-setup.sh.wiget 2013-03-27
22:56:48.855517817 +0100
++++ dracut-027/modules.d/50plymouth/module-setup.sh 2013-03-27
22:59:42.251657247 +0100
+@@ -12,12 +12,12 @@ depends() {
}
install() {
@@ -11,8 +11,8 @@
. "$moddir"/plymouth-populate-initrd.sh
else
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
-- /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
-+ /usr/@lib@/plymouth/plymouth-populate-initrd -t $initdir
+- /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
++ /usr/@lib@/plymouth/plymouth-populate-initrd -t "$initdir"
fi
- inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
+ inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
diff --git a/systemd-paths.patch b/systemd-paths.patch
index 4728b96..70d1dc1 100644
--- a/systemd-paths.patch
+++ b/systemd-paths.patch
@@ -1,14 +1,3 @@
---- dracut-026/modules.d/98systemd/emergency.service~ 2013-03-08
07:07:48.000000000 +0100
-+++ dracut-026/modules.d/98systemd/emergency.service 2013-03-21
13:23:14.644737989 +0100
-@@ -17,7 +17,7 @@
- Environment=HOME=/
- WorkingDirectory=/
- ExecStart=/bin/dracut-emergency
--ExecStopPost=-/usr/bin/systemctl --no-block isolate dracut.target
-+ExecStopPost=-/bin/systemctl --no-block isolate dracut.target
- Type=oneshot
- StandardInput=tty-force
- StandardOutput=inherit
--- dracut-026/modules.d/98systemd/rescue.service~ 2013-03-08
07:07:48.000000000 +0100
+++ dracut-026/modules.d/98systemd/rescue.service 2013-03-21
13:23:51.761696508 +0100
@@ -17,7 +17,7 @@
@@ -20,14 +9,14 @@
Type=idle
StandardInput=tty-force
StandardOutput=inherit
---- dracut-023/modules.d/98systemd/udevadm-cleanup-db.service~ 2012-08-01
15:30:30.000000000 +0200
-+++ dracut-023/modules.d/98systemd/udevadm-cleanup-db.service 2013-03-21
20:22:21.089897000 +0100
-@@ -16,7 +16,7 @@
-
- [Service]
+--- dracut-027/modules.d/98systemd/emergency.service.wiget 2013-03-27
23:05:57.984373121 +0100
++++ dracut-027/modules.d/98systemd/emergency.service 2013-03-27
23:11:39.569991251 +0100
+@@ -17,7 +17,7 @@ Wants=systemd-vconsole-setup.service
+ Environment=HOME=/
+ WorkingDirectory=/
+ ExecStart=/bin/dracut-emergency
+-ExecStopPost=-/usr/bin/systemctl --fail --no-block default
++ExecStopPost=-/bin/systemctl --fail --no-block default
Type=oneshot
--ExecStart=-/usr/bin/udevadm info --cleanup-db
-+ExecStart=-/sbin/udevadm info --cleanup-db
- StandardInput=null
- StandardOutput=null
- StandardError=null
+ StandardInput=tty-force
+ StandardOutput=inherit
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dracut.git/commitdiff/58d9125c31cec56cb33735ff88a9ba254b25119a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
