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

Fixes for kdm-trinity and tdm-trinity on Debian and Ubuntu

Browse Source 
+ remove kdm-trinity.conf during upgrade to tdm-trinity
+ remove tdm-trinity.conf when remove tdm-trinity
+ stop kdm-trinity during upgrade to tdm-trinity
+ start tdm-trinity during install tdm-trinity
+ stop tdm-trinity when remove tdm-trinity
pull/3/head
Slávek Banko 11 years ago
parent 0c2f8a56ca
commit ab0666a793
9 changed files with 84 additions and 54 deletions
Show Stats Download Patch File Download Diff File

21
debian/lenny/metapackages/rename-meta/debian/kdm-trinity.preinst vendored
Unescape View File

@ -14,15 +14,14 @@ fi
# remove former service # remove former service
if [ -e /etc/init.d/kdm-trinity ]; then if [ -e /etc/init.d/kdm-trinity ]; then
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/kdm-trinity
fi fi
if [ -n "$REMOVING" ]; then if [ -n "$REMOVING" ]; then
# is there an kdm process running? # is there an kdm-trinity process running?
if start-stop-daemon --stop --quiet --signal 0 --name kdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/kdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/kdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/kdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
@ -39,11 +38,11 @@ if [ -n "$REMOVING" ]; then
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high kdm/stop_running_server_with_children || true db_input high kdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get kdm/stop_running_server_with_children; then if db_get kdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -51,7 +50,7 @@ if [ -n "$REMOVING" ]; then
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset kdm/stop_running_server_with_children seen false db_fset kdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -68,6 +67,12 @@ if [ -n "$STOP" ]; then
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/kdm-trinity
[ ! -e /etc/init/kdm-trinity.conf ] || \
rm -f /etc/init/kdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager

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

@ -63,7 +63,7 @@ for HOST in "" \
fi fi
done done
# or if it's already running # or if it's already running
if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --exec /opt/trinity/bin/tdm; then
NOSTART=yes NOSTART=yes
fi fi
# or if the options file says not to # or if the options file says not to

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

@ -24,14 +24,13 @@ if [ -e /usr/share/debconf/confmodule ]; then
fi fi
case "$1" in case "$1" in
# we NEVER want to unconditionally stop tdm; see below # we NEVER want to unconditionally stop tdm-trinity; see below
upgrade|failed-upgrade) upgrade|failed-upgrade)
REMOVING= REMOVING=
;; ;;
remove|deconfigure) remove|deconfigure)
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/tdm-trinity
;; ;;
*) *)
@ -41,16 +40,16 @@ case "$1" in
esac esac
STOP= STOP=
# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # are we supposed to restart on upgrade? if REMOVING tdm-trinity, we don't care what
# the user says, we have to stop the daemon # the user says, we have to stop the daemon
if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
[ -n "$REMOVING" ]; then [ -n "$REMOVING" ]; then
# is there an tdm process running? # is there an tdm process running?
if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/tdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/tdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/tdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
# make sure we got numbers back # make sure we got numbers back
[ $PROCESS -eq $PROCESS ] 2> /dev/null || [ $PROCESS -eq $PROCESS ] 2> /dev/null ||
@ -65,11 +64,11 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high tdm/stop_running_server_with_children || true db_input high tdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get tdm/stop_running_server_with_children; then if db_get tdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -77,7 +76,7 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset tdm/stop_running_server_with_children seen false db_fset tdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -98,6 +97,12 @@ else
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/tdm-trinity
[ ! -e /etc/init/tdm-trinity.conf ] || \
rm -f /etc/init/tdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then

21
debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.preinst vendored
Unescape View File

@ -14,15 +14,14 @@ fi
# remove former service # remove former service
if [ -e /etc/init.d/kdm-trinity ]; then if [ -e /etc/init.d/kdm-trinity ]; then
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/kdm-trinity
fi fi
if [ -n "$REMOVING" ]; then if [ -n "$REMOVING" ]; then
# is there an kdm process running? # is there an kdm-trinity process running?
if start-stop-daemon --stop --quiet --signal 0 --name kdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/kdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/kdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/kdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
@ -39,11 +38,11 @@ if [ -n "$REMOVING" ]; then
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high kdm/stop_running_server_with_children || true db_input high kdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get kdm/stop_running_server_with_children; then if db_get kdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -51,7 +50,7 @@ if [ -n "$REMOVING" ]; then
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset kdm/stop_running_server_with_children seen false db_fset kdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -68,6 +67,12 @@ if [ -n "$STOP" ]; then
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/kdm-trinity
[ ! -e /etc/init/kdm-trinity.conf ] || \
rm -f /etc/init/kdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager

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

@ -63,7 +63,7 @@ for HOST in "" \
fi fi
done done
# or if it's already running # or if it's already running
if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --exec /opt/trinity/bin/tdm; then
NOSTART=yes NOSTART=yes
fi fi
# or if the options file says not to # or if the options file says not to

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

@ -24,14 +24,13 @@ if [ -e /usr/share/debconf/confmodule ]; then
fi fi
case "$1" in case "$1" in
# we NEVER want to unconditionally stop tdm; see below # we NEVER want to unconditionally stop tdm-trinity; see below
upgrade|failed-upgrade) upgrade|failed-upgrade)
REMOVING= REMOVING=
;; ;;
remove|deconfigure) remove|deconfigure)
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/tdm-trinity
;; ;;
*) *)
@ -41,16 +40,16 @@ case "$1" in
esac esac
STOP= STOP=
# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # are we supposed to restart on upgrade? if REMOVING tdm-trinity, we don't care what
# the user says, we have to stop the daemon # the user says, we have to stop the daemon
if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
[ -n "$REMOVING" ]; then [ -n "$REMOVING" ]; then
# is there an tdm process running? # is there an tdm process running?
if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/tdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/tdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/tdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
# make sure we got numbers back # make sure we got numbers back
[ $PROCESS -eq $PROCESS ] 2> /dev/null || [ $PROCESS -eq $PROCESS ] 2> /dev/null ||
@ -65,11 +64,11 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high tdm/stop_running_server_with_children || true db_input high tdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get tdm/stop_running_server_with_children; then if db_get tdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -77,7 +76,7 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset tdm/stop_running_server_with_children seen false db_fset tdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -98,6 +97,12 @@ else
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/tdm-trinity
[ ! -e /etc/init/tdm-trinity.conf ] || \
rm -f /etc/init/tdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then

21
ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.preinst
Unescape View File

@ -14,15 +14,14 @@ fi
# remove former service # remove former service
if [ -e /etc/init.d/kdm-trinity ]; then if [ -e /etc/init.d/kdm-trinity ]; then
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/kdm-trinity
fi fi
if [ -n "$REMOVING" ]; then if [ -n "$REMOVING" ]; then
# is there an kdm process running? # is there an kdm-trinity process running?
if start-stop-daemon --stop --quiet --signal 0 --name kdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/kdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/kdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/kdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
@ -39,11 +38,11 @@ if [ -n "$REMOVING" ]; then
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high kdm/stop_running_server_with_children || true db_input high kdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get kdm/stop_running_server_with_children; then if db_get kdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -51,7 +50,7 @@ if [ -n "$REMOVING" ]; then
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset kdm/stop_running_server_with_children seen false db_fset kdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -68,6 +67,12 @@ if [ -n "$STOP" ]; then
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/kdm-trinity
[ ! -e /etc/init/kdm-trinity.conf ] || \
rm -f /etc/init/kdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager

2
ubuntu/maverick/tdebase/debian/tdm-trinity.postinst
Unescape View File

@ -63,7 +63,7 @@ for HOST in "" \
fi fi
done done
# or if it's already running # or if it's already running
if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --exec /opt/trinity/bin/tdm; then
NOSTART=yes NOSTART=yes
fi fi
# or if the options file says not to # or if the options file says not to

23
ubuntu/maverick/tdebase/debian/tdm-trinity.prerm
Unescape View File

@ -24,14 +24,13 @@ if [ -e /usr/share/debconf/confmodule ]; then
fi fi
case "$1" in case "$1" in
# we NEVER want to unconditionally stop tdm; see below # we NEVER want to unconditionally stop tdm-trinity; see below
upgrade|failed-upgrade) upgrade|failed-upgrade)
REMOVING= REMOVING=
;; ;;
remove|deconfigure) remove|deconfigure)
REMOVING=yes REMOVING=yes
rm -f /etc/init.d/tdm-trinity
;; ;;
*) *)
@ -41,16 +40,16 @@ case "$1" in
esac esac
STOP= STOP=
# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # are we supposed to restart on upgrade? if REMOVING tdm-trinity, we don't care what
# the user says, we have to stop the daemon # the user says, we have to stop the daemon
if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
[ -n "$REMOVING" ]; then [ -n "$REMOVING" ]; then
# is there an tdm process running? # is there an tdm process running?
if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then if start-stop-daemon --stop --quiet --signal 0 --exec /opt/trinity/bin/tdm; then
# any children? # any children?
PARENTS=$(pidof /usr/bin/tdm-trinity || true) PARENTS=$(pidof /opt/trinity/bin/tdm || true)
CHILDREN= CHILDREN=
if [ -n "$PARENTS" ]; then if [ -n "$PARENTS" ]; then
for PROCESS in $PARENTS; do for PROCESS in $PARENTS; do
# make sure we got numbers back # make sure we got numbers back
[ $PROCESS -eq $PROCESS ] 2> /dev/null || [ $PROCESS -eq $PROCESS ] 2> /dev/null ||
@ -65,11 +64,11 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
if [ -n "$CHILDREN" ]; then if [ -n "$CHILDREN" ]; then
if [ -n "$HAVE_DEBCONF" ]; then if [ -n "$HAVE_DEBCONF" ]; then
# ask the question # ask the question
db_input high tdm/stop_running_server_with_children || true db_input high tdm-trinity/stop_running_server_with_children || true
db_go db_go
# what did the user say? # what did the user say?
ANSWER= ANSWER=
if db_get tdm/stop_running_server_with_children; then if db_get tdm-trinity/stop_running_server_with_children; then
ANSWER="$RET" ANSWER="$RET"
fi fi
if [ "$ANSWER" = "true" ]; then if [ "$ANSWER" = "true" ]; then
@ -77,7 +76,7 @@ if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options ||
fi fi
# forget that we have seen the question; this is the sort of # forget that we have seen the question; this is the sort of
# non-configuration question that should be asked every time # non-configuration question that should be asked every time
db_fset tdm/stop_running_server_with_children seen false db_fset tdm-trinity/stop_running_server_with_children seen false
fi fi
else else
STOP=yes STOP=yes
@ -98,6 +97,12 @@ else
fi fi
fi fi
if [ -n "$REMOVING" ]; then
rm -f /etc/init.d/tdm-trinity
[ ! -e /etc/init/tdm-trinity.conf ] || \
rm -f /etc/init/tdm-trinity.conf
fi
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then

Write Preview
Loading…
Cancel
Save