Re: [Bacula-devel] tweak to compress catalog backups
On Tue, Jan 03, 2012 at 11:44:03AM -0500, starli...@binnacle.cx wrote: After posting this, I substituted the 'xz' compressor for 'bzip2'. Ratio is 5.5-to-1 compared with 3-to-1 given by 'gzip'. It seems worthwhile to me. I feel that the catalog backup is something of a special case, but allow that others might not agree. why dont you make the compression program user selectable? any reason for dumping the file to disk, then compressing instead of using a pipe? i would prefer to see patches posted instead of whole scripts, it is easier to review. the 80 cols alignment does not make it more readable for me. L. -- Luca Berra -- bl...@comedia.it -- Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] win32 compile problem under Ubuntu
On Thu, Apr 07, 2011 at 10:24:10AM -0800, acorn12 wrote: /home/user/git/bacula/cross-tools/source/binutils-2.16.91-20060119-1/libiberty/ternary.c:143: warning: 'ternary_recursivesearch' defined but not used cc1: warnings being treated as errors /home/user/git/bacula/cross-tools/source/binutils-2.16.91-20060119-1/binutils/bucomm.c: In function 'make_tempname': /home/user/git/bacula/cross-tools/source/binutils-2.16.91-20060119-1/binutils/bucomm.c:426: error: ignoring return value of 'mktemp', declared with attribute warn_unused_result /home/user/git/bacula/cross-tools/source/binutils-2.16.91-20060119-1/binutils/bucomm.c:433: error: ignoring return value of 'mktemp', declared with attribute warn_unused_result make[4]: *** [bucomm.o] Error 1 make[3]: *** [all-recursive] Error 1 make[2]: *** [all] Error 2 make[1]: *** [all-binutils] Error 2 make: *** [all] Error 2 make of binutils failed - log available: binutils-mingw32/make.log either remove -Werror from CFLAGS or fix the source of the warnings in the code. L. -- Luca Berra -- bl...@comedia.it -- Xperia(TM) PLAY It's a major breakthrough. An authentic gaming smartphone on the nation's most reliable network. And it wants your games. http://p.sf.net/sfu/verizon-sfdev ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] patch for start scripts on suse - run as bacula/disk instead of root/root
On Wed, Mar 30, 2011 at 03:00:07PM +0200, Luca Berra wrote: Philipp, I concur with Eric. The change you proposed will not work. One cannot fix the problem at installation time. It must be fixed when Bacula begins execution, and in some cases the problem may be more fundamental because log files and cons files can be created at any time while Bacula is running. In this case why does bacula even support -u and -g parameters? If these parameters do not work as expected they should be either fixed or removed. sorry wednesday i was in an hurry, the fix is dead simple, bacula daemons should just reexec themselves after changing uid/gid. Regards, L. -- Luca Berra -- bl...@comedia.it -- Create and publish websites with WebMatrix Use the most popular FREE web apps or write code yourself; WebMatrix provides all the features you need to develop and publish your website. http://p.sf.net/sfu/ms-webmatrix-sf ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] patch for start scripts on suse - run as?bacula/disk instead of root/root
On Fri, Apr 01, 2011 at 06:24:57PM +0200, Kern Sibbald wrote: On Friday 01 April 2011 16:24:34 Luca Berra wrote: On Wed, Mar 30, 2011 at 03:00:07PM +0200, Luca Berra wrote: Philipp, I concur with Eric. The change you proposed will not work. One cannot fix the problem at installation time. It must be fixed when Bacula begins execution, and in some cases the problem may be more fundamental because log files and cons files can be created at any time while Bacula is running. In this case why does bacula even support -u and -g parameters? If these parameters do not work as expected they should be either fixed or removed. sorry wednesday i was in an hurry, the fix is dead simple, bacula daemons should just reexec themselves after changing uid/gid. That is an interesting suggestion, but I am not at all sure it is necessary. Bacula has no problem changing the user and/or group -- it does that internally without re-execing. As I understand the problem it is: if you run the daemons as root, certain files are created with root permission. If you later decide to run the daemons with -u and/or -g, the daemons may not be able to access certain old files that were previously created. In my opinion, that is a one-time sys admin problem due to the options the sys admin changes (or changing options because rpm installs have changed or are different than previously) and, in my opinion, this is best handled by a sys admin and by documentation. However, perhaps I don't understand the problem. No, the problem this is trying to solve is a different one. I fully agree about the sys admin problem. A sysadmin must choose what user bacula daemons will run as, and ensure file permission are correct based on this decision. It cannot be changed lightly. but once the sysadmin configures permission correctly bacula can be run with -u/-g in order to reduce privileges. If bacula is packaged by a distribution or other packager this decision probably will be done at the packager creation level. The problem with running bacula as a different user under linux is the one pointed by Eric at the start of this thread. under linux doing, as root: setuid(lower_privilege_uid); ... ptrace(..., getpid(), ..., ...); will result in ptrace erroring with EPERM. this prevents btraceback from working, since the invoked gdb will fail to attach to bacula. if you look at /proc/pid of a program that reduces privileges you will see most files there are still owned by root. if the program did something like if (getuid() == 0) { setuid(lower_privilege_uid); execv(argv[0],argv); } ... ptrace(..., getpid(), ..., ...); ptrace will work. if you look at /proc/pid of this second example you will see all files there are now owned by lower_privilege_uid. Eric worked around this by using start-stop-daemon to change uid/gid, then execute bacula, but: - bacula has -u/-g options so they should work as advertised. - bacula fd can be run as a different user while keeping the READALL capability, changing uid before running bacula renders this option impossible. Regards, L. -- Luca Berra -- bl...@comedia.it -- Create and publish websites with WebMatrix Use the most popular FREE web apps or write code yourself; WebMatrix provides all the features you need to develop and publish your website. http://p.sf.net/sfu/ms-webmatrix-sf ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] patch for start scripts on suse - run as bacula/disk instead of root/root
On Wed, Mar 30, 2011 at 10:53:58AM +0200, Kern Sibbald wrote: On Wednesday 30 March 2011 10:07:11 Eric Bollengier wrote: Hello Philipp, Le dimanche 27 mars 2011 11:03:24, Philipp Storz a écrit : Hello bacula developers, we found that the bacula start scripts do not start the bacula daemons with the parameters for user and group. As a result, the daemons always run as root/root. I have attached a patch that patches the template files for the start scripts , so that the daemons are started correctly. Can you make a try to add the -u and -g option to the startproc program instead of the bacula daemon? When you have a problem such as a segfault, the process can't attach gdb to itself because the uid/gid changed from root to a normal user (ptrace problem). I don't know if suse has this problem or not, can you try the backtrace generation with a simple kill -ABRT $(pidof bacula-dir) ? You should find the backtrace file somewhere with full information. Philipp, I concur with Eric. The change you proposed will not work. One cannot fix the problem at installation time. It must be fixed when Bacula begins execution, and in some cases the problem may be more fundamental because log files and cons files can be created at any time while Bacula is running. In this case why does bacula even support -u and -g parameters? If these parameters do not work as expected they should be either fixed or removed. Regards, Luca -- Luca Berra -- bl...@comedia.it -- Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
[Bacula-devel] [PATCH] fix build without threaded sqlite
--- bacula-5.0.2/src/cats/sqlite.c~ 2010-04-27 15:58:29.0 -0400 +++ bacula-5.0.2/src/cats/sqlite.c 2010-06-14 06:15:31.0 -0400 @@ -279,7 +279,7 @@ void db_thread_cleanup() { -#ifdef HAVE_SQLITE3 +#ifdef HAVE_SQLITE3_THREADSAFE sqlite3_thread_cleanup(); #endif } -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] [PATCH] configure.in: fix detection of libwrap requiring libnsl
On Tue, Jun 15, 2010 at 10:04:35AM +0200, Kern Sibbald wrote: On Tuesday 15 June 2010 09:00:24 Luca Berra wrote: configure.in has code to detect if libwrap requires libnsl to link, but it falis to add -lnsl to WRAPLIBS note, line numbers matter in this patch, since there are two instances of similar code. -lnsl should be added to second one --- bacula-5.0.2/autoconf/configure.in~ 2010-06-14 08:19:21.449360410 + +++ bacula-5.0.2/autoconf/configure.in 2010-06-14 08:19:21.479289510 + @@ -1092,7 +1092,7 @@ AC_ARG_WITH(tcp-wrappers, AC_DEFINE(HAVE_LIBWRAP, 1, [Set to enable libwraper support]) TCPW_MSG=yes LIBS=$saved_LIBS - WRAPLIBS=-lwrap + WRAPLIBS=-lwrap -lnsl ], [ AC_MSG_ERROR([*** libwrap missing]) ] Where are you having this problem? We build Bacula on *many* systems without yes, it is an old system this change, and if libnsl is not available, this will cause the build to fail. it won't. look at the configure.in code below: the first block (1030-1045) tries to link only with -lwrap, if it succeeds (1046-1050) it sets WRAPLIBS to -lwrap. if it fails, linking with -lwrap -lnsl is tried (1052-1063), if the second one succeeds it still sets WRAPLIBS to -lwrap only (1064-1068). It is this second case that is wrong, if it fails with -lwrap only and succeeds with -lwrap -lnsl, it should set WRAPLIBS to -lwrap -lnsl. This is what my patch does, address the second case. 1023 dnl --- 1024 dnl Check whether user wants TCP wrappers support (default off) 1025 dnl --- 1026 TCPW_MSG=no 1027 WRAPLIBS= 1028 AC_ARG_WITH(tcp-wrappers, 1029AC_HELP_STRING([--with-tcp-wrappers@:@=DIR@:@], [enable tcpwrappers support]), 1030[ 1031if test x$withval != xno ; then 1032 saved_LIBS=$LIBS 1033 LIBS=$saved_LIBS -lwrap 1034 AC_SEARCH_LIBS(nanosleep, [rt]) 1035 AC_MSG_CHECKING(for libwrap) 1036 AC_TRY_LINK( 1037 [ 1038#include sys/types.h 1039#include tcpd.h 1040int deny_severity = 0; 1041int allow_severity = 0; 1042struct request_info *req; 1043 ], [ 1044 hosts_access(req); 1045 ], [ 1046 AC_MSG_RESULT(yes) 1047 AC_DEFINE(HAVE_LIBWRAP, 1, [Set to enable libwraper support]) 1048 TCPW_MSG=yes 1049 LIBS=$saved_LIBS 1050 WRAPLIBS=-lwrap 1051 ], [ 1052 LIBS=$saved_LIBS -lwrap -lnsl 1053 WRAPLIBS=$saved_LIBS -lwrap -lnsl 1054 AC_TRY_LINK( 1055[ 1056#include sys/types.h 1057#include tcpd.h 1058int deny_severity = 0; 1059int allow_severity = 0; 1060struct request_info *req; 1061], [ 1062hosts_access(req); 1063], [ 1064 AC_MSG_RESULT(yes) 1065 AC_DEFINE(HAVE_LIBWRAP, 1, [Set to enable libwraper support]) 1066 TCPW_MSG=yes 1067 LIBS=$saved_LIBS 1068 WRAPLIBS=-lwrap 1069], [ 1070 AC_MSG_ERROR([*** libwrap missing]) 1071] 1072 ) 1073 ] 1074 ) 1075fi 1076] 1077 ) -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] [PATCH] fix build without threaded sqlite
On Tue, Jun 15, 2010 at 10:03:03AM +0200, Kern Sibbald wrote: On Tuesday 15 June 2010 09:01:41 Luca Berra wrote: --- bacula-5.0.2/src/cats/sqlite.c~ 2010-04-27 15:58:29.0 -0400 +++ bacula-5.0.2/src/cats/sqlite.c 2010-06-14 06:15:31.0 -0400 @@ -279,7 +279,7 @@ void db_thread_cleanup() { -#ifdef HAVE_SQLITE3 +#ifdef HAVE_SQLITE3_THREADSAFE sqlite3_thread_cleanup(); #endif } I am not 100% sure that I would like to include this patch. Bacula will not run correctly if you do not have a thread safe version of sqlite3, so I think it would be better not to build if the sqlite is not correctly built. i admit i am not 100% fluent with the sqlite code, but reading code above those lines: 268 void db_check_backend_thread_safe() 269 { 270 #ifdef HAVE_BATCH_FILE_INSERT 271if (!sqlite3_threadsafe()) { 272 Emsg0(M_ABORT, 0, _(SQLite3 client library must be thread-safe 273 when using BatchMode.\n)); 274} 275 #endif 276 } I understood thread safe was required only if using batch inserts. In case this is not true it would be better making configure abort if we don't have a threadsafe sqlite3. L. -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] BAT bug?
On Wed, Jun 09, 2010 at 10:21:16AM -0400, Phil Stracchino wrote: I'm seeing what appears to be a bug in BAT 5.0.2, built from the Gentoo bacula-5.0.2-r1 package. When I do a restore and choose to select files, BAT selects jobs and builds the directory tree, then pops up an error dialog containing the following message: Invalid command .messages. Enter done to exit. It then displays an *empty* file selection tree. Can anyone else reproduce this error? cannot reproduce with bat 5.0.2 on mandriva, so it may be gentoo specific. L. -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] [Fwd: Re: [Bacula-users] SOLVED?: Dead slow backups with bacula 5.0, mysql and accurate]
sorry for necromancing an old thread, but i just setup a new server with bacula 5.0.1 and mysql catalog and i ran into the same problem catalog db is new, created with an unmodified make_mysql_tables. two days ago I started backing it up. Full backup was 539,971 files, 75.62GB, so i would not call it big in the Fileset i had set signature = SHA1 accurate = mcs1 this morning i found the first incremental was still busy running an sql query (which alocated a whole core for 8 hours). i killed that, tried removing accurate = mcs1 from the fileset, i ran the incremental again, but mysql is still taking a long time: | 133 | bacula | localhost | bacula | Query | 8114 | executing | SELECT Path.Path, Filename.Name, Temp.FileIndex, Temp.JobId, LStat, MD5 FROM ( SELECT FileId, Job.JobId AS JobId, FileIndex, File.PathId AS PathId, File.FilenameId AS FilenameId, LStat, MD5 FROM Job, File, ( SELECT MAX(JobTDate) AS JobTDate, PathId, FilenameId FROM ( SELECT JobTDate, PathId, FilenameId FROM File JOIN Job USING (JobId) WHERE File.JobId IN (2) UNION ALL SELECT JobTDate, PathId, FilenameId FROM BaseFiles JOIN File USING (FileId) JOIN Job ON(BaseJobId = Job.JobId) WHERE BaseFiles.JobId IN (2) ) AS tmp GROUP BY PathId, FilenameId ) AS T1 WHERE (Job.JobId IN ( SELECT DISTINCT BaseJobId FROM BaseFiles WHERE JobId IN (2)) OR Job.JobId IN (2)) AND T1.JobTDate = Job.JobTDate AND Job.JobId = File.JobId AND T1.PathId = File.PathId AND T1.FilenameId = File.FilenameId ) AS Temp JOIN Filename ON (Filename.FilenameId = Temp.FilenameId) JOIN Path ON (Path.PathId = Temp.PathId) WHERE FileIndex 0 ORDER BY Temp.JobId, FileIndex ASC | I understand Eric concerns about the (FilenameId, PathId) index, but the above situation is absolutely unbearable. any clues on how to make it work? thanks in advance, L. On Sun, Feb 21, 2010 at 10:51:02PM +0100, Eric Bollengier wrote: Unfortunately, this index creates lots of performance problem during batch insert session due to index bloat. This is not a good idea to advise it :( http://sourceforge.net/apps/wordpress/bacula/2009/09/28/performance-issue-with-a-useless-index-on-postgresql/ Le Samedi 20 Février 2010 23:30:45, Dan Langille a écrit : issue. make_mysql_tables suggests to add INDEX (FilenameId, PathId) on the File table if verifies are too slow--it also recommends several other indices, all of which I already had (PathId, FilenameId and JobId). I ran this sql query: CREATE INDEX FilenameId_2 ON File (FilenameId, PathId); Which took quite a while (maybe 20-30 minutes?) -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
Re: [Bacula-devel] [Fwd: Re: [Bacula-users] SOLVED?: Dead slow backups with bacula 5.0, mysql and accurate]
updated to 5.0.2, it is working now, sorry for the noise On Thu, Jun 03, 2010 at 09:40:55AM +0200, Luca Berra wrote: sorry for necromancing an old thread, but i just setup a new server with bacula 5.0.1 and mysql catalog and i ran into the same problem catalog db is new, created with an unmodified make_mysql_tables. two days ago I started backing it up. Full backup was 539,971 files, 75.62GB, so i would not call it big in the Fileset i had set signature = SHA1 accurate = mcs1 this morning i found the first incremental was still busy running an sql query (which alocated a whole core for 8 hours). i killed that, tried removing accurate = mcs1 from the fileset, i ran the incremental again, but mysql is still taking a long time: | 133 | bacula | localhost | bacula | Query | 8114 | executing | SELECT Path.Path, Filename.Name, Temp.FileIndex, Temp.JobId, LStat, MD5 FROM ( SELECT FileId, Job.JobId AS JobId, FileIndex, File.PathId AS PathId, File.FilenameId AS FilenameId, LStat, MD5 FROM Job, File, ( SELECT MAX(JobTDate) AS JobTDate, PathId, FilenameId FROM ( SELECT JobTDate, PathId, FilenameId FROM File JOIN Job USING (JobId) WHERE File.JobId IN (2) UNION ALL SELECT JobTDate, PathId, FilenameId FROM BaseFiles JOIN File USING (FileId) JOIN Job ON(BaseJobId = Job.JobId) WHERE BaseFiles.JobId IN (2) ) AS tmp GROUP BY PathId, FilenameId ) AS T1 WHERE (Job.JobId IN ( SELECT DISTINCT BaseJobId FROM BaseFiles WHERE JobId IN (2)) OR Job.JobId IN (2)) AND T1.JobTDate = Job.JobTDate AND Job.JobId = File.JobId AND T1.PathId = File.PathId AND T1.FilenameId = File.FilenameId ) AS Temp JOIN Filename ON (Filename.FilenameId = Temp.FilenameId) JOIN Path ON (Path.PathId = Temp.PathId) WHERE FileIndex 0 ORDER BY Temp.JobId, FileIndex ASC | I understand Eric concerns about the (FilenameId, PathId) index, but the above situation is absolutely unbearable. any clues on how to make it work? thanks in advance, L. On Sun, Feb 21, 2010 at 10:51:02PM +0100, Eric Bollengier wrote: Unfortunately, this index creates lots of performance problem during batch insert session due to index bloat. This is not a good idea to advise it :( http://sourceforge.net/apps/wordpress/bacula/2009/09/28/performance-issue-with-a-useless-index-on-postgresql/ Le Samedi 20 Février 2010 23:30:45, Dan Langille a écrit : issue. make_mysql_tables suggests to add INDEX (FilenameId, PathId) on the File table if verifies are too slow--it also recommends several other indices, all of which I already had (PathId, FilenameId and JobId). I ran this sql query: CREATE INDEX FilenameId_2 ON File (FilenameId, PathId); Which took quite a while (maybe 20-30 minutes?) -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ -- ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo ___ Bacula-devel mailing list Bacula-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bacula-devel
[Bacula-devel] [PATCH] add mandriva platform
it's vs 5.0.1 but applies to 5.0.2 as well Regards, L. -- Luca Berra -- bl...@comedia.it Communication Media Services S.r.l. /\ \ / ASCII RIBBON CAMPAIGN XAGAINST HTML MAIL / \ diff -p -up bacula-5.0.1/autoconf/bacula-macros/os.m4.mandriva bacula-5.0.1/autoconf/bacula-macros/os.m4 --- bacula-5.0.1/autoconf/bacula-macros/os.m4.mandriva 2010-02-24 15:33:48.0 + +++ bacula-5.0.1/autoconf/bacula-macros/os.m4 2010-04-11 18:34:44.380045092 + @@ -189,6 +189,9 @@ then elif test -d /etc/SuSEconfig then DISTNAME=suse5 +elif test -f /etc/mandriva-release +then +DISTNAME=mandriva elif test -f /etc/mandrake-release then DISTNAME=mandrake diff -p -up bacula-5.0.1/autoconf/configure.in.mandriva bacula-5.0.1/autoconf/configure.in --- bacula-5.0.1/autoconf/configure.in.mandriva 2010-04-11 18:26:29.781151636 + +++ bacula-5.0.1/autoconf/configure.in 2010-04-11 18:33:01.336996554 + @@ -2871,6 +2871,18 @@ redhat) platforms/redhat/bacula-dir ;; +mandriva) + DISTVER=`cat /etc/mandriva-release | grep release |\ + cut -f 4 -d ' '` + TAPEDRIVE=/dev/nst0 + PSCMD=ps -e -o pid,command + PFILES=${PFILES} \ + platforms/mandriva/Makefile \ + platforms/mandriva/bacula-fd \ + platforms/mandriva/bacula-sd \ + platforms/mandriva/bacula-dir \ + platforms/mandriva/sysconfig + ;; mandrake) DISTVER=`cat /etc/mandrake-release | grep release |\ cut -f 5 -d ' '` diff -p -up bacula-5.0.1/configure.mandriva bacula-5.0.1/configure --- bacula-5.0.1/configure.mandriva 2010-04-11 18:26:29.785084148 + +++ bacula-5.0.1/configure 2010-04-11 18:33:00.294026933 + @@ -15940,6 +15940,9 @@ then elif test -d /etc/SuSEconfig then DISTNAME=suse5 +elif test -f /etc/mandriva-release +then +DISTNAME=mandriva elif test -f /etc/mandrake-release then DISTNAME=mandrake @@ -29047,6 +29050,18 @@ redhat) platforms/redhat/bacula-dir ;; +mandriva) + DISTVER=`cat /etc/mandriva-release | grep release |\ + cut -f 4 -d ' '` + TAPEDRIVE=/dev/nst0 + PSCMD=ps -e -o pid,command + PFILES=${PFILES} \ + platforms/mandriva/Makefile \ + platforms/mandriva/bacula-fd \ + platforms/mandriva/bacula-sd \ + platforms/mandriva/bacula-dir \ + platforms/mandriva/sysconfig + ;; mandrake) DISTVER=`cat /etc/mandrake-release | grep release |\ cut -f 5 -d ' '` diff -p -up bacula-5.0.1/platforms/mandriva/Makefile.in.mandriva bacula-5.0.1/platforms/mandriva/Makefile.in --- bacula-5.0.1/platforms/mandriva/Makefile.in.mandriva2010-04-11 18:28:19.558027576 + +++ bacula-5.0.1/platforms/mandriva/Makefile.in 2010-04-11 17:03:30.481016076 + @@ -0,0 +1,100 @@ +# +# This file is used as the template to create the +# Makefile for the Mandriva specific installation. +# +# 15 November 2001 -- Kern Sibbald +# +# for Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ +# + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +nothing: + +install: install-autostart install_logrotate + +install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir install-sysconfig + +install_logrotate: + @$(INSTALL_PROGRAM) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bacula-dir + +install-autostart-fd: + @if test x$(DESTDIR) = x -a -f /etc/rc.d/init.d/bacula-fd; then \ + /sbin/chkconfig --del bacula-fd; \ + fi + @$(INSTALL_PROGRAM) -m 744 bacula-fd $(DESTDIR)/etc/rc.d/init.d/bacula-fd + # set symlinks for script at startup and shutdown + @if test x$(DESTDIR) = x ; then \ + /sbin/chkconfig --add bacula-fd; \ + fi + + +install-autostart-sd: + @if test x$(DESTDIR) = x -a -f /etc/rc.d/init.d/bacula-sd; then \ + /sbin/chkconfig --del bacula-sd; \ + fi + @$(INSTALL_PROGRAM) -m 744 bacula-sd $(DESTDIR)/etc/rc.d/init.d/bacula-sd + # set symlinks for script at startup and shutdown + @if test x$(DESTDIR) = x ; then \ + /sbin/chkconfig --add bacula-sd; \ + fi + + +install-autostart-dir: + @if test x$(DESTDIR) = x -a -f /etc/rc.d/init.d/bacula-dir; then \ + /sbin/chkconfig --del bacula-dir; \ + fi + @$(INSTALL_PROGRAM) -m 744 bacula-dir $(DESTDIR)/etc/rc.d/init.d/bacula-dir + # set symlinks for script at startup and shutdown + @if test x$(DESTDIR) = x ; then \ + /sbin/chkconfig --add bacula-dir; \ + fi + + +install-sysconfig: + @$(INSTALL_PROGRAM) -m 644 sysconfig $(DESTDIR)/etc/sysconfig/bacula + + +uninstall: uninstall-autostart uninstall-logrotate + +uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir uninstall-sysconfig + +uninstall-logrotate: + @rm -f $(DESTDIR)/etc/logrotate.d/bacula-dir + +uninstall-autostart-fd: + @if test x$(DESTDIR) = x -a -f /etc/rc.d