[bacula/el5] Removed editing of config file on behalf of the user.

Simone Caronni slaanesh at fedoraproject.org
Fri Aug 10 09:12:25 UTC 2012


commit 9458d6b0e07340d249c3097d464e40e124766157
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Aug 10 11:12:09 2012 +0200

    Removed editing of config file on behalf of the user.

 bacula.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index fe21448..98760a1 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 Summary:        Cross platform network backup for Linux, Unix, Mac and Windows
 Name:           bacula
 Version:        2.4.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.%{name}.org
@@ -763,12 +763,12 @@ fi
 %post director-common
 /sbin/chkconfig --add %{name}-dir
 # Replace bash script with perl one in config file(rhbz#456612)
-grep -q "make_catalog_backup.pl" /etc/bacula-dir.conf
-if [ ! $? -eq 0 ]; then
-    CATALOG=$(cat /etc/bacula-dir.conf | grep -A1 "^Catalog" | grep Name | awk '{print $3}')
-    sed -i -e "s|/usr/libexec/bacula/make_catalog_backup.*|/usr/libexec/bacula/make_catalog_backup.pl $CATALOG\"|g" \
-         /etc/bacula-dir.conf
-fi
+# grep -q "make_catalog_backup.pl" /etc/bacula-dir.conf
+# if [ ! $? -eq 0 ]; then
+#     CATALOG=$(cat /etc/bacula-dir.conf | grep -A1 "^Catalog" | grep Name | awk '{print $3}')
+#     sed -i -e "s|/usr/libexec/bacula/make_catalog_backup.*|/usr/libexec/bacula/make_catalog_backup.pl $CATALOG\"|g" \
+#          /etc/bacula-dir.conf
+# fi
 
 
 %preun director-common
@@ -969,6 +969,10 @@ fi
 
 
 %changelog
+* Fri Aug 10 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-10
+- Removed editing of the config file, leave as comments for reference.
+  (https://bugzilla.redhat.com/show_bug.cgi?id=456612#c11)
+
 * Fri Aug 10 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-9
 - Fixed changelog.
 - Added gtk labels patch for bgnome-console (rhbz#847131).


More information about the scm-commits mailing list