summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLassulus <lassulus@googlemail.com>2012-12-28 01:27:41 +0100
committerLassulus <lassulus@googlemail.com>2012-12-28 01:27:41 +0100
commit98f66c758c1a5eaaacd0cd8ad7ecb742d8adae2f (patch)
treeca67d2bad6b69fd1e3d4ba9561cba9fa3ec09a18
parentb684671e4e5d729c423e43ea9333aec5012b28f4 (diff)
fixed os detection, readded set -f
-rwxr-xr-xretiolum/scripts/tinc_setup/new_install.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 90de1511..579ebff9 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -6,7 +6,7 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then
exec sudo -E "$0" "$@"
exit 23 # go to hell
fi
-set -eu
+set -euf
#
SUBNET4=${SUBNET4:-10.243}
SUBNET6=${SUBNET6:-42}
@@ -125,7 +125,7 @@ find_os()
OS=1
elif type getprop >/dev/null; then
OS=2
- elif grep -qe 'OpenWrt' /etc/*release 2>/dev/null; then
+ elif test -e /etc/openwrt_release; then
OS=3
else
echo "Cannot determine your operating system, falling back to Linux"