@@ -5,7 +5,7 @@

   Significant changes since merge chiark/anarres/mnemeth:
   * readbuffer/writebuffer command line arg for buffer size.
   * readbuffer/writebuffer share common code.
-  * example config files from Relativity shipped.
+  * example config files from Relativity and chiark shipped.

  --

diff --git a/TODO b/TODO
index b4e78b374ff618f55e17cef669f57a72ea21b8db..e2205a7823b2f9a64622b059a6e6c5141f0ff81c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,7 +10,6 @@ important before release
 ------------------------
 documentation
 replace loaded with idformat
-example config files
 
 would be nice someday
 ---------------------

diff --git a/backup/Makefile b/backup/Makefile
index 4d7a9e2cc418a60cb9f8c66abc2ecfbde36cb73f..aefb18619f975255fc94cc96129fc395b79b20e4 100644 (file)
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -49,7 +49,7 @@ BINSCRIPTS=   checkallused loaded driver takedown whatsthis
 SHARESCRIPTS=  bringup full increm
 SHAREFILES=    backuplib.pl
 
-EXAMPLES=      relativity
+EXAMPLES=      relativity chiark
 
 all:           $(CTARGETS)
 
@@ -69,7 +69,9 @@ install-examples:
                set -e; for e in $(EXAMPLES); do \
                        cd examples/$$e; \
                        $(INSTALL_DIRECTORY) $(exampledir)/$$e; \
-                       $(INSTALL_SHARE) *[^S~] $(exampledir)/$$e; \
+                       $(INSTALL_SHARE) [^A-Z]*[^~] $(exampledir)/$$e; \
+                       (cd $(exampledir) && tar -xf -) <SYMLINKS.tar; \
+                       cd ../..; \
                done
 
 clean:

diff --git a/backup/examples/chiark/SYMLINKS.tar b/backup/examples/chiark/SYMLINKS.tar
new file mode 100644 (file)
index 0000000..e7db3fe
Binary files /dev/null and b/backup/examples/chiark/SYMLINKS.tar differ

diff --git a/backup/examples/chiark/expected-diffs b/backup/examples/chiark/expected-diffs
new file mode 100644 (file)
index 0000000..644ef8b
--- /dev/null
+++ b/backup/examples/chiark/expected-diffs
@@ -0,0 +1,4 @@
+/var/spool/news/chiark
+!/var/spool/news
+!/tmp
+end

diff --git a/backup/examples/chiark/fsys.all b/backup/examples/chiark/fsys.all
new file mode 100644 (file)
index 0000000..dd9139e
--- /dev/null
+++ b/backup/examples/chiark/fsys.all
@@ -0,0 +1,8 @@
+/                      dump
+/var                   dump
+/var/log               dump
+/u                     dump
+/u2                    dump
+/usr                   dump
+/var/spool/news/chiark cpio
+end

diff --git a/backup/examples/chiark/fsys.pt0 b/backup/examples/chiark/fsys.pt0
new file mode 100644 (file)
index 0000000..1412887
--- /dev/null
+++ b/backup/examples/chiark/fsys.pt0
@@ -0,0 +1,4 @@
+/                      dump
+/var                   dump
+/u                     dump
+end

diff --git a/backup/examples/chiark/fsys.pt1 b/backup/examples/chiark/fsys.pt1
new file mode 100644 (file)
index 0000000..6afe7ef
--- /dev/null
+++ b/backup/examples/chiark/fsys.pt1
@@ -0,0 +1,4 @@
+/u2                    dump
+/usr                   dump
+/var/spool/news/chiark cpio
+end

diff --git a/backup/examples/chiark/settings.pl b/backup/examples/chiark/settings.pl
new file mode 100644 (file)
index 0000000..5e9c5d5
--- /dev/null
+++ b/backup/examples/chiark/settings.pl
@@ -0,0 +1,13 @@
+#
+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:,,;
+$blocksize= 1;
+$blocksizebytes= 512*$blocksize;
+$softblocksizekb= 1;
+$softblocksizebytes= 1024*$softblocksizekb;
+$tapename= 'st0';
+$tape= "/dev/$tapename";
+$ntape= "/dev/n$tapename";
+1;

diff --git a/backup/examples/chiark/tape.a0 b/backup/examples/chiark/tape.a0
new file mode 100644 (file)
index 0000000..219e728
--- /dev/null
+++ b/backup/examples/chiark/tape.a0
@@ -0,0 +1,3 @@
+filesystems all
+next b0
+end

diff --git a/backup/examples/chiark/tape.b0 b/backup/examples/chiark/tape.b0
new file mode 100644 (file)
index 0000000..9b0d81f
--- /dev/null
+++ b/backup/examples/chiark/tape.b0
@@ -0,0 +1,3 @@
+filesystems all
+next c0
+end

diff --git a/backup/examples/chiark/tape.b1 b/backup/examples/chiark/tape.b1
new file mode 100644 (file)
index 0000000..0eab3f9
--- /dev/null
+++ b/backup/examples/chiark/tape.b1
@@ -0,0 +1,3 @@
+filesystems pt1
+next c0
+end

diff --git a/backup/examples/chiark/tape.c0 b/backup/examples/chiark/tape.c0
new file mode 100644 (file)
index 0000000..cb23647
--- /dev/null
+++ b/backup/examples/chiark/tape.c0
@@ -0,0 +1,3 @@
+filesystems all
+next d0
+end

diff --git a/backup/examples/chiark/tape.c1 b/backup/examples/chiark/tape.c1
new file mode 100644 (file)
index 0000000..44f2b50
--- /dev/null
+++ b/backup/examples/chiark/tape.c1
@@ -0,0 +1,3 @@
+filesystems pt1
+next d0
+end

diff --git a/backup/examples/chiark/tape.d0 b/backup/examples/chiark/tape.d0
new file mode 100644 (file)
index 0000000..6fbdc69
--- /dev/null
+++ b/backup/examples/chiark/tape.d0
@@ -0,0 +1,3 @@
+filesystems all
+next a0
+end

diff --git a/backup/examples/chiark/tape.d1 b/backup/examples/chiark/tape.d1
new file mode 100644 (file)
index 0000000..4856464
--- /dev/null
+++ b/backup/examples/chiark/tape.d1
@@ -0,0 +1,3 @@
+filesystems pt1
+next a0
+end

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

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

diff --git a/backup/examples/chiark/warnings. b/backup/examples/chiark/warnings.
new file mode 100755 (executable)
index 0000000..3e35aa6
--- /dev/null
+++ b/backup/examples/chiark/warnings.
@@ -0,0 +1 @@
+T 300 "in 5 minutes"

diff --git a/backup/examples/chiark/warnings.now b/backup/examples/chiark/warnings.now
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/backup/examples/chiark/warnings.soon b/backup/examples/chiark/warnings.soon
new file mode 100755 (executable)
index 0000000..14d7bd2
--- /dev/null
+++ b/backup/examples/chiark/warnings.soon
@@ -0,0 +1,2 @@
+T 45 "in 1 minute"
+T 15 "in 15 seconds"

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

diff --git a/debian/changelog b/debian/changelog
index a0cb1c25420d11658c34b11265d257113cb5d130..84787d219aa17ca32de077556e81a2bcf935f690 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ chiark-utils (0.99.0-1) experimental; urgency=low
   Significant changes since merge chiark/anarres/mnemeth:
   * readbuffer/writebuffer command line arg for buffer size.
   * readbuffer/writebuffer share common code.
-  * example config files from Relativity shipped.
+  * example config files from Relativity and chiark shipped.
 
  --