summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2013-02-02 00:19:54 +0100
committertv <tv@nomic.retiolum>2013-02-02 00:19:54 +0100
commitf2261f86c9d90cd2648ac6973358b6c8f5798673 (patch)
treeff1bff35b1ea354cdfb081a22805d0bc7734f6ff
parentf2992565ab8be0544ae328c3d11243131a3b7441 (diff)
parent453593943e41edc1b55372951af1e3b2768e59c0 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rwxr-xr-xretiolum/Makefile2
-rwxr-xr-xretiolum/bin/apply-custom-hosts-patches8
-rwxr-xr-xretiolum/bin/patch-retiolum-hosts13
3 files changed, 14 insertions, 9 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index f3424dea..b3a3c124 100755
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -29,4 +29,4 @@ startup:
hosts:
bin/update-retiolum-hosts || :;
- sudo bin/apply-custom-hosts-patches
+ sudo bin/patch-retiolum-hosts
diff --git a/retiolum/bin/apply-custom-hosts-patches b/retiolum/bin/apply-custom-hosts-patches
deleted file mode 100755
index 2b2fda80..00000000
--- a/retiolum/bin/apply-custom-hosts-patches
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-set -euf
-
-patch=/etc/tinc/retiolum/hosts.patch
-
-if test -e $patch; then
- patch -N -d /etc/tinc/retiolum/hosts -r - < $patch
-fi
diff --git a/retiolum/bin/patch-retiolum-hosts b/retiolum/bin/patch-retiolum-hosts
new file mode 100755
index 00000000..69d7b92c
--- /dev/null
+++ b/retiolum/bin/patch-retiolum-hosts
@@ -0,0 +1,13 @@
+#! /bin/sh
+#
+# Apply custom retiolum hosts patches, if any.
+#
+# usage: patch-retiolum-hosts [--reverse]
+#
+set -euf
+
+patch=/etc/tinc/retiolum/hosts.patch
+
+if test -e $patch; then
+ patch -N -d /etc/tinc/retiolum/hosts -r - "$@" < $patch
+fi