Backport some 5.1 changes to 5.0

diff --git a/bacula/platforms/alpha/bacula-fd.in b/bacula/platforms/alpha/bacula-fd.in
index 97fc2496136acb64adc4308f52ea5ad89e624341..74a12c00dd7dd541a515416de9f407e5211a5f32 100644 (file)
--- a/bacula/platforms/alpha/bacula-fd.in
+++ b/bacula/platforms/alpha/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  for Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ 
 #

diff --git a/bacula/platforms/bsdi/bacula-dir.in b/bacula/platforms/bsdi/bacula-dir.in
index e7e76b1618a2d83236be04e759a1e62d159e9df1..af7b0c5c1a8b2763e7f386a89036bc4560a21c5b 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-dir.in
+++ b/bacula/platforms/bsdi/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/bsdi/bacula-fd.in b/bacula/platforms/bsdi/bacula-fd.in
index 54f17b9a969110148cc13ff009bcddd2be2f8ab1..2c41b343253c4b34a4f1750948d55f6ca9ebc845 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-fd.in
+++ b/bacula/platforms/bsdi/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/bsdi/bacula-sd.in b/bacula/platforms/bsdi/bacula-sd.in
index fb55fb47cfd009917e53095da9bd389b640f8a95..9f4e6f0c7089fa7b1f845159834ac303b2e85699 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-sd.in
+++ b/bacula/platforms/bsdi/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/freebsd/bacula-dir.in b/bacula/platforms/freebsd/bacula-dir.in
index e7e76b1618a2d83236be04e759a1e62d159e9df1..af7b0c5c1a8b2763e7f386a89036bc4560a21c5b 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-dir.in
+++ b/bacula/platforms/freebsd/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/freebsd/bacula-fd.in b/bacula/platforms/freebsd/bacula-fd.in
index 54f17b9a969110148cc13ff009bcddd2be2f8ab1..2c41b343253c4b34a4f1750948d55f6ca9ebc845 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-fd.in
+++ b/bacula/platforms/freebsd/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/freebsd/bacula-sd.in b/bacula/platforms/freebsd/bacula-sd.in
index fb55fb47cfd009917e53095da9bd389b640f8a95..9f4e6f0c7089fa7b1f845159834ac303b2e85699 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-sd.in
+++ b/bacula/platforms/freebsd/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/gentoo/bacula-dir.in b/bacula/platforms/gentoo/bacula-dir.in
index 9ce3b0b6497100e2a0afba225d27be1d407175d8..a4cbca733d513fd4fb4769da4c2f9f68d7266ee9 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-dir.in
+++ b/bacula/platforms/gentoo/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon for the Gentoo release
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/gentoo/bacula-fd.in b/bacula/platforms/gentoo/bacula-fd.in
index 67e335ab77e1363d86c7da3b3e05c0e64d30d3ce..98e5efeb368845dd72c56a1f14071926fd699e39 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-fd.in
+++ b/bacula/platforms/gentoo/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon for the Gentoo release.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/gentoo/bacula-sd.in b/bacula/platforms/gentoo/bacula-sd.in
index 753416e1147308a871ca25d59d582bf8cb6316c4..26c6f745668ac4cb4950cdeb1b086b8223b5a4e2 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-sd.in
+++ b/bacula/platforms/gentoo/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon for the Gentoo release.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/irix/bacula-dir.in b/bacula/platforms/irix/bacula-dir.in
index e7e76b1618a2d83236be04e759a1e62d159e9df1..af7b0c5c1a8b2763e7f386a89036bc4560a21c5b 100755 (executable)
--- a/bacula/platforms/irix/bacula-dir.in
+++ b/bacula/platforms/irix/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/irix/bacula-fd.in b/bacula/platforms/irix/bacula-fd.in
index d7672d3f51565b837f91b733b4697d5a73261a20..671eb4b0c2211a596f538808d17219f4ce5d1ebe 100755 (executable)
--- a/bacula/platforms/irix/bacula-fd.in
+++ b/bacula/platforms/irix/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/irix/bacula-sd.in b/bacula/platforms/irix/bacula-sd.in
index fb55fb47cfd009917e53095da9bd389b640f8a95..9f4e6f0c7089fa7b1f845159834ac303b2e85699 100755 (executable)
--- a/bacula/platforms/irix/bacula-sd.in
+++ b/bacula/platforms/irix/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/mandrake/bacula-dir.in b/bacula/platforms/mandrake/bacula-dir.in
index 0f82a1a4a5f6bb5568938047ebc4c81dfb20bced..431244672cb8d7339acd7c6e80e8b1f063b6edc5 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-dir.in
+++ b/bacula/platforms/mandrake/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/mandrake/bacula-fd.in b/bacula/platforms/mandrake/bacula-fd.in
index a6f31e91985a00d0ad57b39103674cb1a5e6e011..c447fb159f451706392561317668c84639c5d441 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-fd.in
+++ b/bacula/platforms/mandrake/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/mandrake/bacula-sd.in b/bacula/platforms/mandrake/bacula-sd.in
index f496b14f882fe114fa40f31c071d00be2c828cc0..f0144dd955bf4b8ba9f10b17b506c3069a631a53 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-sd.in
+++ b/bacula/platforms/mandrake/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/mandrake/bacula.spec.bluca.in b/bacula/platforms/mandrake/bacula.spec.bluca.in
index 7f645fa8c7773febd681e07aad06db74653957ee..8f596c29ed95108f285028c672872e5dd498f293 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.bluca.in
+++ b/bacula/platforms/mandrake/bacula.spec.bluca.in
@@ -13,7 +13,7 @@
 %{?_with_wrap: %{expand: %%global TCPW 1}}
 %{?_without_wrap: %{expand: %%global TCPW 0}}
 
-%define blurb Bacula - It comes by night and sucks the vital essence from your computers.
+%define blurb Bacula - The Leading Open Source Backup Solution.
 
 Summary: Bacula - The Network Backup Solution
 Name: %{name}
@@ -146,25 +146,25 @@ mv doc/html-manual/*.gif doc/manual
 cd %{name}-%{version}
 %serverbuild
 %configure \
-       --enable-smartalloc \
+        --enable-smartalloc \
 %if %{MYSQL}
         --with-mysql \
 %else
         --with-sqlite \
 %endif
 %if %{GNOME}
-               --enable-gnome \
+                --enable-gnome \
 %endif
 %if %{TCPW}
-               --with-tcp-wrappers \
+                --with-tcp-wrappers \
 %endif
         --sysconfdir=%{_sysconfdir}/%{name} \
         --with-scriptdir=%{_libexecdir}/%{name} \
         --with-working-dir=%{_localstatedir}/%{name} \
         --with-subsys-dir=/var/lock/subsys \
-               --with-dir-password="#FAKE#DIR#PASSWORD#" \
-               --with-fd-password="#FAKE#FD#PASSWORD#" \
-               --with-sd-password="#FAKE#SD#PASSWORD#"
+                --with-dir-password="#FAKE#DIR#PASSWORD#" \
+                --with-fd-password="#FAKE#FD#PASSWORD#" \
+                --with-sd-password="#FAKE#SD#PASSWORD#"
 
 %make
 
@@ -246,27 +246,27 @@ rm -rf %{buildroot}
 %pre dir -p /usr/bin/perl
 umask(0077);
 if ( -f "%{_sysconfdir}/%{name}/.pw.sed") {
-       if ( -f "%{_sysconfdir}/%{name}/bacula-dir.conf") {
-       system "sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed";
-       system "sed -f %{_sysconfdir}/%{name}/.upw.sed %{_sysconfdir}/%{name}/bacula-dir.conf > %{_sysconfdir}/%{name}/bacula-dir.conf.tmp";
-       unlink "%{_sysconfdir}/%{name}/bacula-dir.conf";
-       rename "%{_sysconfdir}/%{name}/bacula-dir.conf.tmp", "%{_sysconfdir}/%{name}/bacula-dir.conf";
-       unlink "%{_sysconfdir}/%{name}/.upw.sed";
-       }
+        if ( -f "%{_sysconfdir}/%{name}/bacula-dir.conf") {
+        system "sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed";
+        system "sed -f %{_sysconfdir}/%{name}/.upw.sed %{_sysconfdir}/%{name}/bacula-dir.conf > %{_sysconfdir}/%{name}/bacula-dir.conf.tmp";
+        unlink "%{_sysconfdir}/%{name}/bacula-dir.conf";
+        rename "%{_sysconfdir}/%{name}/bacula-dir.conf.tmp", "%{_sysconfdir}/%{name}/bacula-dir.conf";
+        unlink "%{_sysconfdir}/%{name}/.upw.sed";
+        }
 } else {
-       mkdir("%{_sysconfdir}/%{name}");
-       open(IN, "/dev/random") or die "$!";
-       open(OUT, ">%{_sysconfdir}/%{name}/.pw.sed") or die "$!";
-       foreach $c ("DIR","SD","FD") {
-               read(IN, $buf, 32);
-               my $res = pack("u", $buf);
-               $res =~ s/^.//mg;
-               $res =~ s/\n//g;
-               $res =~ tr|` -_|AA-Za-z0-9+/|;
-               print OUT "s!#YOU MUST SET THE $c PASSWORD#!\"$res\"!\n";
-       }
-       close (IN);
-       close (OUT);
+        mkdir("%{_sysconfdir}/%{name}");
+        open(IN, "/dev/random") or die "$!";
+        open(OUT, ">%{_sysconfdir}/%{name}/.pw.sed") or die "$!";
+        foreach $c ("DIR","SD","FD") {
+                read(IN, $buf, 32);
+                my $res = pack("u", $buf);
+                $res =~ s/^.//mg;
+                $res =~ s/\n//g;
+                $res =~ tr|` -_|AA-Za-z0-9+/|;
+                print OUT "s!#YOU MUST SET THE $c PASSWORD#!\"$res\"!\n";
+        }
+        close (IN);
+        close (OUT);
 }
 
 %post dir
@@ -275,43 +275,43 @@ if ( -f "%{_sysconfdir}/%{name}/.pw.sed") {
 DB_VER=`mysql bacula -e 'select * from Version;'|tail -n 1 2>/dev/null`
 if [ -z "$DB_VER" ]; then
 # grant privileges and create tables
-       echo "Granting privileges for MySQL user bacula..."
-       %{_libexecdir}/%{name}/grant_mysql_privileges > dev/null
-       echo "Creating MySQL bacula database..."
-       %{_libexecdir}/%{name}/create_mysql_database > dev/null
-       echo "Creating bacula tables..."
-       %{_libexecdir}/%{name}/make_mysql_tables > dev/null
+        echo "Granting privileges for MySQL user bacula..."
+        %{_libexecdir}/%{name}/grant_mysql_privileges > dev/null
+        echo "Creating MySQL bacula database..."
+        %{_libexecdir}/%{name}/create_mysql_database > dev/null
+        echo "Creating bacula tables..."
+        %{_libexecdir}/%{name}/make_mysql_tables > dev/null
 elif [ "$DB_VER" -lt "6" ]; then
-       echo "Backing up bacula tables"
-       mysqldump -f --opt bacula | bzip2 > %{_localstatedir}/%{name}/bacula_backup.sql.bz2
-       echo "Upgrading bacula tables"
-       %{_libexecdir}/%{name}/alter_mysql_tables
-       echo "If bacula works correctly you can remove the backup file %{_localstatedir}/%{name}/bacula_backup.sql.bz2"
+        echo "Backing up bacula tables"
+        mysqldump -f --opt bacula | bzip2 > %{_localstatedir}/%{name}/bacula_backup.sql.bz2
+        echo "Upgrading bacula tables"
+        %{_libexecdir}/%{name}/alter_mysql_tables
+        echo "If bacula works correctly you can remove the backup file %{_localstatedir}/%{name}/bacula_backup.sql.bz2"
 fi
 %else
 if [ -s %{_localstatedir}/%{name}/bacula.db ]; then
 DB_VER=`echo "select * from Version;" | sqlite %{_localstatedir}/%{name}/bacula.db|tail -n 1 2>/dev/null`
-       if [ "$DB_VER" -lt "6" ]; then
-               echo "Backing up bacula tables"
-               echo ".dump" | sqlite %{_localstatedir}/%{name}/bacula.db | bzip2 > %{_localstatedir}/%{name}/bacula_backup.sql.bz2
-               echo "Upgrading bacula tables"
-               %{_libexecdir}/%{name}/alter_sqlite_tables
-               echo "If bacula works correctly you can remove the backup file %{_localstatedir}/%{name}/bacula_backup.sql.bz2"
-       fi
+        if [ "$DB_VER" -lt "6" ]; then
+                echo "Backing up bacula tables"
+                echo ".dump" | sqlite %{_localstatedir}/%{name}/bacula.db | bzip2 > %{_localstatedir}/%{name}/bacula_backup.sql.bz2
+                echo "Upgrading bacula tables"
+                %{_libexecdir}/%{name}/alter_sqlite_tables
+                echo "If bacula works correctly you can remove the backup file %{_localstatedir}/%{name}/bacula_backup.sql.bz2"
+        fi
 else
 # create the tables
-       echo "Creating bacula tables..."
-       %{_libexecdir}/%{name}/make_sqlite_tables > dev/null
+        echo "Creating bacula tables..."
+        %{_libexecdir}/%{name}/make_sqlite_tables > dev/null
 fi
 %endif
 chmod -R 600 %{_localstatedir}/%{name}/*
 for i in %{_sysconfdir}/%{name}/*.conf %{_sysconfdir}/%{name}/*.conf.rpmnew %{_sysconfdir}/%{name}/*.conf.rpmsave; do
-       if [ -s $i ]; then
-       sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
+        if [ -s $i ]; then
+        sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
 # this is needed if upgrading from 1.30a or lower
-       sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
-       rm -f $i.tmp
-       fi
+        sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
+        rm -f $i.tmp
+        fi
 done
 %_post_service bacula-dir
 
@@ -333,23 +333,23 @@ done
 umask 077
 i=%{_sysconfdir}/%{name}/bacula-fd.conf
 if [ -s %{_sysconfdir}/%{name}/.pw.sed -a -s $i ]; then
-       sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
-       sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
-       mv -f $i.tmp $i
-       rm -f %{_sysconfdir}/%{name}/.upw.sed
+        sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
+        sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
+        mv -f $i.tmp $i
+        rm -f %{_sysconfdir}/%{name}/.upw.sed
 fi
 
 %post fd
 %_post_service bacula-fd
 if [ -s %{_sysconfdir}/%{name}/.pw.sed ]; then
-       for i in %{_sysconfdir}/%{name}/bacula-fd.conf %{_sysconfdir}/%{name}/bacula-fd.conf.rpmnew %{_sysconfdir}/%{name}/bacula-fd.conf.rpmsave; do
-       if [ -s $i ]; then
-               sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
+        for i in %{_sysconfdir}/%{name}/bacula-fd.conf %{_sysconfdir}/%{name}/bacula-fd.conf.rpmnew %{_sysconfdir}/%{name}/bacula-fd.conf.rpmsave; do
+        if [ -s $i ]; then
+                sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
 # this is needed if upgrading from 1.30a or lower
-               sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
-               rm -f $i.tmp
-       fi
-       done
+                sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
+                rm -f $i.tmp
+        fi
+        done
 fi
 
 %preun fd
@@ -376,23 +376,23 @@ fi
 umask 077
 i=%{_sysconfdir}/%{name}/bacula-sd.conf
 if [ -s %{_sysconfdir}/%{name}/.pw.sed -a -s $i ]; then
-       sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
-       sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
-       mv -f $i.tmp $i
-       rm -f %{_sysconfdir}/%{name}/.upw.sed
+        sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
+        sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
+        mv -f $i.tmp $i
+        rm -f %{_sysconfdir}/%{name}/.upw.sed
 fi
 
 %post sd
 %_post_service bacula-sd
 if [ -s %{_sysconfdir}/%{name}/.pw.sed ]; then
-       for i in %{_sysconfdir}/%{name}/bacula-sd.conf %{_sysconfdir}/%{name}/bacula-sd.conf.rpmnew %{_sysconfdir}/%{name}/bacula-sd.conf.rpmsave; do
-       if [ -s $i ]; then
-               sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
+        for i in %{_sysconfdir}/%{name}/bacula-sd.conf %{_sysconfdir}/%{name}/bacula-sd.conf.rpmnew %{_sysconfdir}/%{name}/bacula-sd.conf.rpmsave; do
+        if [ -s $i ]; then
+                sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
 # this is needed if upgrading from 1.30a or lower
-               sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
-               rm -f $i.tmp
-       fi
-       done
+                sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
+                rm -f $i.tmp
+        fi
+        done
 fi
 
 %preun sd
@@ -411,22 +411,22 @@ fi
 umask 077
 i=%{_sysconfdir}/%{name}/console.conf
 if [ -s %{_sysconfdir}/%{name}/.pw.sed -a -s $i ]; then
-       sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
-       sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
-       mv -f $i.tmp $i
-       rm -f %{_sysconfdir}/%{name}/.upw.sed
+        sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
+        sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
+        mv -f $i.tmp $i
+        rm -f %{_sysconfdir}/%{name}/.upw.sed
 fi
 
 %post console
 if [ -s %{_sysconfdir}/%{name}/.pw.sed ]; then
-       for i in %{_sysconfdir}/%{name}/console.conf %{_sysconfdir}/%{name}/console.conf.rpmnew %{_sysconfdir}/%{name}/console.conf.rpmsave; do
-       if [ -s $i ]; then
-               sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
+        for i in %{_sysconfdir}/%{name}/console.conf %{_sysconfdir}/%{name}/console.conf.rpmnew %{_sysconfdir}/%{name}/console.conf.rpmsave; do
+        if [ -s $i ]; then
+                sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
 # this is needed if upgrading from 1.30a or lower
-               sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
-               rm -f $i.tmp
-       fi
-       done
+                sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
+                rm -f $i.tmp
+        fi
+        done
 fi
 
 %if %{GNOME}
@@ -447,25 +447,25 @@ fi
 umask 077
 i=%{_sysconfdir}/%{name}/gnome-console.conf
 if [ -s %{_sysconfdir}/%{name}/.pw.sed -a -s $i ]; then
-       sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
-       sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
-       mv -f $i.tmp $i
-       rm -f %{_sysconfdir}/%{name}/.upw.sed
+        sed -e 's/s!\(.*\)!\(.*\)!/s!\2!\1!/' %{_sysconfdir}/%{name}/.pw.sed > %{_sysconfdir}/%{name}/.upw.sed
+        sed -f %{_sysconfdir}/%{name}/.upw.sed $i > $i.tmp
+        mv -f $i.tmp $i
+        rm -f %{_sysconfdir}/%{name}/.upw.sed
 fi
 
 %post console-gnome
 %update_menus
 if [ -s %{_sysconfdir}/%{name}/.pw.sed ]; then
-       for i in %{_sysconfdir}/%{name}/gnome-console.conf %{_sysconfdir}/%{name}/gnome-console.conf.rpmnew %{_sysconfdir}/%{name}/gnome-console.conf.rpmsave; do
-       if [ -s $i ]; then
-               sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
+        for i in %{_sysconfdir}/%{name}/gnome-console.conf %{_sysconfdir}/%{name}/gnome-console.conf.rpmnew %{_sysconfdir}/%{name}/gnome-console.conf.rpmsave; do
+        if [ -s $i ]; then
+                sed -f %{_sysconfdir}/%{name}/.pw.sed $i > $i.tmp
 # this is needed if upgrading from 1.30a or lower
-               sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
-               rm -f $i.tmp
-       fi
-       done
+                sed -e '/SubSys[[:space:]]*Directory/I d' $i.tmp > $i
+                rm -f $i.tmp
+        fi
+        done
 fi
-               
+                
 %postun console-gnome
 %clean_menus
 

diff --git a/bacula/platforms/openbsd/bacula-dir.in b/bacula/platforms/openbsd/bacula-dir.in
index e7e76b1618a2d83236be04e759a1e62d159e9df1..af7b0c5c1a8b2763e7f386a89036bc4560a21c5b 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-dir.in
+++ b/bacula/platforms/openbsd/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/openbsd/bacula-fd.in b/bacula/platforms/openbsd/bacula-fd.in
index 54f17b9a969110148cc13ff009bcddd2be2f8ab1..2c41b343253c4b34a4f1750948d55f6ca9ebc845 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-fd.in
+++ b/bacula/platforms/openbsd/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/openbsd/bacula-sd.in b/bacula/platforms/openbsd/bacula-sd.in
index fb55fb47cfd009917e53095da9bd389b640f8a95..9f4e6f0c7089fa7b1f845159834ac303b2e85699 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-sd.in
+++ b/bacula/platforms/openbsd/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 0032b4823f7d15834c0d9acfa42fc1c7fb361687..06038560eaa64bbbb95deb9b559eeb7db8320d40 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 92 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index c7ff24779412368dc70295dcde239788f6e38b9f..ba9445397cb0cfe66b2f647d96fcda8ccc7db1d5 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 91 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index 9047785d7d7554d158749c11f985423aa2b9504a..ab5d8732c7a9546b8d21bcc08ba699624691faf8 100755 (executable)
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec
index bb84636fea7651ff2e54a746631d8736294a315d..2c57c6ebaf89c3f95d5e4faeb66b3a868d3b8eb9 100644 (file)
--- a/bacula/platforms/rpm/bacula-bat.spec
+++ b/bacula/platforms/rpm/bacula-bat.spec
@@ -1,12 +1,12 @@
 # Bacula RPM spec file
 #
-# Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
 # Platform Build Configuration
 
 # basic defines for every build
 %define _release           1
-%define _version           5.0.2
+%define _version           5.0.3
 %define depkgs_qt_version  28Jul09
 
 # this is the QT version in depkgs_qt
@@ -129,7 +129,7 @@ BuildRequires: freetype-devel
 %define depkgs_qt ../depkgs-qt
 
 # define the basic package description
-%define blurb Bacula - It comes by night and sucks the vital essence from your computers.
+%define blurb Bacula - The Leading Open Source Backup Solution.
 %define blurb2 Bacula is a set of computer programs that permit you (or the system
 %define blurb3 administrator) to manage backup, recovery, and verification of computer
 %define blurb4 data across a network of computers of different kinds. In technical terms,

diff --git a/bacula/platforms/rpm/bacula-docs.spec b/bacula/platforms/rpm/bacula-docs.spec
index d148eaad1064a00ca4d68b2d30e5628d4d03d233..e1d22cb610ca4a0c11e06d45c170ccf2ad4ae5da 100644 (file)
--- a/bacula/platforms/rpm/bacula-docs.spec
+++ b/bacula/platforms/rpm/bacula-docs.spec
@@ -1,12 +1,12 @@
 # Bacula RPM spec file
 #
-# Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+# Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
 # Platform Build Configuration
 
 # basic defines for every build
 %define _release           1
-%define _version           5.0.2
+%define _version           5.0.3
 %define _packager D. Scott Barninger <barninger@fairfieldcomputers.com>
 
 %define _prefix        /usr
@@ -41,7 +41,7 @@ Source: %{name}-%{_version}.tar.bz2
 %define _docsrc .
 
 # define the basic package description
-%define blurb Bacula - It comes by night and sucks the vital essence from your computers.
+%define blurb Bacula - The Leading Open Source Backup Solution.
 %define blurb2 Bacula is a set of computer programs that permit you (or the system
 %define blurb3 administrator) to manage backup, recovery, and verification of computer
 %define blurb4 data across a network of computers of different kinds. In technical terms,

diff --git a/bacula/platforms/rpm/bacula-mtx.spec b/bacula/platforms/rpm/bacula-mtx.spec
index f0b488aa7e09a35389d7543fe53b9c67a54a8b09..81709f5e9ce5f2fce09b57c8bcfec14c4ffb639b 100644 (file)
--- a/bacula/platforms/rpm/bacula-mtx.spec
+++ b/bacula/platforms/rpm/bacula-mtx.spec
@@ -6,7 +6,7 @@
 
 # basic defines for every build
 %define _release           1
-%define _version           5.0.2
+%define _version           5.0.3
 %define depkgs_version     18Feb09
 %define _packager D. Scott Barninger <barninger@fairfieldcomputers.com>
 

diff --git a/bacula/platforms/slackware/functions.bacula.in b/bacula/platforms/slackware/functions.bacula.in
index 11fe45f9f199c01bff4d6ec2b797f85396c58a6d..f9ef20bb5f3371f8ad997985b766f5462e4e7eb0 100644 (file)
--- a/bacula/platforms/slackware/functions.bacula.in
+++ b/bacula/platforms/slackware/functions.bacula.in
@@ -1,12 +1,12 @@
 #! /bin/sh
 #
 # bacula       This shell script takes care of starting and stopping
-#              the bacula daemons.
+#             the bacula daemons.
 #
 #   This is pretty much watered down version of the RedHat script
 #   that works on Solaris as well as Linux, but it won't work everywhere.
 #
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 
 PSCMD="@PSCMD@"
@@ -40,17 +40,17 @@ killproc() {
     RC=0
     # Test syntax.
     if [ $# = 0 ]; then
-        echo "Usage: killproc {program} [signal]"
-        return 1
+       echo "Usage: killproc {program} [signal]"
+       return 1
     fi
 
     notset=0
     # check for third arg to be kill level
     if [ "$3" != "" ] ; then
-        killlevel=$3
+       killlevel=$3
     else
-        notset=1
-        killlevel="-9"
+       notset=1
+       killlevel="-9"
     fi
 
     # Get base program name
@@ -61,39 +61,39 @@ killproc() {
 
     # Kill it.
     if [ "$pid" != "" ] ; then
-        if [ "$notset" = "1" ] ; then
-            if ps -p $pid>/dev/null 2>&1; then
-                # TERM first, then KILL if not dead
-                kill -TERM $pid 2>/dev/null
-                sleep 1
-                if ps -p $pid >/dev/null 2>&1 ; then
-                    sleep 1
-                    if ps -p $pid >/dev/null 2>&1 ; then
-                        sleep 3
-                        if ps -p $pid >/dev/null 2>&1 ; then
-                            kill -KILL $pid 2>/dev/null
-                        fi
-                    fi
-                fi
-             fi
-             ps -p $pid >/dev/null 2>&1
-             RC=$?
-             [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
-        #    RC=$((! $RC))
-        # use specified level only
-        else
-            if ps -p $pid >/dev/null 2>&1; then
-                kill $killlevel $pid 2>/dev/null
-                RC=$?
-                [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
-            fi
-        fi
+       if [ "$notset" = "1" ] ; then
+           if ps -p $pid>/dev/null 2>&1; then
+               # TERM first, then KILL if not dead
+               kill -TERM $pid 2>/dev/null
+               sleep 1
+               if ps -p $pid >/dev/null 2>&1 ; then
+                   sleep 1
+                   if ps -p $pid >/dev/null 2>&1 ; then
+                       sleep 3
+                       if ps -p $pid >/dev/null 2>&1 ; then
+                           kill -KILL $pid 2>/dev/null
+                       fi
+                   fi
+               fi
+            fi
+            ps -p $pid >/dev/null 2>&1
+            RC=$?
+            [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+       #    RC=$((! $RC))
+       # use specified level only
+       else
+           if ps -p $pid >/dev/null 2>&1; then
+               kill $killlevel $pid 2>/dev/null
+               RC=$?
+               [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
+           fi
+       fi
     else
-        failure "$base shutdown"
+       failure "$base shutdown"
     fi
     # Remove pid file if any.
     if [ "$notset" = "1" ]; then
-        rm -f ${PIDDIR}/$base.$2.pid
+       rm -f ${PIDDIR}/$base.$2.pid
     fi
     return $RC
 }
@@ -103,8 +103,8 @@ pidofproc() {
     pid=""
     # Test syntax.
     if [ $# = 0 ] ; then
-        echo "Usage: pidofproc {program}"
-        return 1
+       echo "Usage: pidofproc {program}"
+       return 1
     fi
 
     # Get base program name
@@ -112,11 +112,11 @@ pidofproc() {
 
     # First try PID file
     if [ -f ${PIDDIR}/$base.$2.pid ] ; then
-        pid=`head -1 ${PIDDIR}/$base.$2.pid`
-        if [ "$pid" != "" ] ; then
-            echo $pid
-            return 0
-        fi
+       pid=`head -1 ${PIDDIR}/$base.$2.pid`
+       if [ "$pid" != "" ] ; then
+           echo $pid
+           return 0
+       fi
     fi
 
     # Next try "pidof"
@@ -136,8 +136,8 @@ pidofproc() {
 status() {
     # Test syntax.
     if [ $# = 0 ] ; then
-        echo "Usage: status {program}"
-        return 1
+       echo "Usage: status {program}"
+       return 1
     fi
 
     # Get base program name
@@ -152,27 +152,27 @@ status() {
        return 0
    else
        pid=`${PSCMD} | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } 
-             { if ((prog == $2) || (("(" prog ")") == $2) ||
-                  (("[" prog "]") == $2) ||
-                  ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
+            { if ((prog == $2) || (("(" prog ")") == $2) ||
+                 (("[" prog "]") == $2) ||
+                 ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
        if [ "$pid" != "" ] ; then
-           echo "$base (pid $pid) is running..."
-           return 0
+          echo "$base (pid $pid) is running..."
+          return 0
        fi
    fi
 
     # Next try the PID files
     if [ -f ${PIDDIR}/$base.$2.pid ] ; then
-        pid=`head -1 ${PIDDIR}/$base.$2.pid`
-        if [ "$pid" != "" ] ; then
-            echo "$base not running, but pid file exists"
-            return 1
-        fi
+       pid=`head -1 ${PIDDIR}/$base.$2.pid`
+       if [ "$pid" != "" ] ; then
+           echo "$base not running, but pid file exists"
+           return 1
+       fi
     fi
     # See if the subsys lock exists
     if [ -f ${SUBSYSDIR}/$base ] ; then
-        echo "$base not running, but subsys locked"
-        return 2
+       echo "$base not running, but subsys locked"
+       return 2
     fi
     echo "$base is stopped"
     return 3
@@ -186,4 +186,3 @@ failure() {
   rc=$?
   return $rc
 }
-

diff --git a/bacula/platforms/slackware/rc.bacula-dir.in b/bacula/platforms/slackware/rc.bacula-dir.in
index dcda59307d980f2cfaaa6aebf4b98d6b390ff35a..3a613a9e7ec93f0615085cab57d2844b2013a4c8 100644 (file)
--- a/bacula/platforms/slackware/rc.bacula-dir.in
+++ b/bacula/platforms/slackware/rc.bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 92 99
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #
@@ -14,7 +14,7 @@
 
 case "$1" in
     start)
-        [ -x ${BACDIRBIN}/bacula-dir ] && { 
+       [ -x ${BACDIRBIN}/bacula-dir ] && { 
            sleep 2
            echo -n "Starting the Director daemon: "
            OPTIONS=''
@@ -27,27 +27,27 @@ case "$1" in
            fi
 
            ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     stop)
-        [ -x ${BACDIRBIN}/bacula-dir ] && {
+       [ -x ${BACDIRBIN}/bacula-dir ] && {
            echo -n "Stopping the Director daemon: "
            killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT}
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     restart)
-        $0 stop
-        sleep 5
-        $0 start
-        ;;
+       $0 stop
+       sleep 5
+       $0 start
+       ;;
     status)
-        [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT}
-        ;;
+       [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir ${DIR_PORT}
+       ;;
     *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-        ;;
+       echo "Usage: $0 {start|stop|restart|status}"
+       exit 1
+       ;;
 esac
 exit 0

diff --git a/bacula/platforms/slackware/rc.bacula-fd.in b/bacula/platforms/slackware/rc.bacula-fd.in
index 338b2cc4d176bad519aa4860925e06b29ba2993a..99a3c2db957ee39405b913818cb8cbe15372fcdc 100644 (file)
--- a/bacula/platforms/slackware/rc.bacula-fd.in
+++ b/bacula/platforms/slackware/rc.bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 91 99
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #
@@ -14,7 +14,7 @@
 
 case "$1" in
     start)
-        [ -x ${BACFDBIN}/bacula-fd ] && { 
+       [ -x ${BACFDBIN}/bacula-fd ] && { 
            sleep 2
            echo -n "Starting the File daemon: "
            OPTIONS=''
@@ -27,28 +27,27 @@ case "$1" in
            fi
 
            ${BACFDBIN}/bacula-fd $2 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     stop)
-        [ -x ${BACFDBIN}/bacula-fd ] && {
+       [ -x ${BACFDBIN}/bacula-fd ] && {
            echo -n "Stopping the File daemon: "
            killproc ${BACFDBIN}/bacula-fd ${FD_PORT}
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     restart)
-        $0 stop
-        sleep 5
-        $0 start
-        ;;
+       $0 stop
+       sleep 5
+       $0 start
+       ;;
     status)
-        [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT}
-        ;;
+       [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd ${FD_PORT}
+       ;;
     *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-        ;;
+       echo "Usage: $0 {start|stop|restart|status}"
+       exit 1
+       ;;
 esac
 exit 0
-

diff --git a/bacula/platforms/slackware/rc.bacula-sd.in b/bacula/platforms/slackware/rc.bacula-sd.in
index 5dbc707eec9ea040793ef5815e15853ccabd6c10..9c77a6ab7ec5288efcab4c0935b6c98539466b0b 100644 (file)
--- a/bacula/platforms/slackware/rc.bacula-sd.in
+++ b/bacula/platforms/slackware/rc.bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 99
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #
@@ -14,7 +14,7 @@
 
 case "$1" in
     start)
-        [ -x ${BACSDBIN}/bacula-sd ] && { 
+       [ -x ${BACSDBIN}/bacula-sd ] && { 
            sleep 2
            echo -n "Starting the Storage daemon: "
            OPTIONS=''
@@ -27,29 +27,28 @@ case "$1" in
            fi
 
            ${BACSDBIN}/bacula-sd $2 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     stop)
-        [ -x ${BACSDBIN}/bacula-sd ] && {
+       [ -x ${BACSDBIN}/bacula-sd ] && {
            echo -n "Stopping the Storage daemon: "
            killproc ${BACSDBIN}/bacula-sd ${SD_PORT}
-            echo Done.
-        }
-        ;;
+           echo Done.
+       }
+       ;;
     restart)
-        $0 stop
-        sleep 5
-        $0 start
-        ;;
+       $0 stop
+       sleep 5
+       $0 start
+       ;;
     status)
-        [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT}
-        ;;
+       [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd ${SD_PORT}
+       ;;
     *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-        ;;
+       echo "Usage: $0 {start|stop|restart|status}"
+       exit 1
+       ;;
 esac
 exit 0
 
-

diff --git a/bacula/platforms/solaris/bacula-dir.in b/bacula/platforms/solaris/bacula-dir.in
index 0563e44c0df16266114533fa1210892a32e1854d..f34e672bcb3a77ffee4b7ff775ef4907802cc276 100755 (executable)
--- a/bacula/platforms/solaris/bacula-dir.in
+++ b/bacula/platforms/solaris/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 92 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/solaris/bacula-fd.in b/bacula/platforms/solaris/bacula-fd.in
index 018dfe48d45818233f22195d79ccb5e21ecf7804..cd3bef1a37331e3ee8d0da31087fdecb8765a9eb 100755 (executable)
--- a/bacula/platforms/solaris/bacula-fd.in
+++ b/bacula/platforms/solaris/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 91 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/solaris/bacula-sd.in b/bacula/platforms/solaris/bacula-sd.in
index 9544f4918d823ba2324b98fbf8b7724d1e8397a3..6a0adb80a96e3696f927e03f7dd1d04b17e79e2f 100755 (executable)
--- a/bacula/platforms/solaris/bacula-sd.in
+++ b/bacula/platforms/solaris/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #

diff --git a/bacula/platforms/solaris/pkginfo b/bacula/platforms/solaris/pkginfo
index 006321361a8d1ed35b2b26bd67a6b5a77e0713dd..882566364e8732fee2669e483cca54f3cbf00baa 100644 (file)
--- a/bacula/platforms/solaris/pkginfo
+++ b/bacula/platforms/solaris/pkginfo
@@ -4,7 +4,7 @@ ARCH=sparc
 VERSION=2.2.5
 MAXINST=1
 CATEGORY=application
-DESC=Bacula - It comes by night and sucks the essence from your computers
+DESC=Bacula - The Leading Open Source Backup Solution.
 VENDOR=http://www.bacula.org
 HOTLINE=none
 EMAIL=christian.masopust@siemens.com

diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in
index 546ff5be40365b2dd29ed76bca34d7eeebfd9ebd..5402a0de16dc1d3a7666a43b61e5f1f00c6f1f9a 100755 (executable)
--- a/bacula/platforms/suse/bacula-dir.in
+++ b/bacula/platforms/suse/bacula-dir.in
@@ -4,7 +4,7 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in
index 5c9b17f7a47b24eec2832b1c44bdbc44578598f8..c14dd2e9c1c99f8bf8a7f526becf48ca96ccf3f4 100755 (executable)
--- a/bacula/platforms/suse/bacula-fd.in
+++ b/bacula/platforms/suse/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index 12838171a6a9b526002968db6a581d464e79254e..d2b3afd54011da772715266897de03bb0ff5f68c 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.in
@@ -4,7 +4,7 @@
 #             the bacula Storage daemon.
 #
 # chkconfig: 2345 90 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula.in b/bacula/platforms/suse/bacula.in
index e8d344dc9b56ef0cf813201ecfe9b61d662b86ad..6907794ac267df6712e3b6cee539b2b433905c66 100644 (file)
--- a/bacula/platforms/suse/bacula.in
+++ b/bacula/platforms/suse/bacula.in
@@ -9,7 +9,7 @@
 #   Submitted by Volker Sauer <volker@volker-sauer.de> 21Feb04
 #    Tweaked a bit by Kern to convert it to a .in file
 #
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 ### BEGIN INIT INFO
 # Provides:            bacula