Move restorevol to bin from sbin

restorevol only requires access to a dump file and write access to the
directory in which the dump is being unpacked.  It doesn't require being
a superuser, so it should be installed in bin instead of sbin.  Also
move the man page to section 1 and update references accordingly.

Reviewed-on: http://gerrit.openafs.org/333
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/doc/man-pages/pod8/restorevol.pod b/doc/man-pages/pod1/restorevol.pod
similarity index 98%
rename from doc/man-pages/pod8/restorevol.pod
rename to doc/man-pages/pod1/restorevol.pod
index 03ffd8d..cf848ba 100644 (file)
--- a/doc/man-pages/pod8/restorevol.pod
+++ b/doc/man-pages/pod1/restorevol.pod
@@ -33,45 +33,45 @@ The restore process is as follows:
 
 =over 4
 
-=item 1. 
+=item 1.
 
 The dump file will be restored within the current directory or that
 specified with B<-dir>.
 
-=item 2. 
+=item 2.
 
 Within this directory, a subdir is created.  It's name is the RW volume
 name that was dumped.  An extension can be appended to this directory name
 with B<-extension>.
 
-=item 3. 
+=item 3.
 
 All mountpoints will appear as symbolic links to the volume name.  The
 path name to the volume will be either that in B<-mountpoint>, or B<-dir>.
 Symbolic links remain untouched.
 
-=item 4. 
+=item 4.
 
 You can change your umask during the restore with B<-umask>.  Otherwise,
 B<restorevol> uses your current umask.  Mode bits for directories are 0777
 (then AND'ed with the umask).  Mode bits for files are the owner mode bits
 duplicated accross group and user (then AND'ed with the umask).
 
-=item 5. 
+=item 5.
 
 For restores of full dumps, if a directory says it has a file and the file
 is not found, then a symbolic link F<< AFSFile-<#> >> will appear in that
 restored tree.  Restores of incremental dumps remove all these files at
 the end (expensive because it is a tree search).
 
-=item 6. 
+=item 6.
 
 If a file or directory was found in the dump but found not to be connected
 to the hierarchical tree, then the file or directory will be connected at
 the root of the tree as F<< __ORPHANEDIR__.<#> >> or F<<
 __ORPHANFILE__.<#> >>.
 
-=item 7. 
+=item 7.
 
 ACLs are not restored.
 

diff --git a/doc/man-pages/pod1/vos_dump.pod b/doc/man-pages/pod1/vos_dump.pod
index 5dce826..76b028f 100644 (file)
--- a/doc/man-pages/pod1/vos_dump.pod
+++ b/doc/man-pages/pod1/vos_dump.pod
@@ -206,7 +206,7 @@ to insert and write in the directory that houses the file.
 
 =head1 SEE ALSO
 
-L<restorevol(8)>,
+L<restorevol(1)>,
 L<vos(1)>,
 L<vos_examine(1)>,
 L<vos_listvldb(1)>,

diff --git a/doc/man-pages/pod1/vos_restore.pod b/doc/man-pages/pod1/vos_restore.pod
index 7640f78..c5005c1 100644 (file)
--- a/doc/man-pages/pod1/vos_restore.pod
+++ b/doc/man-pages/pod1/vos_restore.pod
@@ -221,7 +221,7 @@ logged on to a server machine as the local superuser C<root>.
 
 =head1 SEE ALSO
 
-L<restorevol(8)>,
+L<restorevol(1)>,
 L<vos(1)>,
 L<vos_dump(1)>,
 L<vos_examine(1)>,

diff --git a/doc/man-pages/pod8/read_tape.pod b/doc/man-pages/pod8/read_tape.pod
index d2990a8..108c0d3 100644 (file)
--- a/doc/man-pages/pod8/read_tape.pod
+++ b/doc/man-pages/pod8/read_tape.pod
@@ -96,7 +96,7 @@ The issuer must have access to read and write to the specified tape device.
 =head1 SEE ALSO
 
 L<backup(8)>,
-L<restorevol(8)>,
+L<restorevol(1)>,
 L<vos_restore(1)>
 
 =head1 COPYRIGHT

diff --git a/doc/man-pages/pod8/voldump.pod b/doc/man-pages/pod8/voldump.pod
index 71d5b4a..4922c8b 100644 (file)
--- a/doc/man-pages/pod8/voldump.pod
+++ b/doc/man-pages/pod8/voldump.pod
@@ -86,7 +86,7 @@ local superuser C<root> on the file server machine.
 =head1 SEE ALSO
 
 L<bos_shutdown(8)>,
-L<restorevol(8)>,
+L<restorevol(1)>,
 L<volserver(8)>,
 L<vos_dump(1)>,
 L<vos_restore(1)>

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 6ae1e2a..4380eac 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -1139,6 +1139,7 @@ grep -v "^#" >openafs-file-list <<EOF-openafs-file-list
 %{_bindir}/pagsh
 %{_bindir}/pagsh.krb
 %{_bindir}/pts
+%{_bindir}/restorevol
 %{_bindir}/scout
 %{_bindir}/sys
 %{_bindir}/tokens
@@ -1152,7 +1153,6 @@ grep -v "^#" >openafs-file-list <<EOF-openafs-file-list
 %{_sbindir}/fstrace
 %{_sbindir}/kas
 %{_sbindir}/read_tape
-%{_sbindir}/restorevol
 %{_sbindir}/rxdebug
 %{_sbindir}/uss
 %{_sbindir}/vos
@@ -1485,6 +1485,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_sbindir}/vldb_convert
 %{_sbindir}/voldump
 %{initdir}/openafs-server
+%{_mandir}/man1/restorevol.*
 %{_mandir}/man5/AuthLog.*
 %{_mandir}/man5/BackupLog.*
 %{_mandir}/man5/BosConfig.*
@@ -1517,7 +1518,6 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_mandir}/man8/prdb_check.*
 %{_mandir}/man8/ptserver.*
 %{_mandir}/man8/pt_util.*
-%{_mandir}/man8/restorevol.*
 %{_mandir}/man8/salvager.*
 %{_mandir}/man8/salvageserver.*
 %{_mandir}/man8/upclient.*

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index f9e0fcd..872dd4d 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -144,7 +144,7 @@ install: restorevol voldump volser.h volint.h vos volserver libvolser.a
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL_PROGRAM} restorevol ${DESTDIR}${sbindir}/restorevol
+       ${INSTALL_PROGRAM} restorevol ${DESTDIR}${bindir}/restorevol
        ${INSTALL_PROGRAM} voldump ${DESTDIR}${sbindir}/voldump
        ${INSTALL_DATA} volser.h ${DESTDIR}${includedir}/afs/volser.h
        ${INSTALL_DATA} volint.h ${DESTDIR}${includedir}/afs/volint.h