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 <[email protected]> Acked-by: WANG Cong <[email protected]> Tested-by: Glenn Sommer <[email protected]> Signed-off-by: Michal Marek <[email protected]>
alkavan · Feb 2, 2010 · d4987bd · d4987bd
1 parent e66f25d
commit d4987bd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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