From 5a85b5ce9772e38aa713e8d5d736f601b68c34ab Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 28 Oct 2018 10:13:43 +0000 Subject: [PATCH] jcs.conf: Work around often disfunctional /usr/bin/hostname /usr/bin/hostname often returns nonsense, especially during early phases of installation. Rely on the contents of /etc/hostname for determining jcs_dir Signed-off-by: Jan Lindemann --- conf/jcs/jcs.conf | 2 +- scripts/jcs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/jcs/jcs.conf b/conf/jcs/jcs.conf index f2b13d43..ae1f5f5d 100644 --- a/conf/jcs/jcs.conf +++ b/conf/jcs/jcs.conf @@ -1,4 +1,4 @@ -jcs_dir=$HOME/local/src/jw.dev/conf/janware/`hostname -s`/`/opt/jw-build/bin/get-os.sh` +jcs_dir=$HOME/local/src/jw.dev/conf/`sed 's|\([^.]\+\)\.\(.*\)|\2/\1|' /etc/hostname`/`/opt/jw-build/bin/get-os.sh` jcs_owner=root jcs_group=root jcs_log_dir=$jcs_dir/log diff --git a/scripts/jcs b/scripts/jcs index 252ce09b..df0e8551 100644 --- a/scripts/jcs +++ b/scripts/jcs @@ -2037,7 +2037,7 @@ JNT_JCSDIR=/tmp --<<<-- jcs.conf.oldstyle -- -->>>-- jcs.conf -- -jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/jw-build/bin/get-os.sh` +jcs_dir=$HOME/local/src/jw.dev/conf/`sed 's|\([^.]\+\)\.\(.*\)|\2/\1|' /etc/hostname`/`/opt/jw-build/bin/get-os.sh` jcs_owner=root jcs_group=root jcs_log_dir=$jcs_dir/log