From d256c45d539b5d09a45190da19779cde8358680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz> Date: Sat, 29 Jun 2019 10:42:42 +0200 Subject: [PATCH] Revert "patches/openwrt: drop patch accepted by upstream" This reverts commit 0d08badacfcaec100134dfa8f594283edbca964d. This patch wasn't sent to upstream yet. That is an error. --- ...sure-umount-doesn-t-break-on-restart.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 patches/openwrt/to-upstream/0014-base-files-Make-sure-umount-doesn-t-break-on-restart.patch diff --git a/patches/openwrt/to-upstream/0014-base-files-Make-sure-umount-doesn-t-break-on-restart.patch b/patches/openwrt/to-upstream/0014-base-files-Make-sure-umount-doesn-t-break-on-restart.patch new file mode 100644 index 000000000..292b8a6b8 --- /dev/null +++ b/patches/openwrt/to-upstream/0014-base-files-Make-sure-umount-doesn-t-break-on-restart.patch @@ -0,0 +1,32 @@ +From 97cc8ee9224265835de28f7f9d3d934ac928229e Mon Sep 17 00:00:00 2001 +From: Michal Hrusecky <michal.hrusecky@nic.cz> +Date: Mon, 3 Dec 2018 10:33:41 +0100 +Subject: [PATCH] base-files: Make sure umount doesn't break on restart + +Just to be on safe side, make sure that restart doesn't do anything when +triggering umount init script. + +Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz> +--- + package/base-files/files/etc/init.d/umount | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/package/base-files/files/etc/init.d/umount b/package/base-files/files/etc/init.d/umount +index 349b2b3264..d930a4d48b 100755 +--- a/package/base-files/files/etc/init.d/umount ++++ b/package/base-files/files/etc/init.d/umount +@@ -2,6 +2,11 @@ + # Copyright (C) 2006 OpenWrt.org + + STOP=99 ++ ++restart() { ++ : ++} ++ + stop() { + sync + /bin/umount -a -d -r +-- +2.19.2 + -- GitLab