diff options
Diffstat (limited to 'debian/lenny/tdebase')
-rwxr-xr-x | debian/lenny/tdebase/debian/rules | 2 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.maintscript | 1 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.postinst | 28 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.postrm | 9 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.preinst | 6 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.prerm | 16 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm-trinity.templates | 4 | ||||
-rw-r--r-- | debian/lenny/tdebase/debian/tdm.init (renamed from debian/lenny/tdebase/debian/tdm-trinity.init) | 32 |
8 files changed, 65 insertions, 33 deletions
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index e0803d0fa..423c2311f 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -122,6 +122,8 @@ install/tdm-trinity:: binary-install/tdm-trinity:: 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-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np diff --git a/debian/lenny/tdebase/debian/tdm-trinity.maintscript b/debian/lenny/tdebase/debian/tdm-trinity.maintscript new file mode 100644 index 000000000..312950659 --- /dev/null +++ b/debian/lenny/tdebase/debian/tdm-trinity.maintscript @@ -0,0 +1 @@ +mv_conffile /etc/init.d/tdm-trinity /etc/init.d/tdm diff --git a/debian/lenny/tdebase/debian/tdm-trinity.postinst b/debian/lenny/tdebase/debian/tdm-trinity.postinst index 282662484..0dc696aaa 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.postinst +++ b/debian/lenny/tdebase/debian/tdm-trinity.postinst @@ -107,8 +107,10 @@ case "$1" in echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." 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 -if [ -x "/etc/init.d/tdm-trinity" ]; then +if [ -x "/etc/init.d/tdm" ]; then if [ -x "`which insserv 2>/dev/null`" ]; then - insserv tdm-trinity >/dev/null + insserv tdm >/dev/null 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 -if [ -n "$NOSTART" ]; then - exit 0 -else - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d tdm-trinity start || true +if [ ! -n "$NOSTART" ]; then + if [ -x "`which service 2>/dev/null`" ]; then + service tdm start || true else - /etc/init.d/tdm-trinity start || true + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d tdm start || true + else + /etc/init.d/tdm start || true + fi fi fi diff --git a/debian/lenny/tdebase/debian/tdm-trinity.postrm b/debian/lenny/tdebase/debian/tdm-trinity.postrm index 3dfb32123..0cd027c45 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.postrm +++ b/debian/lenny/tdebase/debian/tdm-trinity.postrm @@ -33,6 +33,15 @@ if [ "$1" = "purge" ]; then rm -f /var/log/tdm-trinity.log* 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# exit 0 diff --git a/debian/lenny/tdebase/debian/tdm-trinity.preinst b/debian/lenny/tdebase/debian/tdm-trinity.preinst index 09163c460..c26af6803 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.preinst +++ b/debian/lenny/tdebase/debian/tdm-trinity.preinst @@ -9,6 +9,12 @@ case "$1" in rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm rm -f /etc/trinity/tdm/Xresources 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) diff --git a/debian/lenny/tdebase/debian/tdm-trinity.prerm b/debian/lenny/tdebase/debian/tdm-trinity.prerm index 6247adb1f..c17a2451f 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.prerm +++ b/debian/lenny/tdebase/debian/tdm-trinity.prerm @@ -86,11 +86,17 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || fi if [ -n "$STOP" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d tdm-trinity stop || true + if [ -x "`which service 2>/dev/null`" ]; then + service tdm stop || true else - /etc/init.d/tdm-trinity stop || true + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d tdm stop || true + else + /etc/init.d/tdm stop || true + fi fi + [ ! -e /var/run/tdm-trinity.upgrade ] || + rm -f /var/run/tdm-trinity.upgrade else if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then touch /var/run/tdm-trinity.upgrade @@ -98,7 +104,7 @@ else fi if [ -n "$REMOVING" ]; then - rm -f /etc/init.d/tdm-trinity + rm -f /etc/init.d/tdm [ ! -e /etc/init/tdm-trinity.conf ] || \ rm -f /etc/init/tdm-trinity.conf fi @@ -178,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi fi +#DEBHELPER# + exit 0 diff --git a/debian/lenny/tdebase/debian/tdm-trinity.templates b/debian/lenny/tdebase/debian/tdm-trinity.templates index ac4f2df43..9c54e0e9d 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.templates +++ b/debian/lenny/tdebase/debian/tdm-trinity.templates @@ -23,8 +23,8 @@ Description: internal use only Template: tdm-trinity/stop_running_server_with_children Type: boolean Default: false -_Description: Stop the tdm-trinity daemon? - The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade +_Description: Stop the tdm daemon? + 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. . If tdm is stopped now, any X sessions it manages will be terminated. diff --git a/debian/lenny/tdebase/debian/tdm-trinity.init b/debian/lenny/tdebase/debian/tdm.init index e5286ff8d..664bbccb8 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.init +++ b/debian/lenny/tdebase/debian/tdm.init @@ -1,16 +1,16 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: x-display-manager tdm-trinity +# Provides: x-display-manager tdm # Required-Start: $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 # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # 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. ### 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 # # description: Trinity Display Manager @@ -20,7 +20,7 @@ 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=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager @@ -114,27 +114,27 @@ case "$1" in if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(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 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 log_action_end_msg 0 else 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 ;; restart) - /etc/init.d/tdm-trinity stop + /etc/init.d/tdm stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/tdm-trinity start + /etc/init.d/tdm start ;; reload) @@ -143,19 +143,19 @@ case "$1" in log_action_end_msg 0 else log_action_end_msg 1 - log_failure_msg "tdm-trinity not running." + log_failure_msg "tdm not running." fi ;; force-reload) - /etc/init.d/tdm-trinity reload + /etc/init.d/tdm reload ;; stop) - log_action_begin_msg "Stopping Trinity Display Manager: tdm-trinity" + log_action_begin_msg "Stopping Trinity Display Manager: tdm" if [ ! -f $PIDFILE ]; then 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 else DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') @@ -166,7 +166,7 @@ case "$1" in sleep 1 else 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 while [ $KILLCOUNT -le 5 ]; do @@ -180,7 +180,7 @@ case "$1" in done if stillrunning; then 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 rm -f $UPGRADEFILE 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 ;; esac |