From 0768be51831f61a0622ef85a310ba47c3bc78b18 Mon Sep 17 00:00:00 2001 From: James O'Gorman Date: Wed, 27 Feb 2008 18:50:44 +0000 Subject: * Move all commands from bin to sbin on Unix platforms * Update all associated docs and contributed distribution files --- contrib/debian/bbackupd.in | 2 +- contrib/debian/bbstored.in | 2 +- contrib/redhat/bbackupd.in | 8 ++++---- contrib/redhat/bbstored.in | 8 ++++---- contrib/rpm/boxbackup.spec | 6 +++--- contrib/solaris/bbackupd-smf-method.in | 2 +- contrib/solaris/bbstored-smf-method.in | 2 +- contrib/suse/bbackupd.in | 2 +- contrib/suse/bbstored.in | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'contrib') diff --git a/contrib/debian/bbackupd.in b/contrib/debian/bbackupd.in index 78d4f4ee..281eee91 100644 --- a/contrib/debian/bbackupd.in +++ b/contrib/debian/bbackupd.in @@ -2,7 +2,7 @@ # Start and stop the Box Backup client daemon. -BBACKUPD=@bindir_expanded@/bbackupd +BBACKUPD=@sbindir_expanded@/bbackupd CONFIG=@sysconfdir_expanded@/box/bbackupd.conf PIDFILE=@localstatedir_expanded@/bbackupd.pid diff --git a/contrib/debian/bbstored.in b/contrib/debian/bbstored.in index da6a50a0..ec0bfefb 100644 --- a/contrib/debian/bbstored.in +++ b/contrib/debian/bbstored.in @@ -2,7 +2,7 @@ # Start and stop the Box Backup server daemon. -BBSTORED=@bindir_expanded@/bbstored +BBSTORED=@sbindir_expanded@/bbstored CONFIG=@sysconfdir_expanded@/box/bbstored.conf PIDFILE=@localstatedir_expanded@/bbstored.pid diff --git a/contrib/redhat/bbackupd.in b/contrib/redhat/bbackupd.in index e8ecdc68..2f51137a 100644 --- a/contrib/redhat/bbackupd.in +++ b/contrib/redhat/bbackupd.in @@ -23,7 +23,7 @@ prog="bbackupd" start() { echo -n $"Starting $prog: " - daemon $prog + daemon @sbindir_expanded@/$prog RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog @@ -32,7 +32,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc $prog + killproc @sbindir_expanded@/$prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog @@ -40,7 +40,7 @@ stop() { } rhstatus() { - status $prog + status @sbindir_expanded@/$prog } restart() { @@ -50,7 +50,7 @@ restart() { reload() { echo -n $"Reloading $prog configuration: " - killproc $prog -HUP + killproc @sbindir_expanded@/$prog -HUP retval=$? echo return $RETVAL diff --git a/contrib/redhat/bbstored.in b/contrib/redhat/bbstored.in index c7675df5..755a8569 100644 --- a/contrib/redhat/bbstored.in +++ b/contrib/redhat/bbstored.in @@ -23,7 +23,7 @@ prog="bbstored" start() { echo -n $"Starting $prog: " - daemon $prog + daemon @sbindir_expanded@/$prog RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog @@ -32,7 +32,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc $prog + killproc @sbindir_expanded@/$prog RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog @@ -40,7 +40,7 @@ stop() { } rhstatus() { - status $prog + status @sbindir_expanded@/$prog } restart() { @@ -50,7 +50,7 @@ restart() { reload() { echo -n $"Reloading $prog configuration: " - killproc $prog -HUP + killproc @sbindir_expanded@/$prog -HUP retval=$? echo return $RETVAL diff --git a/contrib/rpm/boxbackup.spec b/contrib/rpm/boxbackup.spec index a5b287ff..23b61b5f 100644 --- a/contrib/rpm/boxbackup.spec +++ b/contrib/rpm/boxbackup.spec @@ -39,8 +39,8 @@ Version: ###DISTRIBUTION-VERSION-NUMBER### Release: 1 License: BSD Group: Applications/Archiving -Packager: Martin Ebourne -URL: http://www.fluffy.co.uk/boxbackup/ +Packager: Martin Ebourne +URL: http://www.boxbackup.org/ Source0: %{ident}.tgz Requires: openssl >= 0.9.7a BuildRoot: %{_tmppath}/%{ident}-%{release}-root @@ -143,7 +143,7 @@ ln -s ../../%{init_dir}/bbstored $RPM_BUILD_ROOT%{_sbindir}/rcbbstored %define server_dir parcels/%{ident}-backup-server-linux-gnu install %{server_dir}/bbstored $RPM_BUILD_ROOT%{_sbindir} install %{server_dir}/bbstoreaccounts $RPM_BUILD_ROOT%{_sbindir} -install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_bindir} +install %{server_dir}/bbstored-certs $RPM_BUILD_ROOT%{_sbindir} install %{server_dir}/bbstored-config $RPM_BUILD_ROOT%{_sbindir} install %{server_dir}/raidfile-config $RPM_BUILD_ROOT%{_sbindir} diff --git a/contrib/solaris/bbackupd-smf-method.in b/contrib/solaris/bbackupd-smf-method.in index 2c839961..0ff610bf 100755 --- a/contrib/solaris/bbackupd-smf-method.in +++ b/contrib/solaris/bbackupd-smf-method.in @@ -5,7 +5,7 @@ case $1 in # SMF arguments (start and restart [really "refresh"]) 'start') - @bindir_expanded@/bbackupd + @sbindir_expanded@/bbackupd ;; 'restart') diff --git a/contrib/solaris/bbstored-smf-method.in b/contrib/solaris/bbstored-smf-method.in index 0ea25e40..dbdb3e69 100755 --- a/contrib/solaris/bbstored-smf-method.in +++ b/contrib/solaris/bbstored-smf-method.in @@ -4,7 +4,7 @@ case $1 in # SMF arguments (start and restart [really "refresh"]) 'start') - @bindir_expanded@/bbstored + @sbindir_expanded@/bbstored ;; 'restart') diff --git a/contrib/suse/bbackupd.in b/contrib/suse/bbackupd.in index d3a5659e..868e2c85 100644 --- a/contrib/suse/bbackupd.in +++ b/contrib/suse/bbackupd.in @@ -28,7 +28,7 @@ ### END INIT INFO # Check for missing binaries (stale symlinks should not happen) -BBACKUPD_BIN=@bindir_expanded@/bbackupd +BBACKUPD_BIN=@sbindir_expanded@/bbackupd if [ ! -x $BBACKUPD_BIN ] ; then echo "$BBACKUPD_BIN not installed" exit 5 diff --git a/contrib/suse/bbstored.in b/contrib/suse/bbstored.in index e8c74278..26776f4b 100644 --- a/contrib/suse/bbstored.in +++ b/contrib/suse/bbstored.in @@ -29,7 +29,7 @@ # # Check for missing binaries (stale symlinks should not happen) -BBSTORED_BIN=@bindir_expanded@/bbstored +BBSTORED_BIN=@sbindir_expanded@/bbstored if [ ! -x $BBSTORED_BIN ] ; then echo "$BBSTORED_BIN not installed" exit 5 -- cgit v1.2.3