aboutsummaryrefslogtreecommitdiff
path: root/scripts/mkcompile_h
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-01-27 09:46:23 +0100
committerMichal Marek <mmarek@suse.cz>2010-02-02 14:33:56 +0100
commitd4987bd7ae8401bd88896a6f76dc7af31fe55732 (patch)
treeb34dcdc8e13b62c1e48ab18832ad3ed96a6f2d9f /scripts/mkcompile_h
parente66f25d7d1be19e177cf55126a40799757efae89 (diff)
downloadvexpress-lsk-d4987bd7ae8401bd88896a6f76dc7af31fe55732.tar.gz
scripts/mkcompile_h: don't test for hardcoded paths
Don't test for /bin/{dnsdomainname,domainname}, simply try to execute the command and check if it returned something. Reported-by: Glenn Sommer <glemsom@gmail.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Tested-by: Glenn Sommer <glemsom@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/mkcompile_h')
-rwxr-xr-xscripts/mkcompile_h5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 23dbad80cce..50ad317a4bf 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
echo \#define LINUX_COMPILE_BY \"`whoami`\"
echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
- if [ -x /bin/dnsdomainname ]; then
- domain=`dnsdomainname 2> /dev/null`
- elif [ -x /bin/domainname ]; then
+ domain=`dnsdomainname 2> /dev/null`
+ if [ -z "$domain" ]; then
domain=`domainname 2> /dev/null`
fi