|
 |
dc8c34 |
From 05caea1545fa3eaee25e719a2ecef0d97b9e7f38 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 11 Aug 2015 10:23:21 -0700
|
|
|
dc8c34 |
Subject: [PATCH 348/363] Ticket #48245 - Man pages and help for remove-ds.pl
|
|
|
dc8c34 |
doesn't display "-a" option
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: Adding the description for "-a" to the man page and the help usage.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/48245
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit a2dbb56ec5ad468972a41a500e1cdbb4ced01cb0)
|
|
|
dc8c34 |
(cherry picked from commit 06dafdfed1528ea6724f61492f4c93977a3ce809)
|
|
|
dc8c34 |
(cherry picked from commit b482c9fa2e4dc0d2280675a95e0a71af052f4fd8)
|
|
|
dc8c34 |
(cherry picked from commit 992541f1cadeed0a3e87ef7b2728429939b841ff)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/admin/src/scripts/remove-ds.pl.in | 5 +++--
|
|
|
dc8c34 |
man/man8/remove-ds.pl.8 | 5 ++++-
|
|
|
dc8c34 |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/scripts/remove-ds.pl.in b/ldap/admin/src/scripts/remove-ds.pl.in
|
|
|
dc8c34 |
index 5f42615..0e7dd0d 100755
|
|
|
dc8c34 |
--- a/ldap/admin/src/scripts/remove-ds.pl.in
|
|
|
dc8c34 |
+++ b/ldap/admin/src/scripts/remove-ds.pl.in
|
|
|
dc8c34 |
@@ -34,8 +34,9 @@ Getopt::Long::Configure(qw(bundling)); # bundling allows -ddddd
|
|
|
dc8c34 |
my $res = new Resource("@propertydir@/setup-ds.res");
|
|
|
dc8c34 |
|
|
|
dc8c34 |
sub usage {
|
|
|
dc8c34 |
- print(STDERR "Usage: $0 [-f] [-d -d ... -d] -i instance\n\n");
|
|
|
dc8c34 |
- print(STDERR " Opts: -f - force removal\n");
|
|
|
dc8c34 |
+ print(STDERR "Usage: $0 [-a] [-f] [-d -d ... -d] -i instance\n\n");
|
|
|
dc8c34 |
+ print(STDERR " Opts: -a - remove all\n");
|
|
|
dc8c34 |
+ print(STDERR " -f - force removal\n");
|
|
|
dc8c34 |
print(STDERR " -i instance - instance name to remove (e.g. - slapd-example)\n");
|
|
|
dc8c34 |
print(STDERR " -d - turn on debugging output\n");
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
diff --git a/man/man8/remove-ds.pl.8 b/man/man8/remove-ds.pl.8
|
|
|
dc8c34 |
index 3bcf1e0..bb38c46 100644
|
|
|
dc8c34 |
--- a/man/man8/remove-ds.pl.8
|
|
|
dc8c34 |
+++ b/man/man8/remove-ds.pl.8
|
|
|
dc8c34 |
@@ -19,7 +19,7 @@
|
|
|
dc8c34 |
remove\-ds.pl \- Remove an instance of Directory Server
|
|
|
dc8c34 |
.SH SYNOPSIS
|
|
|
dc8c34 |
.B remove-ds.pl
|
|
|
dc8c34 |
-[\-f] [\-d \-d ... \-d] \-i \fIinstance\fR
|
|
|
dc8c34 |
+[\-a] [\-f] [\-d \-d ... \-d] \-i \fIinstance\fR
|
|
|
dc8c34 |
.SH DESCRIPTION
|
|
|
dc8c34 |
Removes a Directory Server instance from the system. The instance
|
|
|
dc8c34 |
will be shutdown and the files will be removed. The certificate
|
|
|
dc8c34 |
@@ -33,6 +33,9 @@ will contain the retained certificate database files.
|
|
|
dc8c34 |
.SH OPTIONS
|
|
|
dc8c34 |
A summary of options is included below:
|
|
|
dc8c34 |
.TP
|
|
|
dc8c34 |
+.B \fB\-a\fR
|
|
|
dc8c34 |
+Removes all files and directories belonging to the instance
|
|
|
dc8c34 |
+.TP
|
|
|
dc8c34 |
.B \fB\-f\fR
|
|
|
dc8c34 |
Force removal
|
|
|
dc8c34 |
.TP
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
2.4.3
|
|
|
dc8c34 |
|