From 9538ef6462981c62a703a87c218f0d9e0c76b184 Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Sun, 19 Feb 2012 19:48:05 +0100 Subject: [PATCH] Properly detect OpenWRT in global explorers Signed-off-by: Giel van Schijndel --- conf/explorer/lsb_codename | 15 +++++++++++---- conf/explorer/lsb_description | 15 +++++++++++---- conf/explorer/lsb_id | 15 +++++++++++---- conf/explorer/lsb_release | 15 +++++++++++---- conf/explorer/os | 5 +++++ conf/explorer/os_version | 3 +++ 6 files changed, 52 insertions(+), 16 deletions(-) diff --git a/conf/explorer/lsb_codename b/conf/explorer/lsb_codename index bc742cf7..22b6d51e 100755 --- a/conf/explorer/lsb_codename +++ b/conf/explorer/lsb_codename @@ -20,7 +20,14 @@ # set +e -lsb_release=$(which lsb_release 2>/dev/null) -if [ -x "$lsb_release" ]; then - $lsb_release --short --codename -fi +case "$($__explorer/os)" in + openwrt) + (. /etc/openwrt_release && echo "$DISTRIB_CODENAME") + ;; + *) + lsb_release=$(which lsb_release 2>/dev/null) + if [ -x "$lsb_release" ]; then + $lsb_release --short --codename + fi + ;; +esac diff --git a/conf/explorer/lsb_description b/conf/explorer/lsb_description index f6c30322..48aff30d 100755 --- a/conf/explorer/lsb_description +++ b/conf/explorer/lsb_description @@ -20,7 +20,14 @@ # set +e -lsb_release=$(which lsb_release 2>/dev/null) -if [ -x "$lsb_release" ]; then - $lsb_release --short --description -fi +case "$($__explorer/os)" in + openwrt) + (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION") + ;; + *) + lsb_release=$(which lsb_release 2>/dev/null) + if [ -x "$lsb_release" ]; then + $lsb_release --short --description + fi + ;; +esac diff --git a/conf/explorer/lsb_id b/conf/explorer/lsb_id index 6cb2359b..0dd0f9f4 100755 --- a/conf/explorer/lsb_id +++ b/conf/explorer/lsb_id @@ -20,7 +20,14 @@ # set +e -lsb_release=$(which lsb_release 2>/dev/null) -if [ -x "$lsb_release" ]; then - $lsb_release --short --id -fi +case "$($__explorer/os)" in + openwrt) + (. /etc/openwrt_release && echo "$DISTRIB_ID") + ;; + *) + lsb_release=$(which lsb_release 2>/dev/null) + if [ -x "$lsb_release" ]; then + $lsb_release --short --id + fi + ;; +esac diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release index a96ac50b..8266171a 100755 --- a/conf/explorer/lsb_release +++ b/conf/explorer/lsb_release @@ -20,7 +20,14 @@ # set +e -lsb_release=$(which lsb_release 2>/dev/null) -if [ -x "$lsb_release" ]; then - $lsb_release --short --release -fi +case "$($__explorer/os)" in + openwrt) + (. /etc/openwrt_release && echo "$DISTRIB_RELEASE") + ;; + *) + lsb_release=$(which lsb_release 2>/dev/null) + if [ -x "$lsb_release" ]; then + $lsb_release --short --release + fi + ;; +esac diff --git a/conf/explorer/os b/conf/explorer/os index 3f3ce266..e67d87ab 100755 --- a/conf/explorer/os +++ b/conf/explorer/os @@ -56,6 +56,11 @@ if [ -f /etc/gentoo-release ]; then exit 0 fi +if [ -f /etc/openwrt_version ]; then + echo openwrt + exit 0 +fi + if [ -f /etc/owl-release ]; then echo owl exit 0 diff --git a/conf/explorer/os_version b/conf/explorer/os_version index 73d3ecd7..8e6d37d3 100755 --- a/conf/explorer/os_version +++ b/conf/explorer/os_version @@ -45,6 +45,9 @@ case "$($__explorer/os)" in *bsd|solaris) uname -r ;; + openwrt) + cat /etc/openwrt_version + ;; owl) cat /etc/owl-release ;;