changed BAREOS_CLIENT hostname method

rear · Jan 17, 2017 · 563d9e2 · 563d9e2
1 parent 00f58cc
commit 563d9e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
@@ -874,7 +874,7 @@ COPY_AS_IS_BAREOS=( /etc/bareos /var/spool/bareos )
 COPY_AS_IS_EXCLUDE_BAREOS=( /var/lib/bareos )
 PROGS_BAREOS=( bareos-fd bconsole bareos-console bextract bls bscan btape smartctl )
 # Bareos client name, only adpat if it differs from hostname-fd
-# BAREOS_CLIENT="`hostname -s`-fd"
+# BAREOS_CLIENT="$HOSTNAME-fd"
 # Provide the (possible) volume labels to restore from using bextract.
 # Multiple entries can be separated by '|' and '*' wildcards are allowed.
 #  eg. VOL-*|Vol-*

diff --git a/usr/share/rear/prep/BAREOS/default/500_check_BAREOS_bconsole_results.sh b/usr/share/rear/prep/BAREOS/default/500_check_BAREOS_bconsole_results.sh
@@ -31,7 +31,7 @@ fi
 # "Connecting to Client 'bareos_client_name-fd at FQDN:9102"
 if [ -z "$BAREOS_CLIENT" ]
 then
-   BAREOS_CLIENT="`hostname -s`-fd"
+   BAREOS_CLIENT="$HOSTNAME-fd"
 fi
 
 BAREOS_RESULT=( `echo -e " status client=${BAREOS_CLIENT}" | bconsole |grep Connect ` )

diff --git a/usr/share/rear/restore/BAREOS/default/400_restore_backup.sh b/usr/share/rear/restore/BAREOS/default/400_restore_backup.sh
@@ -100,7 +100,7 @@ else
 
         if [ -z "$BAREOS_CLIENT" ]
         then
-            BAREOS_CLIENT="`hostname -s`-fd"
+            BAREOS_CLIENT="$HOSTNAME-fd"
         fi
 
         if [ -n "$BAREOS_FILESET" ]