janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

jcs.conf: Work around often disfunctional /usr/bin/hostname

Browse source 
/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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-10-28 10:13:43 +00:00
commit 5a85b5ce97
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/jcs/jcs.conf
View file

@ -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

2
scripts/jcs
View file

@ -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