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