aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-11-06 14:12:43 -0800
committerJordan Wilberding <[email protected]>2014-11-06 14:12:43 -0800
commitc603adf0a9e4b836c111a018bd5820d41c0a4e60 (patch)
tree8037c56f291528225d07592264ce4a20b629c581
parent75b44fa44ef70e078dd450bf68bfaea4d48bf4e3 (diff)
parent8774f34248fb2937f24e6e3c303e1e18e8173bd2 (diff)
downloadrelx-c603adf0a9e4b836c111a018bd5820d41c0a4e60.tar.gz
relx-c603adf0a9e4b836c111a018bd5820d41c0a4e60.tar.bz2
relx-c603adf0a9e4b836c111a018bd5820d41c0a4e60.zip
Merge pull request #261 from tsloughter/name_type
use short name for -sname and longname of -name in extended script
-rw-r--r--priv/templates/extended_bin.dtl9
1 files changed, 8 insertions, 1 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index ec4a8f3..6bf151a 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -117,7 +117,14 @@ case $NAME in
;;
*)
# Add @hostname
- NAME=$NAME@`hostname -f`
+ case $NAME_TYPE in
+ sname)
+ NAME=$NAME@`hostname -s`
+ ;;
+ name)
+ NAME=$NAME@`hostname -f`
+ ;;
+ esac
;;
esac