From 75e55920abbf99aef422239e7a7e70a115f0625b Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 9 Jun 2012 12:08:53 +0200
Subject: [PATCH] Remove config variables from examples/devices fixes bug #1884

---
 bacula/examples/devices/DDS4.conf                 | 4 ++--
 bacula/examples/devices/Exabyte.conf              | 2 +-
 bacula/examples/devices/HP-autoloader.conf        | 2 +-
 bacula/examples/devices/LTO-2.conf                | 4 ++--
 bacula/examples/devices/LTO-3.conf                | 4 ++--
 bacula/examples/devices/LTO-4.conf                | 4 ++--
 bacula/examples/devices/OnStream.conf             | 2 +-
 bacula/examples/devices/two-drive-autoloader.conf | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bacula/examples/devices/DDS4.conf b/bacula/examples/devices/DDS4.conf
index 07a5157268..b2d6577c31 100644
--- a/bacula/examples/devices/DDS4.conf
+++ b/bacula/examples/devices/DDS4.conf
@@ -4,12 +4,12 @@
 Device {
   Name = DDS-4                        # 
   Media Type = DDS-4
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes;
   RemovableMedia = yes;
   RandomAccess = no;
-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
+# Changer Command = "/opt/bacula/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
diff --git a/bacula/examples/devices/Exabyte.conf b/bacula/examples/devices/Exabyte.conf
index bd8a8159ff..4a53ca110c 100644
--- a/bacula/examples/devices/Exabyte.conf
+++ b/bacula/examples/devices/Exabyte.conf
@@ -4,7 +4,7 @@
 Device {
   Name = "Exabyte 8mm"
   Media Type = "8mm"
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   Hardware end of medium = No;
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = Yes;
diff --git a/bacula/examples/devices/HP-autoloader.conf b/bacula/examples/devices/HP-autoloader.conf
index 79a9bb7292..367e843bbf 100644
--- a/bacula/examples/devices/HP-autoloader.conf
+++ b/bacula/examples/devices/HP-autoloader.conf
@@ -7,7 +7,7 @@ Device {
   Media Type = DDS-4
   Archive Device = /dev/nst0
   Changer Device = /dev/sg0
-  Changer Command = "/home/kern/bacula/bin/mtx-changer %c %o %S %a"
+  Changer Command = "/opt/bacula/scripts/mtx-changer %c %o %S %a"
   AutoChanger = yes
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes;
diff --git a/bacula/examples/devices/LTO-2.conf b/bacula/examples/devices/LTO-2.conf
index c956b0e20e..d28e66cf70 100644
--- a/bacula/examples/devices/LTO-2.conf
+++ b/bacula/examples/devices/LTO-2.conf
@@ -4,13 +4,13 @@
 Device {
   Name = LTO-2
   Media Type = LTO-2
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes;
   RemovableMedia = yes;
   RandomAccess = no;
   Maximum File Size = 3GB
-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
+# Changer Command = "/opt/bacula/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
diff --git a/bacula/examples/devices/LTO-3.conf b/bacula/examples/devices/LTO-3.conf
index 3fa8f83e8d..6c68b21c19 100644
--- a/bacula/examples/devices/LTO-3.conf
+++ b/bacula/examples/devices/LTO-3.conf
@@ -4,13 +4,13 @@
 Device {
   Name = LTO-3
   Media Type = LTO-3
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes;
   RemovableMedia = yes;
   RandomAccess = no;
   Maximum File Size = 4GB
-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
+# Changer Command = "/opt/bacula/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
diff --git a/bacula/examples/devices/LTO-4.conf b/bacula/examples/devices/LTO-4.conf
index 1b921e5fd6..28260ebbdf 100644
--- a/bacula/examples/devices/LTO-4.conf
+++ b/bacula/examples/devices/LTO-4.conf
@@ -4,13 +4,13 @@
 Device {
   Name = LTO-4
   Media Type = LTO-4
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes;
   RemovableMedia = yes;
   RandomAccess = no;
   Maximum File Size = 5GB
-# Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
+# Changer Command = "/opt/bacula/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
diff --git a/bacula/examples/devices/OnStream.conf b/bacula/examples/devices/OnStream.conf
index 48ba3b4e30..be2252336a 100644
--- a/bacula/examples/devices/OnStream.conf
+++ b/bacula/examples/devices/OnStream.conf
@@ -7,7 +7,7 @@ Device {
   Name = OnStream
   Description = "OnStream drive on Linux"
   Media Type = OnStream
-  Archive Device = @TAPEDRIVE@
+  Archive Device = /dev/nst0
   AutomaticMount = yes;               # when device opened, read it
   AlwaysOpen = yes
   Offline On Unmount = no
diff --git a/bacula/examples/devices/two-drive-autoloader.conf b/bacula/examples/devices/two-drive-autoloader.conf
index 395531e8c3..2358b7f739 100644
--- a/bacula/examples/devices/two-drive-autoloader.conf
+++ b/bacula/examples/devices/two-drive-autoloader.conf
@@ -5,7 +5,7 @@ Autochanger {
   Name = Autochanger
   Device = Drive-1
   Device = Drive-2
-  Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
+  Changer Command = "/opt/bacula/scripts/mtx-changer %c %o %S %a %d"
   Changer Device = /dev/sg0
 }
 
-- 
2.39.5