From 45d2fd4b50227687ad042a0e17d8dcd9e4cd3023 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Oct 20 2017 15:11:21 +0000 Subject: Ticket 49407 - status-dirsrv shows ellipsed lines Bug Description: To show the full output you have to pass "-l" to systemctl, but there is no way to use this option with the current design. Fix Description: Just show the full lines by default, as adding options can break the script's current usage. https://pagure.io/389-ds-base/issue/49407 Reviewed by: tbordaz(Thanks!) --- diff --git a/ldap/admin/src/scripts/status-dirsrv.in b/ldap/admin/src/scripts/status-dirsrv.in index 9042899..8e492c1 100755 --- a/ldap/admin/src/scripts/status-dirsrv.in +++ b/ldap/admin/src/scripts/status-dirsrv.in @@ -37,7 +37,7 @@ status_instance() { # Use systemctl if available. # if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then - @bindir@/systemctl status @package_name@@$SERV_ID.service + @bindir@/systemctl status @package_name@@$SERV_ID.service -l rv=$? if [ $rv -ne 0 ]; then return 1 @@ -65,7 +65,7 @@ found=0 if [ $# -eq 0 ]; then # We're reporting the status of all instances. ret=0 - @bindir@/systemctl status @package_name@.target + @bindir@/systemctl status @package_name@.target -l initfiles=`get_initconfig_files $initconfig_dir` || { echo No instances found in $initconfig_dir ; exit 1 ; } for i in $initfiles; do inst=`normalize_server_id $i`