zrhoffman / rpms / 389-ds-base

Forked from rpms/389-ds-base 3 years ago
Clone

Blame SOURCES/0035-Ticket-49241-Update-man-page-and-usage-for-db2bak.pl.patch

74ca47
From cdcc387f6f1287da1edda418d746e6c2c772e5bd Mon Sep 17 00:00:00 2001
74ca47
From: Mark Reynolds <mreynolds@redhat.com>
74ca47
Date: Thu, 4 May 2017 15:44:51 -0400
74ca47
Subject: [PATCH] Ticket 49241 - Update man page and usage for db2bak.pl
74ca47
74ca47
Description:  The usage and man page should state thtthe backup directory
74ca47
              is actually a symlink to the the server's backup directory.
74ca47
              Otherwise it is misleading, and could eventaully lead to
74ca47
              diskspace issues.
74ca47
74ca47
https://pagure.io/389-ds-base/issue/49241
74ca47
74ca47
Reviewed by: firstyear(Thanks!)
74ca47
74ca47
(cherry picked from commit 0804c43991fa29ef7bd946b3e5a37844e2b87da4)
74ca47
---
74ca47
 ldap/admin/src/scripts/db2bak.pl.in | 4 ++--
74ca47
 man/man8/db2bak.pl.8                | 2 +-
74ca47
 2 files changed, 3 insertions(+), 3 deletions(-)
74ca47
74ca47
diff --git a/ldap/admin/src/scripts/db2bak.pl.in b/ldap/admin/src/scripts/db2bak.pl.in
74ca47
index c73caa1..73d4187 100644
74ca47
--- a/ldap/admin/src/scripts/db2bak.pl.in
74ca47
+++ b/ldap/admin/src/scripts/db2bak.pl.in
74ca47
@@ -33,8 +33,8 @@ sub usage {
74ca47
     print(STDERR "        -w -          - Prompt for Directory Manager's password\n");
74ca47
     print(STDERR "        -Z serverID   - Server instance identifier\n");
74ca47
     print(STDERR "        -j filename   - Read Directory Manager's password from file\n");
74ca47
-    print(STDERR "        -A backupdir  - Backup directory (backupdir/ID-<date_time>)\n");
74ca47
-    print(STDERR "        -a backupdir  - Backup directory\n");
74ca47
+    print(STDERR "        -A backupdir  - Backup directory symlink(backupdir/ID-<date_time>)\n");
74ca47
+    print(STDERR "        -a backupdir  - Backup directory symlink\n");
74ca47
     print(STDERR "        -t dbtype     - Database type (default: ldbm database)\n");
74ca47
     print(STDERR "        -P protocol   - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n");
74ca47
     print(STDERR "        -h            - Display usage\n");
74ca47
diff --git a/man/man8/db2bak.pl.8 b/man/man8/db2bak.pl.8
74ca47
index a752885..c51ccae 100644
74ca47
--- a/man/man8/db2bak.pl.8
74ca47
+++ b/man/man8/db2bak.pl.8
74ca47
@@ -47,7 +47,7 @@ The name of the file that contains the root DN password.
74ca47
 The backend database type (default: ldbm database).
74ca47
 .TP
74ca47
 .B \fB\-a\fR \fIbackupdir\fR
74ca47
-The directory where the backup should be stored.
74ca47
+The directory where the backup should be stored.  This directory is a symbolic link to the actual backup files located under "nsslapd-bakdir" directory that is set in the "cn=config" entry.
74ca47
 .TP
74ca47
 .B \fB\-A\fR \fIbackupdir\fR
74ca47
 This is similar to \fB-a\fR, except that a sub-directory of \fIbackupdir\fR will be created for the backup, and the name of the sub-directory will be a timestamp of the form \fIserver-instance-date_time\fR.
74ca47
-- 
74ca47
2.9.3
74ca47