Skip to content

Commit 428f756

Browse files
committed
BF: CS-2369 upgrade procedure logs "infotext: too few arguments"
1 parent 1f19dea commit 428f756

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

source/dist/util/install_modules/inst_common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ SetupSystemdSliceName()
23702370
fi
23712371
$INFOTEXT -u "\nSetting up systemd toplevel slice name"
23722372
$INFOTEXT -log "\nSetting up systemd toplevel slice name"
2373-
$INFOTEXT "%s will be running withing a top level systemd/cgroups slice,\ndefault is \"%s.slice\"." $DAEMON_NAME $SLICE_NAME
2373+
$INFOTEXT "The cluster daemons will be running within a top level systemd/cgroups slice,\ndefault is \"%s.slice\"." "$SLICE_NAME"
23742374
$INFOTEXT "If you are running multiple clusters on the same host,\nplease use a unique slice name.\n"
23752375
$INFOTEXT -n "Please enter the slice name (without the trailing .slice) or\nhit <RETURN> to use [%s] >> " $SLICE_NAME
23762376
SLICE_NAME=`Enter $SLICE_NAME`

source/dist/util/install_modules/inst_qmaster.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ SetSpoolingOptionsPostgres()
553553
# the file owner to match the process EUID, so a non-root qmaster
554554
# would silently fail authentication. Surface this to the operator
555555
# before the eventual MSG_POSTGRES_PASSFILEOWNER failure at startup.
556-
$INFOTEXT -w "Warning: %s is root-owned. chown it to the qmaster service" "$SPOOLING_PG_PASSFILE"
557-
$INFOTEXT -w " user before starting qmaster, or libpq will reject the file."
556+
$INFOTEXT -e "Warning: %s is root-owned. chown it to the qmaster service" "$SPOOLING_PG_PASSFILE"
557+
$INFOTEXT -e " user before starting qmaster, or libpq will reject the file."
558558
$INFOTEXT -log "Warning: %s is root-owned; libpq will reject it at qmaster startup." "$SPOOLING_PG_PASSFILE"
559559
fi
560560
# Wipe the cleartext from the installer's environment so any

0 commit comments

Comments
 (0)