TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB tdebase: Rename the tdm-trinity init script to tdm

Browse Source 
to match with the systemd service name

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/3/head
Slávek Banko 8 years ago
parent f31341fd14
commit 70d1e4044e
16 changed files with 124 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
debian/lenny/tdebase/debian/rules vendored
Unescape View File

@ -123,6 +123,8 @@ install/tdm-trinity::
binary-install/tdm-trinity:: binary-install/tdm-trinity::
mkdir -p debian/tdm-trinity/etc/init mkdir -p debian/tdm-trinity/etc/init
mkdir -p debian/tdm-trinity/etc/init.d
install -p -D -m755 debian/tdm.init debian/tdm-trinity/etc/init.d/tdm
install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity
install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np

1
debian/lenny/tdebase/debian/tdm-trinity.maintscript vendored
Unescape View File

@ -0,0 +1 @@
mv_conffile /etc/init.d/tdm-trinity /etc/init.d/tdm

26
debian/lenny/tdebase/debian/tdm-trinity.postinst vendored
Unescape View File

@ -107,8 +107,10 @@ case "$1" in
echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove."
fi fi
if [ -f /etc/init.d/tdm-trinity ] && \
[ ! -x "`which dpkg-maintscript-helper 2>/dev/null`" ]; then
rm -f /etc/init.d/tdm-trinity
fi
;; ;;
@ -122,21 +124,25 @@ case "$1" in
esac esac
if [ -x "/etc/init.d/tdm-trinity" ]; then if [ -x "/etc/init.d/tdm" ]; then
if [ -x "`which insserv 2>/dev/null`" ]; then if [ -x "`which insserv 2>/dev/null`" ]; then
insserv tdm-trinity >/dev/null insserv tdm >/dev/null
else else
update-rc.d tdm-trinity defaults 13 01 >/dev/null if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm defaults 13 01 >/dev/null
fi
fi fi
fi fi
if [ -n "$NOSTART" ]; then if [ ! -n "$NOSTART" ]; then
exit 0 if [ -x "`which service 2>/dev/null`" ]; then
else service tdm start || true
else
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
invoke-rc.d tdm-trinity start || true invoke-rc.d tdm start || true
else else
/etc/init.d/tdm-trinity start || true /etc/init.d/tdm start || true
fi
fi fi
fi fi

9
debian/lenny/tdebase/debian/tdm-trinity.postrm vendored
Unescape View File

@ -33,6 +33,15 @@ if [ "$1" = "purge" ]; then
rm -f /var/log/tdm-trinity.log* rm -f /var/log/tdm-trinity.log*
fi fi
if [ "$1" = "purge" ] ; then
if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm remove >/dev/null
fi
fi
if [ -d /run/systemd/system ] ; then
systemctl --system daemon-reload >/dev/null || true
fi
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

6
debian/lenny/tdebase/debian/tdm-trinity.preinst vendored
Unescape View File

@ -9,6 +9,12 @@ case "$1" in
rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm
rm -f /etc/trinity/tdm/Xresources rm -f /etc/trinity/tdm/Xresources
rm -f /etc/menu-methods/tdm rm -f /etc/menu-methods/tdm
if [ -f /etc/init.d/tdm-trinity ]; then
if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm-trinity remove >/dev/null
fi
fi
;; ;;
install) install)

14
debian/lenny/tdebase/debian/tdm-trinity.prerm vendored
Unescape View File

@ -86,11 +86,17 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
fi fi
if [ -n "$STOP" ]; then if [ -n "$STOP" ]; then
if [ -x "`which service 2>/dev/null`" ]; then
service tdm stop || true
else
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
invoke-rc.d tdm-trinity stop || true invoke-rc.d tdm stop || true
else else
/etc/init.d/tdm-trinity stop || true /etc/init.d/tdm stop || true
fi
fi fi
[ ! -e /var/run/tdm-trinity.upgrade ] ||
rm -f /var/run/tdm-trinity.upgrade
else else
if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
touch /var/run/tdm-trinity.upgrade touch /var/run/tdm-trinity.upgrade
@ -98,7 +104,7 @@ else
fi fi
if [ -n "$REMOVING" ]; then if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/tdm-trinity rm -f /etc/init.d/tdm
[ ! -e /etc/init/tdm-trinity.conf ] || \ [ ! -e /etc/init/tdm-trinity.conf ] || \
rm -f /etc/init/tdm-trinity.conf rm -f /etc/init/tdm-trinity.conf
fi fi
@ -178,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
fi fi
fi fi
#DEBHELPER#
exit 0 exit 0

4
debian/lenny/tdebase/debian/tdm-trinity.templates vendored
Unescape View File

@ -23,8 +23,8 @@ Description: internal use only
Template: tdm-trinity/stop_running_server_with_children Template: tdm-trinity/stop_running_server_with_children
Type: boolean Type: boolean
Default: false Default: false
_Description: Stop the tdm-trinity daemon? _Description: Stop the tdm daemon?
The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade
and removal, but it appears to be managing at least one running X session. and removal, but it appears to be managing at least one running X session.
. .
If tdm is stopped now, any X sessions it manages will be terminated. If tdm is stopped now, any X sessions it manages will be terminated.

32
debian/lenny/tdebase/debian/tdm-trinity.init → debian/lenny/tdebase/debian/tdm.init vendored
Unescape View File

@ -1,16 +1,16 @@
#!/bin/sh #!/bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: x-display-manager tdm-trinity # Provides: x-display-manager tdm
# Required-Start: $local_fs $remote_fs # Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs
# Should-Start: console-screen kbd acpid hal krb5-kdc nis # Should-Start: console-screen kbd acpid hal krb5-kdc ypbind
# Should-Stop: console-screen kbd # Should-Stop: console-screen kbd
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: X display manager for Trinity # Short-Description: X display manager for Trinity
# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. # Description: TDM manages a collection of X servers, which may be on the local host or remote machines.
### END INIT INFO ### END INIT INFO
# /etc/init.d/tdm-trinity: start or stop the X display manager # /etc/init.d/tdm: start or stop the X display manager
# Script originally stolen from the xdm package # Script originally stolen from the xdm package
# #
# description: Trinity Display Manager # description: Trinity Display Manager
@ -20,7 +20,7 @@
set -e set -e
# To start tdm-trinity even if it is not the default display manager, change # To start tdm even if it is not the default display manager, change
# HEED_DEFAULT_DISPLAY_MANAGER to "false." # HEED_DEFAULT_DISPLAY_MANAGER to "false."
HEED_DEFAULT_DISPLAY_MANAGER=true HEED_DEFAULT_DISPLAY_MANAGER=true
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
@ -114,27 +114,27 @@ case "$1" in
if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
[ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
[ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
log_warning_msg "Not starting Trinity Display Manager (tdm-trinity); it is not the default display manager." log_warning_msg "Not starting Trinity Display Manager (tdm); it is not the default display manager."
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_begin_msg "Starting Trinity Display Manager: tdm-trinity" log_action_begin_msg "Starting Trinity Display Manager: tdm"
if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG; then if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG; then
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_end_msg 0 log_action_end_msg 0
log_warning_msg "Trinity Display Manager tdm-trinity already running" log_warning_msg "Trinity Display Manager (tdm) already running"
fi fi
fi fi
;; ;;
restart) restart)
/etc/init.d/tdm-trinity stop /etc/init.d/tdm stop
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
if stillrunning; then if stillrunning; then
exit 1 exit 1
fi fi
fi fi
/etc/init.d/tdm-trinity start /etc/init.d/tdm start
;; ;;
reload) reload)
@ -143,19 +143,19 @@ case "$1" in
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_end_msg 1 log_action_end_msg 1
log_failure_msg "tdm-trinity not running." log_failure_msg "tdm not running."
fi fi
;; ;;
force-reload) force-reload)
/etc/init.d/tdm-trinity reload /etc/init.d/tdm reload
;; ;;
stop) stop)
log_action_begin_msg "Stopping Trinity Display Manager: tdm-trinity" log_action_begin_msg "Stopping Trinity Display Manager: tdm"
if [ ! -f $PIDFILE ]; then if [ ! -f $PIDFILE ]; then
log_action_end_msg 0 log_action_end_msg 0
log_failure_msg "Trinity Display Manager tdm-trinity not running ($PIDFILE not found)." log_failure_msg "Trinity Display Manager (tdm) not running ($PIDFILE not found)."
exit 0 exit 0
else else
DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]')
@ -166,7 +166,7 @@ case "$1" in
sleep 1 sleep 1
else else
log_action_end_msg 0 log_action_end_msg 0
log_failure_msg "Trinity Display Manager tdm-trinity not running" log_failure_msg "Trinity Display Manager (tdm) not running"
fi fi
fi fi
while [ $KILLCOUNT -le 5 ]; do while [ $KILLCOUNT -le 5 ]; do
@ -180,7 +180,7 @@ case "$1" in
done done
if stillrunning; then if stillrunning; then
log_action_end_msg 1 log_action_end_msg 1
log_failure_msg "Trinity Display Manager tdm-trinity not responding to TERM signal (pid $DAEMONPID)" log_failure_msg "Trinity Display Manager (tdm) not responding to TERM signal (pid $DAEMONPID)"
else else
rm -f $UPGRADEFILE rm -f $UPGRADEFILE
fi fi
@ -194,7 +194,7 @@ case "$1" in
;; ;;
*) *)
echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" echo "Usage: /etc/init.d/tdm {start|stop|restart|reload|force-reload}"
exit 1 exit 1
;; ;;
esac esac

2
debian/squeeze/tdebase/debian/rules vendored
Unescape View File

@ -123,6 +123,8 @@ install/tdm-trinity::
binary-install/tdm-trinity:: binary-install/tdm-trinity::
mkdir -p debian/tdm-trinity/etc/init mkdir -p debian/tdm-trinity/etc/init
mkdir -p debian/tdm-trinity/etc/init.d
install -p -D -m755 debian/tdm.init debian/tdm-trinity/etc/init.d/tdm
install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity
install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np

1
debian/squeeze/tdebase/debian/tdm-trinity.maintscript vendored
Unescape View File

@ -0,0 +1 @@
mv_conffile /etc/init.d/tdm-trinity /etc/init.d/tdm

22
debian/squeeze/tdebase/debian/tdm-trinity.postinst vendored
Unescape View File

@ -125,8 +125,10 @@ case "$1" in
echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove."
fi fi
if [ -f /etc/init.d/tdm-trinity ] && \
[ ! -x "`which dpkg-maintscript-helper 2>/dev/null`" ]; then
rm -f /etc/init.d/tdm-trinity
fi
;; ;;
@ -140,26 +142,24 @@ case "$1" in
esac esac
if [ -x "/etc/init.d/tdm-trinity" ]; then if [ -x "/etc/init.d/tdm" ]; then
if [ -x "`which insserv 2>/dev/null`" ]; then if [ -x "`which insserv 2>/dev/null`" ]; then
insserv tdm-trinity >/dev/null insserv tdm >/dev/null
else else
if [ -x "`which update-rc.d 2>/dev/null`" ]; then if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm-trinity defaults 13 01 >/dev/null update-rc.d tdm defaults 13 01 >/dev/null
fi fi
fi fi
fi fi
if [ -n "$NOSTART" ]; then if [ ! -n "$NOSTART" ]; then
exit 0
else
if [ -x "`which service 2>/dev/null`" ]; then if [ -x "`which service 2>/dev/null`" ]; then
service tdm-trinity start || true service tdm start || true
else else
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
invoke-rc.d tdm-trinity start || true invoke-rc.d tdm start || true
else else
/etc/init.d/tdm-trinity start || true /etc/init.d/tdm start || true
fi fi
fi fi
fi fi

9
debian/squeeze/tdebase/debian/tdm-trinity.postrm vendored
Unescape View File

@ -33,6 +33,15 @@ if [ "$1" = "purge" ]; then
rm -f /var/log/tdm-trinity.log* rm -f /var/log/tdm-trinity.log*
fi fi
if [ "$1" = "purge" ] ; then
if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm remove >/dev/null
fi
fi
if [ -d /run/systemd/system ] ; then
systemctl --system daemon-reload >/dev/null || true
fi
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

6
debian/squeeze/tdebase/debian/tdm-trinity.preinst vendored
Unescape View File

@ -9,6 +9,12 @@ case "$1" in
rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm
rm -f /etc/trinity/tdm/Xresources rm -f /etc/trinity/tdm/Xresources
rm -f /etc/menu-methods/tdm rm -f /etc/menu-methods/tdm
if [ -f /etc/init.d/tdm-trinity ]; then
if [ -x "`which update-rc.d 2>/dev/null`" ]; then
update-rc.d tdm-trinity remove >/dev/null
fi
fi
;; ;;
install) install)

14
debian/squeeze/tdebase/debian/tdm-trinity.prerm vendored
Unescape View File

@ -86,11 +86,17 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
fi fi
if [ -n "$STOP" ]; then if [ -n "$STOP" ]; then
if [ -x "`which service 2>/dev/null`" ]; then
service tdm stop || true
else
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
invoke-rc.d tdm-trinity stop || true invoke-rc.d tdm stop || true
else else
/etc/init.d/tdm-trinity stop || true /etc/init.d/tdm stop || true
fi
fi fi
[ ! -e /var/run/tdm-trinity.upgrade ] ||
rm -f /var/run/tdm-trinity.upgrade
else else
if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
touch /var/run/tdm-trinity.upgrade touch /var/run/tdm-trinity.upgrade
@ -98,7 +104,7 @@ else
fi fi
if [ -n "$REMOVING" ]; then if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/tdm-trinity rm -f /etc/init.d/tdm
[ ! -e /etc/init/tdm-trinity.conf ] || \ [ ! -e /etc/init/tdm-trinity.conf ] || \
rm -f /etc/init/tdm-trinity.conf rm -f /etc/init/tdm-trinity.conf
fi fi
@ -178,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
fi fi
fi fi
#DEBHELPER#
exit 0 exit 0

4
debian/squeeze/tdebase/debian/tdm-trinity.templates vendored
Unescape View File

@ -23,8 +23,8 @@ Description: internal use only
Template: tdm-trinity/stop_running_server_with_children Template: tdm-trinity/stop_running_server_with_children
Type: boolean Type: boolean
Default: false Default: false
_Description: Stop the tdm-trinity daemon? _Description: Stop the tdm daemon?
The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade
and removal, but it appears to be managing at least one running X session. and removal, but it appears to be managing at least one running X session.
. .
If tdm is stopped now, any X sessions it manages will be terminated. If tdm is stopped now, any X sessions it manages will be terminated.

32
debian/squeeze/tdebase/debian/tdm-trinity.init → debian/squeeze/tdebase/debian/tdm.init vendored
Unescape View File

@ -1,16 +1,16 @@
#!/bin/sh #!/bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: x-display-manager tdm-trinity # Provides: x-display-manager tdm
# Required-Start: $local_fs $remote_fs # Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs
# Should-Start: console-screen kbd acpid hal krb5-kdc nis # Should-Start: console-screen kbd acpid hal krb5-kdc ypbind
# Should-Stop: console-screen kbd # Should-Stop: console-screen kbd
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: X display manager for Trinity # Short-Description: X display manager for Trinity
# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. # Description: TDM manages a collection of X servers, which may be on the local host or remote machines.
### END INIT INFO ### END INIT INFO
# /etc/init.d/tdm-trinity: start or stop the X display manager # /etc/init.d/tdm: start or stop the X display manager
# Script originally stolen from the xdm package # Script originally stolen from the xdm package
# #
# description: Trinity Display Manager # description: Trinity Display Manager
@ -20,7 +20,7 @@
set -e set -e
# To start tdm-trinity even if it is not the default display manager, change # To start tdm even if it is not the default display manager, change
# HEED_DEFAULT_DISPLAY_MANAGER to "false." # HEED_DEFAULT_DISPLAY_MANAGER to "false."
HEED_DEFAULT_DISPLAY_MANAGER=true HEED_DEFAULT_DISPLAY_MANAGER=true
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
@ -114,27 +114,27 @@ case "$1" in
if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
[ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
[ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
log_warning_msg "Not starting Trinity Display Manager (tdm-trinity); it is not the default display manager." log_warning_msg "Not starting Trinity Display Manager (tdm); it is not the default display manager."
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_begin_msg "Starting Trinity Display Manager: tdm-trinity" log_action_begin_msg "Starting Trinity Display Manager: tdm"
if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG; then if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG; then
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_end_msg 0 log_action_end_msg 0
log_warning_msg "Trinity Display Manager tdm-trinity already running" log_warning_msg "Trinity Display Manager (tdm) already running"
fi fi
fi fi
;; ;;
restart) restart)
/etc/init.d/tdm-trinity stop /etc/init.d/tdm stop
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
if stillrunning; then if stillrunning; then
exit 1 exit 1
fi fi
fi fi
/etc/init.d/tdm-trinity start /etc/init.d/tdm start
;; ;;
reload) reload)
@ -143,19 +143,19 @@ case "$1" in
log_action_end_msg 0 log_action_end_msg 0
else else
log_action_end_msg 1 log_action_end_msg 1
log_failure_msg "tdm-trinity not running." log_failure_msg "tdm not running."
fi fi
;; ;;
force-reload) force-reload)
/etc/init.d/tdm-trinity reload /etc/init.d/tdm reload
;; ;;
stop) stop)
log_action_begin_msg "Stopping Trinity Display Manager: tdm-trinity" log_action_begin_msg "Stopping Trinity Display Manager: tdm"
if [ ! -f $PIDFILE ]; then if [ ! -f $PIDFILE ]; then
log_action_end_msg 0 log_action_end_msg 0
log_failure_msg "Trinity Display Manager tdm-trinity not running ($PIDFILE not found)." log_failure_msg "Trinity Display Manager (tdm) not running ($PIDFILE not found)."
exit 0 exit 0
else else
DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]')
@ -166,7 +166,7 @@ case "$1" in
sleep 1 sleep 1
else else
log_action_end_msg 0 log_action_end_msg 0
log_failure_msg "Trinity Display Manager tdm-trinity not running" log_failure_msg "Trinity Display Manager (tdm) not running"
fi fi
fi fi
while [ $KILLCOUNT -le 5 ]; do while [ $KILLCOUNT -le 5 ]; do
@ -180,7 +180,7 @@ case "$1" in
done done
if stillrunning; then if stillrunning; then
log_action_end_msg 1 log_action_end_msg 1
log_failure_msg "Trinity Display Manager tdm-trinity not responding to TERM signal (pid $DAEMONPID)" log_failure_msg "Trinity Display Manager (tdm) not responding to TERM signal (pid $DAEMONPID)"
else else
rm -f $UPGRADEFILE rm -f $UPGRADEFILE
fi fi
@ -194,7 +194,7 @@ case "$1" in
;; ;;
*) *)
echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" echo "Usage: /etc/init.d/tdm {start|stop|restart|reload|force-reload}"
exit 1 exit 1
;; ;;
esac esac
Write Preview
Loading…
Cancel
Save