From 1ef98aaff9429c1bf5e07ad58c55badb40288a1f Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 17 Jul 2008 17:19:05 -0700 Subject: [PATCH] Install additional files from 1.5.50 Demand attach results in some additional binaries (and one bug in the install location of vos), and there are some new man pages in the 1.5 series. Also include the binaries for the NFS translator, since that now works again. --- debian/openafs-client.install | 4 ++ debian/openafs-fileserver.install | 68 +++++++++++++++++-------------- debian/rules | 3 -- src/tvolser/Makefile.in | 4 +- 4 files changed, 43 insertions(+), 36 deletions(-) diff --git a/debian/openafs-client.install b/debian/openafs-client.install index b2e767970..8bada2250 100644 --- a/debian/openafs-client.install +++ b/debian/openafs-client.install @@ -5,6 +5,7 @@ debian/tmp/usr/bin/bos usr/bin debian/tmp/usr/bin/cmdebug usr/bin debian/tmp/usr/bin/fs usr/bin debian/tmp/usr/bin/klog usr/bin +debian/tmp/usr/bin/knfs usr/bin debian/tmp/usr/bin/livesys usr/bin debian/tmp/usr/bin/pagsh usr/bin debian/tmp/usr/bin/pts usr/bin @@ -25,6 +26,7 @@ debian/tmp/usr/sbin/backup usr/sbin debian/tmp/usr/sbin/butc usr/sbin debian/tmp/usr/sbin/fms usr/sbin debian/tmp/usr/sbin/fstrace usr/sbin +debian/tmp/usr/sbin/rmtsysd usr/sbin debian/tmp/usr/sbin/afsd sbin @@ -84,6 +86,7 @@ debian/tmp/usr/share/man/man1/fs_whereis.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_whichcell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_wscell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/klog.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/knfs.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/livesys.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pagsh.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts.1 usr/share/man/man1 @@ -121,6 +124,7 @@ debian/tmp/usr/share/man/man1/vos_backup.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_backupsys.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_changeaddr.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_changeloc.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_clone.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_convertROtoRW.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_copy.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_create.1 usr/share/man/man1 diff --git a/debian/openafs-fileserver.install b/debian/openafs-fileserver.install index a119988f1..105cf8c3e 100644 --- a/debian/openafs-fileserver.install +++ b/debian/openafs-fileserver.install @@ -1,34 +1,40 @@ -debian/tmp/usr/sbin/bos_util usr/sbin -debian/tmp/usr/sbin/bosserver usr/sbin -debian/tmp/usr/sbin/voldump usr/sbin -debian/tmp/usr/sbin/volinfo usr/sbin +debian/tmp/usr/sbin/bos_util usr/sbin +debian/tmp/usr/sbin/bosserver usr/sbin +debian/tmp/usr/sbin/fssync-debug usr/sbin +debian/tmp/usr/sbin/salvsync-debug usr/sbin +debian/tmp/usr/sbin/state_analyzer usr/sbin +debian/tmp/usr/sbin/voldump usr/sbin +debian/tmp/usr/sbin/volinfo usr/sbin -debian/tmp/usr/lib/openafs/fileserver usr/lib/openafs -debian/tmp/usr/lib/openafs/salvager usr/lib/openafs -debian/tmp/usr/lib/openafs/upclient usr/lib/openafs -debian/tmp/usr/lib/openafs/upserver usr/lib/openafs -debian/tmp/usr/lib/openafs/volserver usr/lib/openafs +debian/tmp/usr/lib/openafs/fileserver usr/lib/openafs +debian/tmp/usr/lib/openafs/salvager usr/lib/openafs +debian/tmp/usr/lib/openafs/salvageserver usr/lib/openafs +debian/tmp/usr/lib/openafs/upclient usr/lib/openafs +debian/tmp/usr/lib/openafs/upserver usr/lib/openafs +debian/tmp/usr/lib/openafs/volserver usr/lib/openafs -debian/tmp/usr/share/man/man5/BosConfig.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/BosLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/FORCESALVAGE.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/FileLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/KeyFile.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/NoAuth.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/SALVAGE.fs.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/SalvageLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/UserList.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/VolserLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/afs_volume_header.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/salvage.lock.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/sysid.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/BosConfig.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/BosLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/FORCESALVAGE.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/FileLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/KeyFile.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/NoAuth.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/SALVAGE.fs.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/SalvageLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/UserList.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/VolserLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/afs_volume_header.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/krb.conf.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/salvage.lock.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/sysid.5 usr/share/man/man5 -debian/tmp/usr/share/man/man8/bos_util.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bos_util.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvageserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 diff --git a/debian/rules b/debian/rules index c17d49dbf..bb57100f9 100755 --- a/debian/rules +++ b/debian/rules @@ -52,9 +52,6 @@ IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log \ # Installed via other means since we have to rename them. IGNORE += -Xpam_afs -# These will be useful in 1.5, but aren't useful yet. -IGNORE += -Xknfs -Xrmtsysd - # These variable is used only by get-orig-source, which will normally only be # run by maintainers. VERSION = 1.5.50 diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 4c34d38fa..6897f3d89 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -233,7 +233,7 @@ ${DEST}/root.server/usr/afs/bin/volserver: volserver ${DEST}/root.server/usr/afs/bin/vos: vos ${INSTALL} -ns $? $@ -install: ${DESTDIR}${afssrvlibexecdir}/volserver ${DESTDIR}${afssrvlibexecdir}/vos +install: ${DESTDIR}${afssrvlibexecdir}/volserver ${DESTDIR}${afssrvsbindir}/vos clean: $(RM) -f *.o volserver vos core AFS_component_version_number.c @@ -242,7 +242,7 @@ include ../config/Makefile.version ${DESTDIR}${afssrvlibexecdir}/volserver: volserver ${INSTALL} -ns $? $@ -${DESTDIR}${afssrvlibexecdir}/vos: vos +${DESTDIR}${afssrvsbindir}/vos: vos ${INSTALL} -ns $? $@ dest: ${DEST}/root.server/usr/afs/bin/volserver ${DEST}/root.server/usr/afs/bin/vos -- 2.39.5