rpms/bacula/F-13 bacula-traymonitor.console_apps, NONE, 1.1 bacula-wxconsole.console_apps, NONE, 1.1 bacula-bat.desktop, 1.3, 1.4 bacula-bwxconsole.desktop, 1.3, 1.4 bacula-dir.init, 1.1, 1.2 bacula-fd.init, 1.1, 1.2 bacula-sd.init, 1.1, 1.2 bacula-traymonitor.desktop, 1.3, 1.4 bacula-wxconsole.desktop, 1.4, 1.5
Jan Görig
jgorig at fedoraproject.org
Thu Jun 3 11:47:07 UTC 2010
Author: jgorig
Update of /cvs/pkgs/rpms/bacula/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11641
Modified Files:
bacula-bat.desktop bacula-bwxconsole.desktop bacula-dir.init
bacula-fd.init bacula-sd.init bacula-traymonitor.desktop
bacula-wxconsole.desktop
Added Files:
bacula-traymonitor.console_apps bacula-wxconsole.console_apps
Log Message:
fixes last commit
--- NEW FILE bacula-traymonitor.console_apps ---
USER=root
PROGRAM=/usr/sbin/bacula-tray-monitor
SESSION=true
--- NEW FILE bacula-wxconsole.console_apps ---
USER=root
PROGRAM=/usr/sbin/bwxconsole
SESSION=true
Index: bacula-bat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-bat.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-bat.desktop 23 Jul 2009 15:33:17 -0000 1.3
+++ bacula-bat.desktop 3 Jun 2010 11:47:06 -0000 1.4
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula Bat Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=/usr/sbin/bat -c /etc/bacula/bat.conf
+Exec=/usr/bin/bat -c /etc/bacula/bat.conf
Icon=bat_icon
Terminal=false
Type=Application
Index: bacula-bwxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-bwxconsole.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-bwxconsole.desktop 23 Jul 2009 15:33:17 -0000 1.3
+++ bacula-bwxconsole.desktop 3 Jun 2010 11:47:06 -0000 1.4
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula WX Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=/usr/sbin/bwxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/bin/bwxconsole -c /etc/bacula/bwxconsole.conf
Icon=wxwin16x16
Terminal=false
Type=Application
Index: bacula-dir.init
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-dir.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bacula-dir.init 24 Jul 2007 20:11:04 -0000 1.1
+++ bacula-dir.init 3 Jun 2010 11:47:06 -0000 1.2
@@ -30,7 +30,7 @@ checkconf() {
# If yes, refuse to start, the user has never touched the config.
grep -q '^[^#].*_PASSWORD@@' $CONFIG
if [ $? -eq 0 ]; then
- echo -n "Error: Not been configured"
+ echo -n "Error: Program has not been configured"
echo_failure
echo
exit 1
@@ -50,7 +50,7 @@ checkdatabase() {
# Check if mysqld is running
service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
- echo -n "Error: MySQL not running"
+ echo -n "Error: MySQL is not running"
echo_failure
echo
exit 1
@@ -60,7 +60,7 @@ checkdatabase() {
# Check if postgresql is running
service postgresql status > /dev/null 2>&1
if [ $? -ne 0 ]; then
- echo -n "Error: PostgreSQL not running"
+ echo -n "Error: PostgreSQL is not running"
echo_failure
echo
exit 1
@@ -76,6 +76,8 @@ checkdatabase() {
}
start() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Starting $prog: "
checkconf
# Removed for now, as the db might not be on localhost
@@ -88,6 +90,8 @@ start() {
}
stop() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Shutting down $prog: "
killproc $prog
RETVAL=$?
@@ -106,23 +110,22 @@ case "$1" in
status)
status $prog
;;
- restart)
- stop
+ restart|force-reload)
+ stop
start
- RETVAL=$?
;;
reload)
;;
- condrestart)
+ condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then
stop
start
- RETVAL=$?
fi
;;
*)
- echo "Usage: $prog {start|stop|status|reload|restart}"
- exit 1
+ echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}"
+ [ "$1" = "usage" ] && exit 0
+ exit 2
;;
esac
exit $?
Index: bacula-fd.init
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-fd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bacula-fd.init 24 Jul 2007 20:11:04 -0000 1.1
+++ bacula-fd.init 3 Jun 2010 11:47:06 -0000 1.2
@@ -30,7 +30,7 @@ checkconf() {
# If yes, refuse to start, the user has never touched the config.
grep -q '_PASSWORD@@' $CONFIG
if [ $? -eq 0 ]; then
- echo -n "Error: Not been configured"
+ echo -n "Error: Program has not been configured"
echo_failure
echo
exit 1
@@ -39,6 +39,8 @@ checkconf() {
start() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Starting $prog: "
checkconf
daemon $prog $OPTS
@@ -49,6 +51,8 @@ start() {
}
stop() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Shutting down $prog: "
killproc $prog
RETVAL=$?
@@ -67,23 +71,22 @@ case "$1" in
status)
status $prog
;;
- restart)
- stop
+ restart|force-reload)
+ stop
start
- RETVAL=$?
;;
reload)
;;
- condrestart)
+ condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then
stop
start
- RETVAL=$?
fi
;;
*)
- echo "Usage: $prog {start|stop|status|reload|restart}"
- exit 1
+ echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}"
+ [ "$1" = "usage" ] && exit 0
+ exit 2
;;
esac
exit $?
Index: bacula-sd.init
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-sd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bacula-sd.init 24 Jul 2007 20:11:04 -0000 1.1
+++ bacula-sd.init 3 Jun 2010 11:47:06 -0000 1.2
@@ -29,7 +29,7 @@ checkconf() {
# If yes, refuse to start, the user has never touched the config.
grep -q '^[^#].*_PASSWORD@@' $CONFIG
if [ $? -eq 0 ]; then
- echo -n "Error: Not been configured"
+ echo -n "Error: Program has not been configured"
echo_failure
echo
exit 1
@@ -49,7 +49,7 @@ checkdatabase() {
# Check if mysqld is running
service mysqld status > /dev/null 2>&1
if [ $? -ne 0 ]; then
- echo -n "Error: MySQL not running"
+ echo -n "Error: MySQL is not running"
echo_failure
echo
exit 1
@@ -59,7 +59,7 @@ checkdatabase() {
# Check if postgresql is running
service postgresql status > /dev/null 2>&1
if [ $? -ne 0 ]; then
- echo -n "Error: PostgreSQL not running"
+ echo -n "Error: PostgreSQL is not running"
echo_failure
echo
exit 1
@@ -75,6 +75,8 @@ checkdatabase() {
}
start() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Starting $prog: "
checkconf
# Disabled, the DB does not necessarily run on the same machine
@@ -87,6 +89,8 @@ start() {
}
stop() {
+ [ "$EUID" != "0" ] && exit 4
+
echo -n "Shutting down $prog: "
killproc $prog
RETVAL=$?
@@ -105,23 +109,22 @@ case "$1" in
status)
status $prog
;;
- restart)
- stop
+ restart|force-reload)
+ stop
start
- RETVAL=$?
;;
reload)
;;
- condrestart)
+ condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then
stop
start
- RETVAL=$?
fi
;;
*)
- echo "Usage: $prog {start|stop|status|reload|restart}"
- exit 1
+ echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}"
+ [ "$1" = "usage" ] && exit 0
+ exit 2
;;
esac
exit $?
Index: bacula-traymonitor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-traymonitor.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-traymonitor.desktop 23 Jul 2009 15:33:17 -0000 1.3
+++ bacula-traymonitor.desktop 3 Jun 2010 11:47:07 -0000 1.4
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula Monitor
GenericName=Bacula Tray Monitor
Comment=Monitor your Bacula Backup server
-Exec=/usr/sbin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
+Exec=/usr/bin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
Icon=bacula-tray-monitor.xpm
Terminal=false
Type=Application
Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula-wxconsole.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bacula-wxconsole.desktop 23 Jul 2009 15:33:17 -0000 1.4
+++ bacula-wxconsole.desktop 3 Jun 2010 11:47:07 -0000 1.5
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula WX Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=/usr/sbin/wxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/bin/bwxconsole -c /etc/bacula/bwxconsole.conf
Icon=wxwin16x16
Terminal=false
Type=Application
More information about the scm-commits
mailing list