packaging: FreeBSD move our scripts to -Dscriptdir default (/usr/loca…

…l/lib). - Install our scripts to the standard location /usr/local/lib instead of /usr/lib for FreeBSD. Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
bareos · Apr 25, 2022 · e5dce2c · e5dce2c
1 parent e3a72b2
commit e5dce2c
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 50 deletions.
diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile
@@ -92,7 +92,7 @@ CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON \
   -Dlibdir=/usr/local/lib \
   -Darchivedir=/var/lib/bareos/storage \
   -Dbackenddir=/usr/local/lib \
-  -Dscriptdir=/usr/lib/bareos/scripts \
+  -Dscriptdir=/usr/local/lib/bareos/scripts \
   -Dworkingdir=/var/lib/bareos \
   -Dplugindir=/usr/local/lib/bareos/plugins \
   -Dbsrdir=/var/lib/bareos \

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-deinstall b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-deinstall
@@ -8,8 +8,8 @@ LOGFILE=/tmp/bareos-setup.log
 
 initialize_bareos(){
 		echo "$PKGNAME: initializing bareos configuration, logs to ${LOGFILE}"
-		/usr/lib/bareos/scripts/bareos-config initialize_local_hostname  >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
-		/usr/lib/bareos/scripts/bareos-config initialize_passwords       >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
+		/usr/local/lib/bareos/scripts/bareos-config initialize_local_hostname  >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
+		/usr/local/lib/bareos/scripts/bareos-config initialize_passwords       >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
 }
 
 case "$MODE" in

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-install b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-install
@@ -8,8 +8,8 @@ LOGFILE=/tmp/bareos-setup.log
 
 initialize_bareos(){
 		echo "$PKGNAME: initializing bareos configuration, logs to ${LOGFILE}"
-		/usr/lib/bareos/scripts/bareos-config initialize_local_hostname  >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
-		/usr/lib/bareos/scripts/bareos-config initialize_passwords       >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
+		/usr/local/lib/bareos/scripts/bareos-config initialize_local_hostname  >>${LOGFILE} 2>&1 || echo "initialize_local_hostname failed"
+		/usr/local/lib/bareos/scripts/bareos-config initialize_passwords       >>${LOGFILE} 2>&1 || echo "initialize_passwords failed"
 }
 
 case "$MODE" in

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message.director b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message.director
@@ -3,9 +3,9 @@ Thank you for installing the Bareos director!
 
 please run the following commands to setup the bareos databases:
 
-su postgres -c /usr/lib/bareos/scripts/create_bareos_database
-su postgres -c /usr/lib/bareos/scripts/make_bareos_tables
-su postgres -c /usr/lib/bareos/scripts/grant_bareos_privileges
+su postgres -c /usr/local/lib/bareos/scripts/create_bareos_database
+su postgres -c /usr/local/lib/bareos/scripts/make_bareos_tables
+su postgres -c /usr/local/lib/bareos/scripts/grant_bareos_privileges
 
 
 enable the service by running the following commands:

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.common b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.common
@@ -15,6 +15,7 @@
 @dir(bareos,bareos,0750) %%ETCDIR%%/bareos-dir.d/schedule
 @dir(bareos,bareos,0750) %%ETCDIR%%/bareos-dir.d/storage
 @dir(bareos,bareos,755) lib/bareos
+@dir(bareos,bareos,755) lib/bareos/scripts
 @dir(bareos,bareos,750) /var/lib/bareos/storage
 @dir(bareos,bareos,750) /var/lib/bareos
 @dir(bareos,bareos,750) /var/log/bareos
@@ -37,12 +38,10 @@ lib/libbareosndmp.so
 lib/libbareossd.so.%%DISTVERSION%%
 lib/libbareossd.so.%%LIBVERSION%%
 lib/libbareossd.so
-@dir(bareos,bareos,755) /usr/lib/bareos
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts
-/usr/lib/bareos/scripts/bareos-config
-/usr/lib/bareos/scripts/bareos-config-lib.sh
-/usr/lib/bareos/scripts/bareos-explorer
-/usr/lib/bareos/scripts/btraceback.gdb
+lib/bareos/scripts/bareos-config
+lib/bareos/scripts/bareos-config-lib.sh
+lib/bareos/scripts/bareos-explorer
+lib/bareos/scripts/btraceback.gdb
 @dir(bareos,bareos,750) lib/bareos/plugins
 bin/bsmtp
 sbin/bsmtp

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common
@@ -4,15 +4,15 @@ lib/libbareossql.so
 lib/libbareoscats.so.%%DISTVERSION%%
 lib/libbareoscats.so.%%LIBVERSION%%
 lib/libbareoscats.so
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts/ddl
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts/ddl/creates
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts/ddl/drops
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts/ddl/grants
-@dir(bareos,bareos,755) /usr/lib/bareos/scripts/ddl/updates
-/usr/lib/bareos/scripts/create_bareos_database
-/usr/lib/bareos/scripts/drop_bareos_database
-/usr/lib/bareos/scripts/drop_bareos_tables
-/usr/lib/bareos/scripts/grant_bareos_privileges
-/usr/lib/bareos/scripts/make_bareos_tables
-/usr/lib/bareos/scripts/update_bareos_tables
-/usr/lib/bareos/scripts/ddl/versions.map
+@dir(bareos,bareos,755) lib/bareos/scripts/ddl
+@dir(bareos,bareos,755) lib/bareos/scripts/ddl/creates
+@dir(bareos,bareos,755) lib/bareos/scripts/ddl/drops
+@dir(bareos,bareos,755) lib/bareos/scripts/ddl/grants
+@dir(bareos,bareos,755) lib/bareos/scripts/ddl/updates
+lib/bareos/scripts/create_bareos_database
+lib/bareos/scripts/drop_bareos_database
+lib/bareos/scripts/drop_bareos_tables
+lib/bareos/scripts/grant_bareos_privileges
+lib/bareos/scripts/make_bareos_tables
+lib/bareos/scripts/update_bareos_tables
+lib/bareos/scripts/ddl/versions.map
diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql
@@ -1,17 +1,17 @@
-/usr/lib/bareos/scripts/ddl/grants/postgresql.sql
-/usr/lib/bareos/scripts/ddl/grants/postgresql-readonly.sql
-/usr/lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql
-/usr/lib/bareos/scripts/ddl/creates/postgresql.sql
-/usr/lib/bareos/scripts/ddl/drops/postgresql.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.10_11.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.11_12.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.12_14.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql
-/usr/lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql
+lib/bareos/scripts/ddl/grants/postgresql.sql
+lib/bareos/scripts/ddl/grants/postgresql-readonly.sql
+lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql
+lib/bareos/scripts/ddl/creates/postgresql.sql
+lib/bareos/scripts/ddl/drops/postgresql.sql
+lib/bareos/scripts/ddl/updates/postgresql.10_11.sql
+lib/bareos/scripts/ddl/updates/postgresql.11_12.sql
+lib/bareos/scripts/ddl/updates/postgresql.12_14.sql
+lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql
+lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql
+lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql
+lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
+lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql
+lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql
+lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql
+lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql
 lib/libbareoscats-postgresql.so
diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.director b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.director
@@ -20,9 +20,9 @@
 @sample(bareos,bareos,0640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
 @sample(bareos,bareos,0640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
 @sample(bareos,bareos,0640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
-/usr/lib/bareos/scripts/delete_catalog_backup
-/usr/lib/bareos/scripts/make_catalog_backup
-/usr/lib/bareos/scripts/make_catalog_backup.pl
+lib/bareos/scripts/delete_catalog_backup
+lib/bareos/scripts/make_catalog_backup
+lib/bareos/scripts/make_catalog_backup.pl
 sbin/bareos-dir
 man/man8/bareos-dir.8.gz
 man/man8/bareos.8.gz

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage
@@ -11,7 +11,7 @@
 @sample(bareos,bareos,0640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
 @sample(bareos,bareos,0640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
 sbin/bareos-sd
-/usr/lib/bareos/scripts/disk-changer
+lib/bareos/scripts/disk-changer
 lib/bareos/plugins/autoxflate-sd.so
 man/man8/bareos-sd.8.gz
 @dir(bareos,bareos,0775) /var/lib/bareos/storage

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-tape b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-tape
@@ -1,7 +1,7 @@
 
 lib/libbareossd-gentape.so
 lib/libbareossd-tape.so
-/usr/lib/bareos/scripts/mtx-changer
+lib/bareos/scripts/mtx-changer
 @sample  %%ETCDIR%%/mtx-changer.conf.sample
 man/man8/bscrypto.8.gz
 man/man8/btape.8.gz

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-director/pkg-message b/core/platforms/freebsd/bareos-freebsd/bareos.com-director/pkg-message
@@ -1,8 +1,8 @@
 Please run the following commands to setup the bareos databases:
 
-su postgres -c /usr/lib/bareos/scripts/create_bareos_database
-su postgres -c /usr/lib/bareos/scripts/make_bareos_tables
-su postgres -c /usr/lib/bareos/scripts/grant_bareos_privileges
+su postgres -c /usr/local/lib/bareos/scripts/create_bareos_database
+su postgres -c /usr/local/lib/bareos/scripts/make_bareos_tables
+su postgres -c /usr/local/lib/bareos/scripts/grant_bareos_privileges
 
 Start the bareos director daemon with