From 17fb3a3831ca812a3ad384f4eec3b977432facd9 Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Mon, 8 Oct 2001 00:52:55 +0000
Subject: [PATCH] @@ -1,4 +1,4 @@ -chiark-utils (0.99.0-1) experimental;
 urgency=low +chiark-utils (2.0.0-1) experimental; urgency=low

   * Initial prepackaged release of chiark backup.

@@ -8,8 +8,9 @@
   * example config files from Relativity and chiark shipped.
   * Improved documentation.
   * bringup-hook created.
+  * bugfixes (all of bugs introduced by merge, AFAICT).

- -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon,  8 Oct 2001 01:11:56 +0100
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon,  8 Oct 2001 01:52:21 +0100

 # Local variables:
 # mode: debian-changelog
---
 TODO                                   |  8 ++------
 backup/Makefile                        | 15 +++++++++++----
 backup/backuplib.pl                    |  7 +++++--
 backup/bringup                         |  2 +-
 backup/driver                          |  2 +-
 backup/examples/relativity/ifsys.pt0   |  1 -
 backup/examples/relativity/ifsys.pt2   |  2 ++
 backup/examples/relativity/settings.pl |  2 +-
 backup/full                            |  2 +-
 backup/iwjbackup.txt                   | 11 ++++-------
 debian/changelog                       |  5 +++--
 debian/rules                           |  7 ++++---
 12 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/TODO b/TODO
index caf0e70..9dc0150 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,10 @@
 BACKUP
 ======
 
-essential before release
-------------------------
-test
-
 would be nice someday
 ---------------------
 replace loaded with idformat
 read/writebuffer setuid --mlock
-whatisthis no cloneandhack
-whatisthis listing for zafio and dump archives
+whatsthis no cloneandhack
+whatsthis listing for zafio and dump archives
 configuration files autogenerator
diff --git a/backup/Makefile b/backup/Makefile
index 16260e6..3b55957 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -32,11 +32,15 @@ DEBUG=		-g
 RWBUFFER_SIZE_MB=16
 
 prefix=/usr/local
-etcdir=/etc/chiark-backup
+etcdir=/etc
+varlib=/var/lib
+
+confdir=$(etcdir)/chiark-backup
 bindir=$(prefix)/bin
 sharedir=$(prefix)/share/chiark-backup
-txtdocdir=$(prefix)/share/doc/chiark-backup/examples
+txtdocdir=$(prefix)/share/doc/chiark-backup
 exampledir=$(txtdocdir)/examples
+vardir=$(varlib)/chiark-backup
 
 INSTALL=		install -c
 INSTALL_SHARE=		$(INSTALL) -m 644 -o root -g root
@@ -58,7 +62,7 @@ writebuffer:				writebuffer.o rwbuffer.o
 readbuffer.o writebuffer.o rwbuffer.o:	rwbuffer.h
 
 install:		all
-		$(INSTALL_DIRECTORY) $(etcdir) $(bindir) $(sharedir)
+		$(INSTALL_DIRECTORY) $(confdir) $(bindir) $(sharedir) $(vardir)
 		$(INSTALL_PROGRAM) $(CTARGETS) $(bindir)
 		set -e; for s in $(BINSCRIPTS); do \
 			$(INSTALL_SCRIPT) $$s $(bindir)/backup-$$s; done
@@ -74,7 +78,10 @@ install-examples:
 			cd examples/$$e; \
 			$(INSTALL_DIRECTORY) $(exampledir)/$$e; \
 			$(INSTALL_SHARE) [^A-Z]*[^~] $(exampledir)/$$e; \
-			(cd $(exampledir) && tar -xf -) <SYMLINKS.tar; \
+			if test -f SYMLINKS.tar; then \
+				exec <SYMLINKS.tar; \
+				(set -e; cd $(exampledir) && tar -xf -); \
+			fi; \
 			cd ../..; \
 		done
 
diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index 26a8533..ba1c50b 100644
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+require IO::File;
+
 sub printdate () {
     print scalar(localtime),"\n";
 }
@@ -93,14 +95,15 @@ sub readfsysfile ($) {
         } elsif (m/^exclude\s+(\S.*\S)$/) {
             push @excl,$1;
 	} elsif (m/^include\s+(\S.*\S)$/) {
+	    $sfn = $1;
 	    $sfn =~ s/^\./fsys./;
-	    $sfn = "$etc/$sfn" if $sfn !~ m,^/,;
+	    $sfn = "$etc/$sfn" unless $sfn =~ m,^/,;
 	    readfsysfile($sfn);
         } else {
 	    push @fsys,$_;
 	}
     }
-    close $fn or die $!;
+    close $fh or die $!;
 }
 
 sub readfsys ($) {
diff --git a/backup/bringup b/backup/bringup
index 0aabd9f..000195e 100755
--- a/backup/bringup
+++ b/backup/bringup
@@ -28,4 +28,4 @@
 runlevel=`sed -ne '/^id:/ s/.*:\([0-9]\):.*/\1/p' /etc/inittab`
 telinit $runlevel
 
-test ! -f /etc/backup/bringup-hook
+test ! -f /etc/chiark-backup/bringup-hook
diff --git a/backup/driver b/backup/driver
index a114a18..bdf3b38 100755
--- a/backup/driver
+++ b/backup/driver
@@ -23,7 +23,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 cd /var/lib/chiark-backup
-PATH=/usr/lib/chiark-backup:$PATH export PATH
+PATH=/usr/share/chiark-backup:$PATH export PATH
 
 if [ "x$1" != test ]; then
 	stty sane
diff --git a/backup/examples/relativity/ifsys.pt0 b/backup/examples/relativity/ifsys.pt0
index 008a2f1..2305e5f 100644
--- a/backup/examples/relativity/ifsys.pt0
+++ b/backup/examples/relativity/ifsys.pt0
@@ -2,7 +2,6 @@
 
 /var			dump	davenant
 /u			dump	davenant
-/			dump
 
 /			dump	davenant
 
diff --git a/backup/examples/relativity/ifsys.pt2 b/backup/examples/relativity/ifsys.pt2
index fcd0c83..ac447bb 100644
--- a/backup/examples/relativity/ifsys.pt2
+++ b/backup/examples/relativity/ifsys.pt2
@@ -1,5 +1,7 @@
 /			dump	xenophobe
 
+/			dump
+
 /dos/c			cpio
 /dos/d			cpio
 
diff --git a/backup/examples/relativity/settings.pl b/backup/examples/relativity/settings.pl
index f8ec84c..9aa7eb4 100644
--- a/backup/examples/relativity/settings.pl
+++ b/backup/examples/relativity/settings.pl
@@ -1,7 +1,7 @@
 # configuration, for putting in /etc/chiark-backup
 
 chdir '/var/lib/chiark-backup' or die $!;
-push(@INC,'/usr/lib/chiark-backup');
+push(@INC,'/usr/share/chiark-backup');
 $ENV{'PATH'} =~ s,^/usr/share/chiark-backup,,;
 $ENV{'PATH'}= '/usr/share/chiark-backup:'.$ENV{'PATH'};
 
diff --git a/backup/full b/backup/full
index c25acc0..02b5b0c 100755
--- a/backup/full
+++ b/backup/full
@@ -35,7 +35,7 @@ $|=1;
 # dumped in both full and incremental dumps.
 setstatus "FAILED configuration check";
 print "Configuration check ...\n" or die $!;
-system 'checkallused'; $? and die $?;
+system 'backup-checkallused'; $? and die $?;
 
 printdate();
 
diff --git a/backup/iwjbackup.txt b/backup/iwjbackup.txt
index ff4d860..91c904c 100644
--- a/backup/iwjbackup.txt
+++ b/backup/iwjbackup.txt
@@ -2,12 +2,9 @@ iwjbackup.txt
 documentation file
 Copyright - AND NO WARRANTY - see notes at bottom of file for details.
 
-This is a quick summary of the backup scripts, and some comments on  and my config files:
-it's a bit patchy and might have the odd ommission. The canonical
-source is the sources, as always :->
-
-
-WARNING - this file is out of date !
+This is a quick summary of the backup scripts, and some comments on
+some of the config files: it's a bit patchy and might have the odd
+ommission. The canonical source is the sources, as always :->
 
 
 To run, the contents of /etc/chiark-backup should be:
@@ -131,7 +128,7 @@ To use this you'll need to configure init:
   # Runlevel 5 is set up to run a reduced level of services during
   # backups. (currently this means: no squid, no webserver, no newsserver)
   # We also run the backup script automatically on entering runlevel 5:
-  dm:5:once:/usr/local/lib/backup/driver </dev/tty8 >/dev/tty8 2>&1
+  dm:5:once:backup-driver </dev/tty8 >/dev/tty8 2>&1
 
  * takedown can be run from the command line or via cron.
 
diff --git a/debian/changelog b/debian/changelog
index 8a761e2..610fbc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-chiark-utils (0.99.0-1) experimental; urgency=low
+chiark-utils (2.0.0-1) experimental; urgency=low
   
   * Initial prepackaged release of chiark backup.
 
@@ -8,8 +8,9 @@ chiark-utils (0.99.0-1) experimental; urgency=low
   * example config files from Relativity and chiark shipped.
   * Improved documentation.
   * bringup-hook created.
+  * bugfixes (all of bugs introduced by merge, AFAICT).
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon,  8 Oct 2001 01:11:56 +0100
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon,  8 Oct 2001 01:52:21 +0100
 
 # Local variables:
 # mode: debian-changelog
diff --git a/debian/rules b/debian/rules
index 457d144..8265a3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,10 @@ binary-prep:
 		gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
 		done
 	#
-	$(MAKE) -C backup install install-examples \
+	$(MAKE) -C backup install install-docs install-examples \
 		prefix=$t/chiark-backup/usr \
-		etcdir=$t/chiark-backup/etc
+		etcdir=$t/chiark-backup/etc \
+		varlib=$t/chiark-backup/var/lib
 	#
 	install -d $t/chiark-rwbuffer/usr/bin
 	cd $t/chiark-backup/usr/bin && \
@@ -66,7 +67,7 @@ binary-indep:	checkroot build binary-prep
 
 binary-arch:	checkroot build binary-prep
 	$(checkdir)
-	dpkg-shlibdeps -Tdebian/sv-chiark-backup $t/chiark-backup/usr/bin/*
+	dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer $t/chiark-rwbuffer/usr/bin/*
 	set -e; for p in $(packages_arch); \
 		do debian/rules binary-one p=$$p; done
 
-- 
2.30.2