From d7c455a0ebe52297c6f64c9ed67100f571918a70 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Sep 16 2013 22:21:06 +0000 Subject: remove unused patches --- diff --git a/0001-RHEL-units-add-Install-section-to-tmp.mount.patch b/0001-RHEL-units-add-Install-section-to-tmp.mount.patch deleted file mode 100644 index d70f7a5..0000000 --- a/0001-RHEL-units-add-Install-section-to-tmp.mount.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2e987a0ac284a1cd1ab4f8e335abcae91c976f15 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Fri, 15 Feb 2013 09:07:57 +0100 -Subject: [PATCH] RHEL: units: add [Install] section to tmp.mount - -Related: #908253 ---- - units/tmp.mount | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/units/tmp.mount b/units/tmp.mount -index 99a3ba3..79e1c76 100644 ---- a/units/tmp.mount -+++ b/units/tmp.mount -@@ -18,3 +18,9 @@ What=tmpfs - Where=/tmp - Type=tmpfs - Options=mode=1777,strictatime -+ -+# tmp.mount is statically enabled in upstream. In RHEL tmp-on-tmpfs is not used -+# by default, but there are cases where it is necessary (anaconda, live images, -+# read-only root). Make 'systemctl enable tmp.mount' work: -+[Install] -+WantedBy=local-fs.target diff --git a/0002-kernel-install-add-fedora-specific-callouts-to-new-k.patch b/0002-kernel-install-add-fedora-specific-callouts-to-new-k.patch deleted file mode 100644 index ef90378..0000000 --- a/0002-kernel-install-add-fedora-specific-callouts-to-new-k.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b81d902a8ec4e81c6ddda0208307ee77d4e0858b Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 13 Mar 2013 07:57:53 +0100 -Subject: [PATCH] kernel-install: add fedora specific callouts to - new-kernel-pkg - ---- - src/kernel-install/kernel-install | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install -index fb2ee57..f491947 100644 ---- a/src/kernel-install/kernel-install -+++ b/src/kernel-install/kernel-install -@@ -19,6 +19,27 @@ - # You should have received a copy of the GNU Lesser General Public License - # along with systemd; If not, see . - -+if [[ -x /sbin/new-kernel-pkg ]]; then -+ [[ "$2" == *\+* ]] && flavor=-"${2##*+}" -+ case "$1" in -+ add) -+ /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$2" || exit $? -+ /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$2" || exit $? -+ /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$2" || exit $? -+ ;; -+ remove) -+ /sbin/new-kernel-pkg --package "kernel${flavor+-$flavor}" --rminitrd --rmmoddep --remove "$2" || exit $? -+ ;; -+ *) -+ ;; -+ esac -+ -+ # exit, if we can't find a boot loader spec conforming setup -+ if ! [[ -d /boot/loader/entries || -L /boot/loader/entries ]]; then -+ exit 0 -+ fi -+fi -+ - usage() - { - echo "Usage:" >&2