From: ianmdlvl <ianmdlvl>
Date: Sun, 7 Oct 2001 23:51:59 +0000 (+0000)
Subject: Example configs improved slightly.
X-Git-Tag: debian_version_2_0_0~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=2fe2409727cb93102f3494fc10cbbff8d41d9880

Example configs improved slightly.
---

diff --git a/backup/examples/chiark/fsys.all b/backup/examples/chiark/fsys.all
index dd9139e..3de4e4a 100644
--- 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 5e9c5d5..2f14cdf 100644
--- 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
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 50e9b57..cf611fb 100644
--- 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 9f19fb5..3cd925c 100644
--- 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 0dbab9e..a9210e7 100644
--- 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 3e78fa4..2e786f9 100644
--- 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 c4f034e..4e317aa 100644
--- 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 8991f2a..008a2f1 100644
--- 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 b3b4edc..7ec91b9 100644
--- 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 1d59f10..fcd0c83 100644
--- 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 0c3752f..f8ec84c 100644
--- 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