diff options
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/icecream/icecream.SlackBuild | 6 | ||||
-rw-r--r-- | source/d/icecream/rc.icecream.conf | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild index aad5a1603..120c23c8a 100755 --- a/source/d/icecream/icecream.SlackBuild +++ b/source/d/icecream/icecream.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2009-2018 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=icecream SRCNAM=icecc VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -67,7 +67,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PKGNAM-$VERSION +rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.lz || exit 1 cd $SRCNAM-$VERSION || exit 1 diff --git a/source/d/icecream/rc.icecream.conf b/source/d/icecream/rc.icecream.conf index d0bfaadf0..2c1e0607c 100644 --- a/source/d/icecream/rc.icecream.conf +++ b/source/d/icecream/rc.icecream.conf @@ -5,7 +5,22 @@ # Defines the network name used to determine which nodes can be used for # the compile processes. That way you can have several icecream clusters # in the same network. -ICECC_NETWORK=$(hostname -d) +ICECC_NETWORK=$(hostname -d 2> /dev/null) + +# If /etc/HOSTNAME isn't relected in /etc/hosts or through DNS for any reason, +# then the default ICECC_NETWORK=$(hostname -d) won't be set. So if that +# variable is empty here, output an error message and exit so that the +# rc.iceccd script doesn't hang: +if [ "$ICECC_NETWORK" = "" ]; then + echo "ERROR: No network set in \$ICECC_NETWORK, so iceccd and/or icecc-scheduler" + echo "will be unable to start. Please make sure that the hostname in /etc/HOSTNAME" + echo "is reflected in /etc/hosts or through DNS. You should be able to run" + echo "'hostname -d' and see your network domain." + echo "This is the current output from 'hostname -d':" + echo $(hostname -d) + echo "Exiting..." + exit 1 +fi # Defines the options passed to icecc-scheduler: ICECC_SCHEDULER_OPTIONS="-n $ICECC_NETWORK -d -l /var/log/icecream/icecc-scheduler.log" |