]> git.sur5r.net Git - bacula/bacula/commitdiff
Minor cleanups
authorKern Sibbald <kern@sibbald.com>
Sun, 11 May 2003 20:39:17 +0000 (20:39 +0000)
committerKern Sibbald <kern@sibbald.com>
Sun, 11 May 2003 20:39:17 +0000 (20:39 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@504 91ce42f0-d328-0410-95d8-f526ca767f89

16 files changed:
bacula/autoconf/configure.in
bacula/configure
bacula/kernstodo
bacula/platforms/redhat/.cvsignore
bacula/platforms/redhat/Makefile.in
bacula/platforms/redhat/bacula.spec.in [new file with mode: 0644]
bacula/scripts/.cvsignore
bacula/scripts/Makefile.in
bacula/scripts/bacula.desktop.gnome1.in [new file with mode: 0644]
bacula/scripts/bacula.desktop.gnome2.in [new file with mode: 0644]
bacula/scripts/gconsole.in
bacula/src/cats/Makefile.in
bacula/src/console/console.c
bacula/src/dird/dird.c
bacula/src/filed/filed.c
bacula/src/stored/stored.c

index bca45330c4f591973fb399cb61f44dd4026798fe..b0dacc2e421b675d1f300a4e87daa5dc404b10ad 100644 (file)
@@ -1270,9 +1270,7 @@ redhat)
            platforms/redhat/bacula-fd \
            platforms/redhat/bacula-sd \
            platforms/redhat/bacula-dir \
-           platforms/redhat/bacula.mysql.spec \
-           platforms/redhat/bacula.sqlite.spec \
-           platforms/redhat/bacula.sqlite.rel.spec \
+           platforms/redhat/bacula.spec \
            "
        hostname=`hostname -s`
   ;;
@@ -1378,6 +1376,8 @@ AC_OUTPUT([autoconf/Make.common \
           scripts/Makefile \
           scripts/logrotate \
           scripts/bacula.desktop \
+          scripts/bacula.desktop.gnome1 \
+          scripts/bacula.desktop.gnome2 \
           doc/Makefile \
           src/Makefile \
           src/console/Makefile \
index c4cd8d3135984cba7af66af80e4f23282591772e..f07781aa47aa0305096a1df54a097d5409e9a3a0 100755 (executable)
@@ -9512,9 +9512,7 @@ redhat)
            platforms/redhat/bacula-fd \
            platforms/redhat/bacula-sd \
            platforms/redhat/bacula-dir \
-           platforms/redhat/bacula.mysql.spec \
-           platforms/redhat/bacula.sqlite.spec \
-           platforms/redhat/bacula.sqlite.rel.spec \
+           platforms/redhat/bacula.spec \
            "
        hostname=`hostname -s`
   ;;
@@ -9728,6 +9726,8 @@ trap 'rm -fr `echo "autoconf/Make.common \
           scripts/Makefile \
           scripts/logrotate \
           scripts/bacula.desktop \
+          scripts/bacula.desktop.gnome1 \
+          scripts/bacula.desktop.gnome2 \
           doc/Makefile \
           src/Makefile \
           src/console/Makefile \
@@ -9997,6 +9997,8 @@ CONFIG_FILES=\${CONFIG_FILES-"autoconf/Make.common \
           scripts/Makefile \
           scripts/logrotate \
           scripts/bacula.desktop \
+          scripts/bacula.desktop.gnome1 \
+          scripts/bacula.desktop.gnome2 \
           doc/Makefile \
           src/Makefile \
           src/console/Makefile \
index fb34318d634dd851c7cc882ccf83b122102586c0..228405c70d434fec7d79af5badf28928d47bd070 100644 (file)
@@ -1,5 +1,5 @@
                  Kern's ToDo List
-                  28 April 2003 
+                  11 May  2003 
 
 Documentation to do: (any release a little bit at a time)
 - Document running a test version.
@@ -19,6 +19,9 @@ Testing to do: (painful)
 
 
 For 1.31 release:
+- Merge SQLite, MySQL, and Rel spec into a single file.
+- Implement "Reschedule OnError=yes interval=nnn times=xxx"
+- Fix config of "console"
 - Shell character expansion is failing occassionally.
 - One block was orphaned in the SD probably after cancel.
 - Test if rewind at end of tape waits for tape to rewind.
@@ -333,6 +336,18 @@ Longer term to do:
   someway to do so with every volume that has less than x% valid 
   files.
 
+
+Migration: Move a backup from one Volume to another
+Clone:     Copy a backup -- two Volumes
+
+Bacula Migration is based on Jobs (apparently Networker is file by file).
+
+Migration triggered by:
+  Number of Jobs
+  Number of Volumes
+  Age of Jobs
+  Highwater mark (keep total size)
+  Lowwater mark
   
 Projects:
             Bacula Projects Roadmap 
index 42231556834224f8d818a37ea25954d21e9ac2f1..123b0fe5d6ee545eb7ebb79fa1a1eb167334a8ef 100644 (file)
@@ -5,3 +5,4 @@ bacula-sd
 bacula.mysql.spec
 bacula.sqlite.spec
 bacula.sqlite.ul.spec
+bacula.spec
index 9a0850fbd71366928e17f89f6b39b20a0475ec6f..36975919ccbb4f4123895a1c13bcea031e77494f 100644 (file)
@@ -68,8 +68,9 @@ uninstall-autostart-dir:
        @rm -f  $(DESTDIR)/etc/rc.d/init.d/bacula-dir
 
 clean:
+       @rm -f 1 2 3
 
 distclean: clean
-       @rm -f Makefile bacula-*.spec bacula.*.spec
+       @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
        @rm -f bacula-sd bacula-fd bacula-dir
        @rm -rf CVS
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
new file mode 100644 (file)
index 0000000..667b7a7
--- /dev/null
@@ -0,0 +1,348 @@
+
+%define depkgs ../depkgs
+
+# 
+# You must build the package with at least one define
+#  e.g.  rpmbuild -ba --define "build_rh7 1" bacula.spec
+#
+# If you want the MySQL version, use:
+#        rpmbuild -ba --define "mysql 1" --define "build_rh7 1" bacula.spec
+#
+
+%define rh7 0
+%{?build_rh7:%define rh7 1}
+
+%define rh8 0
+%{?build_rh8:%define rh8 1}
+
+%define rh9 0
+%{?build_rh9:%define rh9 1}
+
+%define mysql 0
+%{?build_mysql:%define mysql 1}
+
+
+%if %{rh7}
+%define rh_version rh7
+%endif
+%if %{rh8}
+%define rh_version rh8
+%endif
+%if %{rh9}
+%define rh_version rh9
+%endif
+
+Summary: Bacula - The Network Backup Solution
+Name: bacula
+Version: @VERSION@
+Release: %{rh_version}
+Group: System Environment/Daemons
+Copyright: GPL v2
+Source: http://www.prdownloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-root
+URL: http://www.bacula.org/
+Vendor: The Bacula Team
+Distribution: The Bacula Team
+Packager: D. Scott Barninger <barninger@fairfieldcomputers.com>
+Requires: gnome-libs >= 1.4
+Requires: readline
+BuildRequires: gnome-libs-devel >= 1.4
+BuildRequires: readline-devel
+%if %{mysql}
+Requires: mysql >= 3.23
+Requires: mysql-server >= 2.23
+BuildRequires: mysql-devel >= 3.23
+%endif
+
+
+%description
+Bacula - It comes by night and sucks the vital essence from your computers.
+
+Bacula is a set of computer programs that permit you (or the system 
+administrator) to manage backup, recovery, and verification of computer 
+data across a network of computers of different kinds. In technical terms, 
+it is a network client/server based backup program. Bacula is relatively 
+easy to use and efficient, while offering many advanced storage management 
+features that make it easy to find and recover lost or damaged files. 
+Bacula source code has been released under the GPL version 2 license.
+
+This build incorporates sqlite as the catalog database, statically compiled.
+
+
+%package sqlite
+Summary: Bacula - The Network Backup Solution
+Group: System Environment/Daemons
+%description sqlite
+Bacula - It comes by night and sucks the vital essence from your computers.
+
+Bacula is a set of computer programs that permit you (or the system 
+administrator) to manage backup, recovery, and verification of computer 
+data across a network of computers of different kinds. In technical terms, 
+it is a network client/server based backup program. Bacula is relatively 
+easy to use and efficient, while offering many advanced storage management 
+features that make it easy to find and recover lost or damaged files. 
+Bacula source code has been released under the GPL version 2 license.
+
+%if %{mysql}
+This build requires MySQL to be installed separately as the catalog database.
+%else
+This build incorporates sqlite as the catalog database, statically compiled.
+%endif
+
+%package client
+Summary: Bacula - The Network Backup Solution
+Group: System Environment/Daemons
+%description client
+Bacula - It comes by night and sucks the vital essence from your computers.
+
+Bacula is a set of computer programs that permit you (or the system 
+administrator) to manage backup, recovery, and verification of computer 
+data across a network of computers of different kinds. In technical terms, 
+it is a network client/server based backup program. Bacula is relatively 
+easy to use and efficient, while offering many advanced storage management 
+features that make it easy to find and recover lost or damaged files. 
+Bacula source code has been released under the GPL version 2 license.
+
+This is the File daemon (Client) only package.
+
+
+%prep
+
+%setup
+
+%build
+
+cwd=${PWD}
+cd %{depkgs}
+make sqlite
+make mtx
+cd ${cwd}
+
+# patch the make_sqlite_tables script for installation bindir
+#patch src/cats/make_sqlite_tables.in make_sqlite_tables.in.patch
+
+%configure \
+        --prefix=/usr \
+        --sbindir=/usr/sbin \
+        --sysconfdir=/etc/bacula \
+        --with-scriptdir=/etc/bacula \
+        --enable-smartalloc \
+        --enable-gnome \
+%if %{mysql}
+        --with-mysql \
+%else
+        --with-sqlite=${cwd}/../depkgs/sqlite \
+%endif
+        --with-working-dir=/var/bacula \
+        --with-pid-dir=/var/run \
+        --with-subsys-dir=/var/lock/subsys
+make
+
+%install
+cwd=${PWD}
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
+mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/System
+%if ! %{mysql}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/sqlite
+%endif
+
+make \
+        prefix=$RPM_BUILD_ROOT/usr \
+        sbindir=$RPM_BUILD_ROOT/usr/sbin \
+        sysconfdir=$RPM_BUILD_ROOT/etc/bacula \
+        scriptdir=$RPM_BUILD_ROOT/etc/bacula \
+        working_dir=$RPM_BUILD_ROOT/var/bacula \
+        install
+
+cd %{depkgs}
+make \
+        prefix=$RPM_BUILD_ROOT/usr \
+        sbindir=$RPM_BUILD_ROOT/usr/sbin \
+        sysconfdir=$RPM_BUILD_ROOT/etc/bacula \
+        working_dir=$RPM_BUILD_ROOT/var/bacula \
+        mandir=$RPM_BUILD_ROOT/usr/man/man1 \
+        mtx-install
+cd ${cwd}
+
+# fixme - make installs the mysql start/stop scripts for sqlite build
+rm -f $RPM_BUILD_ROOT/etc/bacula/startmysql
+rm -f $RPM_BUILD_ROOT/etc/bacula/stopmysql
+
+# install the init scripts
+cp platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-dir
+cp platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-fd
+cp platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-sd
+%if %{mysql}
+cp src/cats/grant_mysql_privileges $RPM_BUILD_ROOT/etc/bacula/grant_mysql_privileges
+%endif
+
+# install the menu stuff
+cp scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png
+cp scripts/bacula.desktop $RPM_BUILD_ROOT/usr/share/gnome/apps/System/bacula.desktop
+
+# install sqlite
+cp ../depkgs/sqlite/sqlite $RPM_BUILD_ROOT/usr/lib/sqlite/sqlite
+cp ../depkgs/sqlite/sqlite.h $RPM_BUILD_ROOT/usr/lib/sqlite/sqlite.h
+cp ../depkgs/sqlite/libsqlite.a $RPM_BUILD_ROOT/usr/lib/sqlite/libsqlite.a
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+
+%if %{mysql}
+
+%files mysql
+%defattr(-,root,root)
+
+%attr(0754,root,root) /etc/bacula/bacula
+%attr(0754,root,root) /etc/bacula/console
+%attr(0754,root,root) /etc/bacula/fd
+%attr(0754,root,root) /etc/bacula/create_mysql_database
+%attr(0754,root,root) /etc/bacula/delete_catalog_backup
+%attr(0754,root,root) /etc/bacula/drop_bacula_tables
+%attr(0754,root,root) /etc/bacula/drop_mysql_tables
+%attr(0754,root,root) /etc/bacula/make_bacula_tables
+%attr(0754,root,root) /etc/bacula/make_catalog_backup
+%attr(0754,root,root) /etc/bacula/make_mysql_tables
+%attr(0754,root,root) /etc/bacula/grant_mysql_privileges
+%attr(0754,root,root) /etc/bacula/startmysql
+%attr(0754,root,root) /etc/bacula/stopmysql
+%attr(0754,root,root) /etc/bacula/mtx-changer
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-dir
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-fd
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-sd
+
+%attr(0644,root,root) %doc COPYING ChangeLog INSTALL README ReleaseNotes doc/*
+%attr(0644,root,root) /usr/man/man1/*
+%attr(0644,root,root) /usr/share/pixmaps/bacula.png
+%attr(0644,root,root) /usr/share/gnome/apps/System/bacula.desktop
+%attr(0644,root,root) %config(noreplace) /etc/bacula/gnome-console.conf
+
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-dir.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-fd.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-sd.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/console.conf
+%attr(0640,root,root) /etc/bacula/query.sql
+%attr(0640,root,root) %dir /var/bacula
+
+%attr(0750,root,root) /usr/sbin/*
+
+%post mysql
+# delete then add our links
+/sbin/chkconfig --del bacula-dir
+/sbin/chkconfig --del bacula-fd
+/sbin/chkconfig --del bacula-sd
+/sbin/chkconfig --add bacula-dir
+/sbin/chkconfig --add bacula-fd
+/sbin/chkconfig --add bacula-sd
+
+# add execute permissions for console
+chmod 0755 /usr/sbin/gnome-console
+
+# grant privileges and create tables
+echo "Granting privileges for MySQL user bacula..."
+/etc/bacula/grant_mysql_privileges
+echo "Creating MySQL bacula database..."
+/etc/bacula/create_mysql_database
+echo "Creating bacula tables..."
+/etc/bacula/make_mysql_tables
+
+%preun mysql
+# delete our links
+/sbin/chkconfig --del bacula-dir
+/sbin/chkconfig --del bacula-fd
+/sbin/chkconfig --del bacula-sd
+
+%else
+
+%files sqlite
+%defattr(-,root,root)
+
+%attr(0754,root,root) /etc/bacula/bacula
+%attr(0754,root,root) /etc/bacula/console
+%attr(0754,root,root) /etc/bacula/fd
+%attr(0754,root,root) /etc/bacula/create_sqlite_database
+%attr(0754,root,root) /etc/bacula/delete_catalog_backup
+%attr(0754,root,root) /etc/bacula/drop_bacula_tables
+%attr(0754,root,root) /etc/bacula/drop_sqlite_tables
+%attr(0754,root,root) /etc/bacula/make_bacula_tables
+%attr(0754,root,root) /etc/bacula/make_catalog_backup
+%attr(0754,root,root) /etc/bacula/make_sqlite_tables
+%attr(0754,root,root) /etc/bacula/mtx-changer
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-dir
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-fd
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-sd
+
+%attr(0644,root,root) %doc COPYING ChangeLog INSTALL README ReleaseNotes doc/*
+%attr(0644,root,root) /usr/man/man1/*
+%attr(0644,root,root) /usr/share/pixmaps/bacula.png
+%attr(0644,root,root) /usr/share/gnome/apps/System/bacula.desktop
+%attr(0644,root,root) %config(noreplace) /etc/bacula/gnome-console.conf
+
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-dir.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-fd.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-sd.conf
+%attr(0640,root,root) %config(noreplace) /etc/bacula/console.conf
+%attr(0640,root,root) /etc/bacula/query.sql
+%attr(0640,root,root) /usr/lib/sqlite/libsqlite.a
+%attr(0640,root,root) /usr/lib/sqlite/sqlite.h
+%attr(0640,root,root) %dir /var/bacula
+
+%attr(0750,root,root) /usr/sbin/*
+%attr(0750,root,root) /usr/lib/sqlite/sqlite
+
+%post sqlite
+# delete then add our links
+/sbin/chkconfig --del bacula-dir
+/sbin/chkconfig --del bacula-fd
+/sbin/chkconfig --del bacula-sd
+/sbin/chkconfig --add bacula-dir
+/sbin/chkconfig --add bacula-fd
+/sbin/chkconfig --add bacula-sd
+
+# add execute permission for console
+chmod 0755 /usr/sbin/gnome-console
+
+# create the tables
+/etc/bacula/make_sqlite_tables
+
+%preun sqlite
+# delete our links
+/sbin/chkconfig --del bacula-dir
+/sbin/chkconfig --del bacula-fd
+/sbin/chkconfig --del bacula-sd
+
+%endif
+
+%files client
+%defattr(-,root,root)
+
+%attr(0754,root,root) /etc/bacula/fd
+%attr(0754,root,root) /etc/rc.d/init.d/bacula-fd
+
+%attr(0644,root,root) %doc COPYING ChangeLog INSTALL README ReleaseNotes doc/*
+
+%attr(0640,root,root) %config(noreplace) /etc/bacula/bacula-fd.conf
+%attr(0640,root,root) %dir /var/bacula
+
+%attr(0750,root,root) /usr/sbin/bacula-fd
+%attr(0750,root,root) /usr/sbin/btraceback
+%attr(0750,root,root) /usr/sbin/btraceback.gdb
+%attr(0750,root,root) /usr/sbin/smtp
+
+
+%post client
+# delete then add our links
+/sbin/chkconfig --del bacula-fd
+/sbin/chkconfig --add bacula-fd
+
+%preun client
+# delete our links
+/sbin/chkconfig --del bacula-fd
+
+%changelog
+* Thu May 08 2003 Kern Sibbald <kern at sibbald.com>
+- Update spec for version 1.31 and combine client
+* Sun Mar 30 2003 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- Initial spec file
index f8c38338f381052495812e46d6e9f2c8469ba16d..a0987b45b33e722d3e44bde5a97ca177e2b0e3bc 100644 (file)
@@ -1,3 +1,7 @@
 .xvpics
 logrotate
 bacula.desktop
+bacula.desktop.gnome1  
+bacula.desktop.gnome2
+console
+gconsole
index d8e158482af9bd22fe3737fa74e30c655d6c7eee..7c1bb59a27f2c1f334b70f01bce8b4e677eec2a7 100755 (executable)
@@ -70,6 +70,7 @@ clean:
 # clean for distribution
 distclean: clean
        @$(RMF) startmysql stopmysql bacula fd startit stopit btraceback
-       @$(RMF) console gconsole
+       @$(RMF) console gconsole logrotate bacula.desktop 
+       @$(RMF) bacula.desktop.gnome1 bacula.desktop.gnome2
 
 # ------------------------------------------------------------------------
diff --git a/bacula/scripts/bacula.desktop.gnome1.in b/bacula/scripts/bacula.desktop.gnome1.in
new file mode 100644 (file)
index 0000000..5621b57
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bacula
+Comment=Bacula Director Console
+Icon=/usr/share/pixmaps/bacula.png
+Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
+Terminal=false
+Type=Application
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.3
+Categories=System;Application;Utility;X-Red-Hat-Base;
diff --git a/bacula/scripts/bacula.desktop.gnome2.in b/bacula/scripts/bacula.desktop.gnome2.in
new file mode 100644 (file)
index 0000000..5621b57
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bacula
+Comment=Bacula Director Console
+Icon=/usr/share/pixmaps/bacula.png
+Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
+Terminal=false
+Type=Application
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.3
+Categories=System;Application;Utility;X-Red-Hat-Base;
index 44fe4c8d6bc3b6817d9017673468ad45f8b34c48..ff0c0283bb9848bda3e44fb826312bc206bca512 100755 (executable)
@@ -2,10 +2,9 @@
 #
 # Run gnome-console with test config file
 #
-cd @BUILD_DIR@/src/gnome-console
 if [ $# = 1 ] ; then
    echo "doing gnome-console $1.conf"
-   ./gnome-console -c $1.conf
+   @sbindir@/gnome-console -c $1.conf
 else
-   ./gnome-console -c test-gnome-console.conf
+   @sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
 fi
index a5515147c8855e7e6bb3cabbcc7fd154515e5e4c..e4ee4d48afc21b52d091c5b1fd655b0bf478d3fe 100644 (file)
@@ -64,6 +64,9 @@ realclean: clean
        $(RMF) create_mysql_database make_sqlite_tables sqlite
        $(RMF) create_bdb_database drop_bdb_tables make_dbd_tables
        $(RMF) make_catalog_backup delete_catalog_backup
+       $(RMF) alter_mysql_tables alter_sqlite_tables create_sqlite_database
+       $(RMF) drop_bacula_tables drop_sqlite_tables make_bacula_tables
+       $(RMF) drop_bdb_tables make_bdb_tables mysql
 
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
index 12dbcbb4a98b0e106874d653152028cc3318d86b..6a2bae7ab5b40c92ae7166160d8b11fc7dcec0de 100644 (file)
@@ -246,6 +246,7 @@ int main(int argc, char *argv[])
 
    init_stack_dump();
    my_name_is(argc, argv, "console");
+   textdomain("bacula-console");
    init_msg(NULL, NULL);
    working_directory = "/tmp";
    args = get_pool_memory(PM_FNAME);
index 1495df2164037614c2898ec17834068c007d3e66..aafc5a72bf4a46d48f78f9a18594ad12cee25057 100644 (file)
@@ -95,6 +95,7 @@ int main (int argc, char *argv[])
 
    init_stack_dump();
    my_name_is(argc, argv, "bacula-dir");
+   textdomain("bacula-dir");
    init_msg(NULL, NULL);             /* initialize message handler */
    daemon_start_time = time(NULL);
    memset(&last_job, 0, sizeof(last_job));
index 0ff2d3d5ece4b0eb5fd795e9c555caaaacdde137..78b0de001dca7410b3e8220cb266a2ba8a3e1385 100644 (file)
@@ -94,7 +94,8 @@ int main (int argc, char *argv[])
    char *gid = NULL;
 
    init_stack_dump();
-   my_name_is(argc, argv, "filed");
+   my_name_is(argc, argv, "bacula-fd");
+   textdomain("bacula-fd");
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
 
index 04840dbc16f76eb579a072ab554738d3232d91dd..37d69b540d173d4384b9d41306dce83e4487ff2b 100644 (file)
@@ -90,7 +90,8 @@ int main (int argc, char *argv[])
    char *gid = NULL;
 
    init_stack_dump();
-   my_name_is(argc, argv, "stored");
+   my_name_is(argc, argv, "bacula-sd");
+   textdomain("bacula-sd");
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
    memset(&last_job, 0, sizeof(last_job));