Example configs improved slightly.

diff --git a/backup/examples/chiark/fsys.all b/backup/examples/chiark/fsys.all
index dd9139efcf58c2517f16ead26c2f99d75fafe999..3de4e4ad063bb59dd50b1ae4c5fd63f1808ae403 100644 (file)
--- a/backup/examples/chiark/fsys.all
+++ b/backup/examples/chiark/fsys.all
@@ -1,8 +1,3 @@
-/                      dump
-/var                   dump
-/var/log               dump
-/u                     dump
-/u2                    dump
-/usr                   dump
-/var/spool/news/chiark cpio
+include fsys.pt0
+include fsys.pt1
 end

diff --git a/backup/examples/chiark/settings.pl b/backup/examples/chiark/settings.pl
index 5e9c5d5b11df5d1bad14b1ce8cd25758cbb8dcca..2f14cdff6f9d3ac081742f1b90f65369581b2e48 100644 (file)
--- a/backup/examples/chiark/settings.pl
+++ b/backup/examples/chiark/settings.pl
@@ -1,8 +1,8 @@
 #
-chdir '/var/local/backup' or die $!;
-push(@INC,'/usr/local/lib/backup');
-$ENV{'PATH'}= '/usr/local/lib/backup:/usr/local/bin:'.$ENV{'PATH'};
-$ENV{'PATH'} =~ s,^/usr/local/lib/backup:/usr/local/bin:,,;
+chdir '/var/lib/chiark-backup' or die $!;
+push(@INC,'/usr/share/chiark-backup');
+$ENV{'PATH'} =~ s,^/usr/share/chiark-backup:,,;
+$ENV{'PATH'}= '/usr/share/chiark-backup:'.$ENV{'PATH'};
 $blocksize= 1;
 $blocksizebytes= 512*$blocksize;
 $softblocksizekb= 1;

diff --git a/backup/examples/chiark/was-tape.iw b/backup/examples/chiark/was-tape.iw
deleted file mode 100644 (file)
index cad1fa7..0000000
--- a/backup/examples/chiark/was-tape.iw
+++ /dev/null
@@ -1,2 +0,0 @@
-incremental
-end

diff --git a/backup/examples/relativity/fsys.all b/backup/examples/relativity/fsys.all
index 50e9b575d7d7055f13b79510884ff9feaedb8565..cf611fba8467d94b6666a4ab38ba73e844f31ff1 100644 (file)
--- a/backup/examples/relativity/fsys.all
+++ b/backup/examples/relativity/fsys.all
@@ -2,3 +2,4 @@ include ifsys.prefixes
 include        ifsys.pt0
 include ifsys.pt1
 include ifsys.pt2
+end

diff --git a/backup/examples/relativity/fsys.pt0 b/backup/examples/relativity/fsys.pt0
index 9f19fb5d1bfc831b147febe584955e4260d82bdc..3cd925c91881ad29503a4fd591516e0b84214c2f 100644 (file)
--- a/backup/examples/relativity/fsys.pt0
+++ b/backup/examples/relativity/fsys.pt0
@@ -1,2 +1,3 @@
 include ifsys.prefixes
 include ifsys.pt0
+end

diff --git a/backup/examples/relativity/fsys.pt1 b/backup/examples/relativity/fsys.pt1
index 0dbab9e42f794141a2543222dd5c1d90cbd5af05..a9210e767048a1267f99c33d71d1f55dcb961976 100644 (file)
--- a/backup/examples/relativity/fsys.pt1
+++ b/backup/examples/relativity/fsys.pt1
@@ -1,2 +1,3 @@
 include ifsys.prefixes
 include ifsys.pt1
+end

diff --git a/backup/examples/relativity/fsys.pt2 b/backup/examples/relativity/fsys.pt2
index 3e78fa413711c72523c1ae373230da08071774a7..2e786f95bf2592c5ff9c7e48a7d3221b57b36bf8 100644 (file)
--- a/backup/examples/relativity/fsys.pt2
+++ b/backup/examples/relativity/fsys.pt2
@@ -1,2 +1,3 @@
 include ifsys.prefixes
 include ifsys.pt2
+end

diff --git a/backup/examples/relativity/ifsys.prefixes b/backup/examples/relativity/ifsys.prefixes
index c4f034ee4105557747a4f0b7238907f11fed9bdb..4e317aa67073a78189a123fabf0d31a653594964 100644 (file)
--- a/backup/examples/relativity/ifsys.prefixes
+++ b/backup/examples/relativity/ifsys.prefixes
@@ -1,5 +1,3 @@
-#
-
 prefix davenant ssh -o 'BatchMode yes' -c blowfish -o 'Compression yes' davenant 'PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:$PATH'
 prefix xenophobe ssh -o 'BatchMode yes' -c blowfish -o 'Compression no' xenophobe 'PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:$PATH'
 
@@ -7,3 +5,5 @@ prefix khem ssh -o 'BatchMode yes' -c blowfish -o 'Compression yes' -o 'Compress
 
 prefix kadath ssh -o 'BatchMode yes' -c blowfish -o 'Compression yes' -o 'CompressionLevel 1' kadath -l ian 'PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:$PATH really'
 prefix-df kadath /bin/df -t noprocfs,nfs
+
+end

diff --git a/backup/examples/relativity/ifsys.pt0 b/backup/examples/relativity/ifsys.pt0
index 8991f2aba81ac49178f7abe39ba599b4b13da76a..008a2f1f3099e6a9647ad89d8a83cff4c6c0fce0 100644 (file)
--- a/backup/examples/relativity/ifsys.pt0
+++ b/backup/examples/relativity/ifsys.pt0
@@ -1,5 +1,3 @@
-#
-
 /usr/src               dump    davenant
 
 /var                   dump    davenant
@@ -12,3 +10,5 @@
 
 /usr                   dump    davenant
 /boot                  dump    davenant
+
+end

diff --git a/backup/examples/relativity/ifsys.pt1 b/backup/examples/relativity/ifsys.pt1
index b3b4edca290703b4b50b457790e45c40ff8fe674..7ec91b9b795e683b04abb44656ded5d230638349 100644 (file)
--- a/backup/examples/relativity/ifsys.pt1
+++ b/backup/examples/relativity/ifsys.pt1
@@ -1,5 +1,3 @@
-#
-
 /                      dump    kadath
 
 /usr                   dump    kadath
@@ -11,3 +9,5 @@
 /                      dump    khem
 
 /usr                   dump    khem
+
+end

diff --git a/backup/examples/relativity/ifsys.pt2 b/backup/examples/relativity/ifsys.pt2
index 1d59f107ade140d3b1a66eed3f74658e09b820e4..fcd0c836fd83941e0bc19c7dfb3ddc17ffae31be 100644 (file)
--- a/backup/examples/relativity/ifsys.pt2
+++ b/backup/examples/relativity/ifsys.pt2
@@ -1,6 +1,6 @@
-#
-
 /                      dump    xenophobe
 
 /dos/c                 cpio
 /dos/d                 cpio
+
+end

diff --git a/backup/examples/relativity/settings.pl b/backup/examples/relativity/settings.pl
index 0c3752f88f5a28c4abe0cbb618d6e6d5524a508f..f8ec84ccd8d0f22573b0bd782c26284c9cf81f75 100644 (file)
--- a/backup/examples/relativity/settings.pl
+++ b/backup/examples/relativity/settings.pl
@@ -2,8 +2,8 @@
 
 chdir '/var/lib/chiark-backup' or die $!;
 push(@INC,'/usr/lib/chiark-backup');
-$ENV{'PATH'} =~ s,^/usr/lib/chiark-backup,,;
-$ENV{'PATH'}= '/usr/lib/chiark-backup:'.$ENV{'PATH'};
+$ENV{'PATH'} =~ s,^/usr/share/chiark-backup,,;
+$ENV{'PATH'}= '/usr/share/chiark-backup:'.$ENV{'PATH'};
 
 # This sets both blocksizes to 512b. Note that both must be the
 # same if using the zftape floppy tape driver, since that requires