diff --git a/dracut-040-add_systemd_journald_socket.patch b/dracut-040-add_systemd_journald_socket.patch new file mode 100644 index 0000000..76e01ee --- /dev/null +++ b/dracut-040-add_systemd_journald_socket.patch @@ -0,0 +1,18 @@ +--- a/modules.d/98systemd/module-setup.sh ++++ b/modules.d/98systemd/module-setup.sh +@@ -83,6 +83,7 @@ + $systemdsystemunitdir/systemd-udevd-kernel.socket \ + $systemdsystemunitdir/systemd-ask-password-plymouth.path \ + $systemdsystemunitdir/systemd-journald.socket \ ++ $systemdsystemunitdir/systemd-journald-audit.socket \ + $systemdsystemunitdir/systemd-ask-password-console.service \ + $systemdsystemunitdir/systemd-modules-load.service \ + $systemdsystemunitdir/systemd-halt.service \ +@@ -105,6 +106,7 @@ + $systemdsystemunitdir/sockets.target.wants/systemd-udevd-control.socket \ + $systemdsystemunitdir/sockets.target.wants/systemd-udevd-kernel.socket \ + $systemdsystemunitdir/sockets.target.wants/systemd-journald.socket \ ++ $systemdsystemunitdir/sockets.target.wants/systemd-journald-audit.socket \ + $systemdsystemunitdir/sockets.target.wants/systemd-journald-dev-log.socket \ + $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \ + $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \ \ No newline at end of file diff --git a/dracut.spec b/dracut.spec index 9f2b35a..2afef03 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,6 +1,6 @@ Name: dracut Version: 040 -Release: 5mamba +Release: 6mamba Summary: Generic, modular initramfs generation tool that can be used across various distributions Group: System/Kernel and Hardware Vendor: openmamba @@ -22,6 +22,7 @@ Patch18: dracut-040-fix-udevdir-detection.patch Patch19: dracut-040-no-gzip-rsyncable.patch Patch20: dracut-040-fix-autofs4-ipv6-modules.patch Patch21: dracut-040-dmsetup_fix_path.patch +Patch22: dracut-040-add_systemd_journald_socket.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -109,6 +110,7 @@ This package conatins extra optional modules for dracut. %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 chmod +x modules.d/99squash-live/* # remove *.orig files created by patched to prevent from being installed @@ -137,6 +139,15 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%posttrans +if [ $1 -ge 1 ]; then + KVER=`uname -r` + INITRAMFS=/boot/initramfs-$KVER.img + [ -e $INITRAMFS -a ${_sysconfdir}/dracut.conf -nt $INITRAMFS ] || continue + mkinitrd $INITRAMFS $KVER -f -q +fi +: + %files %defattr(-,root,root) %config %{_sysconfdir}/dracut.conf @@ -336,6 +347,10 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd #%doc NEWS README README.generic README.kernel README.modules TODO %changelog +* Fri Jan 30 2015 Silvan Calarco 040-6mamba +- upstream patch to fix systemd-journald errors at boot +- recreate initramfs in posttrans + * Sat Jan 17 2015 Silvan Calarco 040-5mamba - added patch to fix path of dmsetup