diff -Naur bacula-2.2.7/scripts/Makefile.in bacula-2.2.7.oden/scripts/Makefile.in --- bacula-2.2.7/scripts/Makefile.in 2007-04-18 19:06:43.000000000 +0200 +++ bacula-2.2.7.oden/scripts/Makefile.in 2008-01-23 17:25:36.000000000 +0100 @@ -28,6 +28,7 @@ installdirs: $(MKDIR) $(DESTDIR)$(sysconfdir) + $(MKDIR) $(DESTDIR)$(sysconfdir)/scripts $(MKDIR) $(DESTDIR)$(sbindir) $(MKDIR) $(DESTDIR)$(scriptdir) $(MKDIR) $(DESTDIR)$(mandir) @@ -41,21 +42,21 @@ $(INSTALL_SCRIPT) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir $(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd $(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd - @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + @if test -f $(DESTDIR)$(sysconfdir)/scripts/mtx-changer; then \ echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ + $(MV) -f $(DESTDIR)$(sysconfdir)/scripts/mtx-changer $(DESTDIR)$(sysconfdir)/scripts/mtx-changer.old; \ fi - $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer - @if test -f ${DESTDIR}${scriptdir}/disk-changer; then \ + $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(sysconfdir)/scripts/mtx-changer + @if test -f $(DESTDIR)$(sysconfdir)/scripts/disk-changer; then \ echo " ==> Saving existing disk-changer to disk-changer.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \ + $(MV) -f $(DESTDIR)$(sysconfdir)/scripts/disk-changer $(DESTDIR)$(sysconfdir)/scripts/disk-changer.old; \ fi - $(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(scriptdir)/disk-changer - @if test -f ${DESTDIR}${scriptdir}/dvd-handler; then \ + $(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(sysconfdir)/scripts/disk-changer + @if test -f $(DESTDIR)$(sysconfdir)/scripts/dvd-handler; then \ echo " ==> Saving existing dvd-handler to dvd-handler.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \ + $(MV) -f $(DESTDIR)$(sysconfdir)/scripts/dvd-handler $(DESTDIR)$(sysconfdir)/scripts/dvd-handler.old; \ fi - $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler + $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(sysconfdir)/scripts/dvd-handler $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ diff -Naur bacula-2.2.7/src/cats/Makefile.in bacula-2.2.7.oden/src/cats/Makefile.in --- bacula-2.2.7/src/cats/Makefile.in 2007-03-30 23:46:04.000000000 +0200 +++ bacula-2.2.7.oden/src/cats/Makefile.in 2008-01-23 18:04:08.000000000 +0100 @@ -113,23 +113,23 @@ $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database @filename=make_catalog_backup; \ - if test -f ${DESTDIR}${scriptdir}/$$filename; then \ + if test -f ${DESTDIR}${sysconfdir}/scripts/$$filename; then \ destname=$$filename.new; \ echo " ==> Found existing $$filename, installing new file as $$destname"; \ else \ destname=$$filename; \ fi; \ - echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname"; \ - ${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname + echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${sysconfdir}/scripts/$$destname"; \ + ${INSTALL_SCRIPT} $$filename ${DESTDIR}${sysconfdir}/scripts/$$destname @filename=delete_catalog_backup; \ - if test -f ${DESTDIR}${scriptdir}/$$filename; then \ + if test -f ${DESTDIR}${sysconfdir}/scripts/$$filename; then \ destname=$$filename.new; \ echo " ==> Found existing $$filename, installing new file as $$destname"; \ else \ destname=$$filename; \ fi; \ - echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname"; \ - ${INSTALL_SCRIPT} $$filename ${DESTDIR}${scriptdir}/$$destname + echo "${INSTALL_SCRIPT} $$filename ${DESTDIR}${sysconfdir}/scripts/$$destname"; \ + ${INSTALL_SCRIPT} $$filename ${DESTDIR}${sysconfdir}/scripts/$$destname uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_TYPE@_database) diff -Naur bacula-2.2.7/src/dird/bacula-dir.conf.in bacula-2.2.7.oden/src/dird/bacula-dir.conf.in --- bacula-2.2.7/src/dird/bacula-dir.conf.in 2007-10-03 18:22:07.000000000 +0200 +++ bacula-2.2.7.oden/src/dird/bacula-dir.conf.in 2008-01-23 17:29:15.000000000 +0100 @@ -15,7 +15,7 @@ Director { # define myself Name = @hostname@-dir DIRport = @dir_port@ # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" + QueryFile = "@sysconfdir@/scripts/query.sql" WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" Maximum Concurrent Jobs = 1 @@ -61,9 +61,9 @@ FileSet="Catalog" Schedule = "WeeklyCycleAfterBackup" # This creates an ASCII copy of the catalog - RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula" + RunBeforeJob = "@sysconfdir@/scripts/make_catalog_backup bacula bacula" # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" + RunAfterJob = "@sysconfdir@/scripts/delete_catalog_backup" Write Bootstrap = "@working_dir@/BackupCatalog.bsr" Priority = 11 # run after main backup } diff -Naur bacula-2.2.7/src/dird/Makefile.in bacula-2.2.7.oden/src/dird/Makefile.in --- bacula-2.2.7/src/dird/Makefile.in 2007-05-27 11:34:40.000000000 +0200 +++ bacula-2.2.7.oden/src/dird/Makefile.in 2008-01-23 17:35:26.000000000 +0100 @@ -118,11 +118,11 @@ fi; \ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf - @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ + @if test -f ${DESTDIR}${sysconfdir}/scripts/query.sql; then \ echo " ==> Saving existing query.sql to query.sql.old"; \ - $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \ + $(MV) -f ${DESTDIR}${sysconfdir}/scripts/query.sql ${DESTDIR}${sysconfdir}/scripts/query.sql.old; \ fi - ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql + ${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/scripts/query.sql @if test -f static-bacula-dir; then \ $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \ fi diff -Naur bacula-2.2.7/src/stored/bacula-sd.conf.in bacula-2.2.7.oden/src/stored/bacula-sd.conf.in --- bacula-2.2.7/src/stored/bacula-sd.conf.in 2007-10-03 13:36:47.000000000 +0200 +++ bacula-2.2.7.oden/src/stored/bacula-sd.conf.in 2008-01-23 17:28:24.000000000 +0100 @@ -60,7 +60,7 @@ # Name = Autochanger # Device = Drive-1 # Device = Drive-2 -# Changer Command = "/home/kern/bacula/bin/mtx-changer %c %o %S %a %d" +# Changer Command = "@sysconfdir@/scripts/mtx-changer %c %o %S %a %d" # Changer Device = /dev/sg0 #} @@ -113,7 +113,7 @@ # AlwaysOpen = yes; # RemovableMedia = yes; # RandomAccess = no; -## Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d" +## Changer Command = "@sysconfdir@/scripts/mtx-changer %c %o %S %a %d" ## Changer Device = /dev/sg0 ## AutoChanger = yes # # Enable the Alert command only if you have the mtx package loaded @@ -181,8 +181,8 @@ # MountCommand = "/bin/mount -t iso9660 -o ro %a %m"; # UnmountCommand = "/bin/umount %m"; # SpoolDirectory = /tmp/backup; -# WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v" -# FreeSpaceCommand = "/etc/bacula/dvd-handler %a free" +# WritePartCommand = "@sysconfdir@/scripts/dvd-handler %a write %e %v" +# FreeSpaceCommand = "@sysconfdir@/scripts/dvd-handler %a free" #} #