From: Marcin Krol Date: Fri, 7 Aug 2015 17:46:08 +0000 (+0000) Subject: - don't patch systemd specific files, we don't package them X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=44e06696bce4075bfb1228e831b556c4902ea01a;p=packages%2Fdracut.git - don't patch systemd specific files, we don't package them --- diff --git a/initrd-release.patch b/initrd-release.patch index be1d975..7a883ec 100644 --- a/initrd-release.patch +++ b/initrd-release.patch @@ -13,30 +13,6 @@ diff -ur dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh dracut-043/m ln -sf initrd-release $initdir/etc/os-release } -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline-ask.service dracut-043/modules.d/98dracut-systemd/dracut-cmdline-ask.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline-ask.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline-ask.service 2015-08-07 17:01:39.047090272 +0000 -@@ -13,7 +13,7 @@ - Before=dracut-cmdline.service - After=systemd-journald.socket - Wants=systemd-journald.socket --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionKernelCommandLine=rd.cmdline=ask - - [Service] -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.service dracut-043/modules.d/98dracut-systemd/dracut-cmdline.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.service 2015-08-07 17:01:43.389261760 +0000 -@@ -14,7 +14,7 @@ - Before=dracut-pre-udev.service - After=systemd-journald.socket - Wants=systemd-journald.socket --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionPathExistsGlob=|/etc/cmdline.d/*.conf - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cmdline - ConditionKernelCommandLine=|rd.break=cmdline diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh --- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-06-15 10:27:21.000000000 +0000 +++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh 2015-08-07 17:01:34.828982244 +0000 @@ -49,78 +25,6 @@ diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043 [ -n "$VERSION" ] && info "dracut-$VERSION" if ! getargbool 1 'rd.hostonly'; then -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-initqueue.service dracut-043/modules.d/98dracut-systemd/dracut-initqueue.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-initqueue.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-initqueue.service 2015-08-07 17:01:28.936035859 +0000 -@@ -15,7 +15,7 @@ - Wants=remote-fs-pre.target - After=systemd-udev-trigger.service - Wants=systemd-udev-trigger.service --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionPathExists=|/lib/dracut/need-initqueue - ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/*.sh - ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/settled/*.sh -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-mount.service dracut-043/modules.d/98dracut-systemd/dracut-mount.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-mount.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-mount.service 2015-08-07 17:01:51.992559672 +0000 -@@ -12,7 +12,7 @@ - Documentation=man:dracut-mount.service(8) - After=initrd-root-fs.target initrd-parse-etc.service - After=dracut-initqueue.service dracut-pre-mount.service --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/mount - ConditionKernelCommandLine=|rd.break=mount - -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-mount.service dracut-043/modules.d/98dracut-systemd/dracut-pre-mount.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-mount.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-pre-mount.service 2015-08-07 17:01:41.108120404 +0000 -@@ -14,7 +14,7 @@ - Before=initrd-root-fs.target sysroot.mount - After=dracut-initqueue.service - After=cryptsetup.target --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-mount - ConditionKernelCommandLine=|rd.break=pre-mount - -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-pivot.service dracut-043/modules.d/98dracut-systemd/dracut-pre-pivot.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-pivot.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-pre-pivot.service 2015-08-07 17:01:45.669399767 +0000 -@@ -15,7 +15,7 @@ - Before=initrd-cleanup.service - Wants=remote-fs.target - After=remote-fs.target --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-pivot - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cleanup - ConditionKernelCommandLine=|rd.break=pre-pivot -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-trigger.service dracut-043/modules.d/98dracut-systemd/dracut-pre-trigger.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-trigger.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-pre-trigger.service 2015-08-07 17:01:49.791458705 +0000 -@@ -14,7 +14,7 @@ - Before=systemd-udev-trigger.service dracut-initqueue.service - After=dracut-pre-udev.service systemd-udevd.service systemd-tmpfiles-setup-dev.service - Wants=dracut-pre-udev.service systemd-udevd.service --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-trigger - ConditionKernelCommandLine=|rd.break=pre-trigger - -diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-udev.service dracut-043/modules.d/98dracut-systemd/dracut-pre-udev.service ---- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-udev.service 2015-06-15 10:27:21.000000000 +0000 -+++ dracut-043/modules.d/98dracut-systemd/dracut-pre-udev.service 2015-08-07 17:01:47.669399123 +0000 -@@ -14,7 +14,7 @@ - Before=systemd-udevd.service dracut-pre-trigger.service - After=dracut-cmdline.service - Wants=dracut-cmdline.service --ConditionPathExists=/usr/lib/initrd-release -+ConditionPathExists=/etc/initrd-release - ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-udev - ConditionKernelCommandLine=|rd.break=pre-udev - ConditionKernelCommandLine=|rd.driver.blacklist diff -ur dracut-043.orig/modules.d/99base/dracut-lib.sh dracut-043/modules.d/99base/dracut-lib.sh --- dracut-043.orig/modules.d/99base/dracut-lib.sh 2015-06-15 10:27:21.000000000 +0000 +++ dracut-043/modules.d/99base/dracut-lib.sh 2015-08-07 17:00:50.435567301 +0000