Skip to content

Commit 5495deb

Browse files
enable install-chef-suse from crowbar first installer
1 parent 5175e68 commit 5495deb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

scripts/install-chef-suse.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set -e
3030
usage () {
3131
# do not document --from-git option; it's for developers only
3232
cat <<EOF
33-
`basename $0` [-h|--help] [-v|--verbose] [-d|--debug]
33+
`basename $0` [-h|--help] [-v|--verbose] [-d|--debug] [-c|--crowbar]
3434
3535
Install Crowbar on administration server.
3636
EOF
@@ -42,6 +42,7 @@ while test $# -gt 0; do
4242
-h|--help|--usage|-\?) usage ;;
4343
-v|--verbose) CROWBAR_VERBOSE=1 ;;
4444
-d|--debug) CROWBAR_DEBUG=1 ;;
45+
-c|--crowbar) CROWBAR_WIZARD_MODE=1 && CROWBAR_VERBOSE=1 ;;
4546
--from-git) CROWBAR_FROM_GIT=1 ;;
4647
*) ;;
4748
esac
@@ -301,7 +302,7 @@ IPv4_addr=$( getent ahosts $FQDN 2>/dev/null | awk '{ if ($1 !~ /:/) { print $1;
301302

302303
echo_summary "Performing sanity checks"
303304

304-
if [ -n "$SSH_CONNECTION" -a -z "$STY" ]; then
305+
if [ -n "$SSH_CONNECTION" -a -z "$STY" ] && [ -z "$CROWBAR_WIZARD_MODE" ]; then
305306
die "Not running in screen. Please use \"screen $0\" to avoid problems during network re-configuration. Aborting."
306307
fi
307308

0 commit comments

Comments
 (0)