changed from dh_installinit to manual init script installation

because invoke-rc.d does not work on the knoppix hdd install
(it is linked to /bin/true, so 'command -v invoke-rc.d' returns true,
but it does not do anything, of course)
This commit is contained in:
fgerlits 2005-08-13 10:07:51 +00:00
parent 210df42a65
commit ff18822caa
7 changed files with 25 additions and 11 deletions

View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: fgerlits $ # Author : $Author: fgerlits $
# Version : $Revision: 1.18 $ # Version : $Revision: 1.19 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -431,6 +431,7 @@ install: setup compile create_database install_modules install_products
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache ${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
${MKDIR} ${USR_BIN_DIR} ${MKDIR} ${USR_BIN_DIR}
${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR} ${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
${CP} ${BIN_DIR}/livesupport-station ${USR_BIN_DIR}
${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR} ${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
create_database: create_database:

View file

@ -30,6 +30,11 @@ case "$1" in
$installdir/bin/postInstallStation.sh --directory $installdir \ $installdir/bin/postInstallStation.sh --directory $installdir \
--apache-group $apache_group \ --apache-group $apache_group \
--www-root $apache_docroot --www-root $apache_docroot
# register and start the livesupport scheduler daemon
cp -f $installdir/bin/livesupport-station /etc/init.d
update-rc.d livesupport-station defaults 92 || true
/etc/init.d/livesupport-station start || true
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)

View file

@ -46,6 +46,10 @@ check_exe() {
case "$1" in case "$1" in
remove|upgrade|failed-upgrade|abort-install|abort-upgrade) remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
# remove the init script
rm -f /etc/init.d/livesupport-station
update-rc.d livesupport-station remove
# remove the symlink to the livesupport web pages # remove the symlink to the livesupport web pages
rm -f $apache_docroot/livesupport rm -f $apache_docroot/livesupport

View file

@ -92,13 +92,8 @@ case "$1" in
check_group_permission $apache_group || exit 1; check_group_permission $apache_group || exit 1;
if [ "$1" = "upgrade" ]; then if [ "$1" = "upgrade" ]; then
if command -v invoke-rc.d >/dev/null 2>&1 ; then /etc/init.d/livesupport-station stop || true
invoke-rc.d livesupport-station stop || true /etc/init.d/livesupport-station kill || true
invoke-rc.d livesupport-station kill || true
else
/etc/init.d/livesupport-station stop || true
/etc/init.d/livesupport-station kill || true
fi
fi fi
;; ;;

View file

@ -19,9 +19,14 @@ set -e
case "$1" in case "$1" in
remove|upgrade|deconfigure) remove|upgrade|deconfigure)
;; # stop the livesupport scheduler daemon
/etc/init.d/livesupport-station stop || true
/etc/init.d/livesupport-station kill || true
;;
failed-upgrade) failed-upgrade)
;; ;;
*) *)
echo "prerm called with unknown argument \`$1'" >&2 echo "prerm called with unknown argument \`$1'" >&2
exit 1 exit 1

View file

@ -98,6 +98,7 @@ install-arch:
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallStation.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallStation.sh \
$(CURDIR)/debian/livesupport/opt/livesupport/bin/livesupport-station \
$(CURDIR)/debian/livesupport-station/opt/livesupport/bin $(CURDIR)/debian/livesupport-station/opt/livesupport/bin
mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \ mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \
$(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \ $(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \
@ -156,7 +157,10 @@ binary-common:
# dh_installemacsen # dh_installemacsen
# dh_installpam # dh_installpam
# dh_installmime # dh_installmime
dh_installinit --update-rcd-params="defaults 92" # Replaced dh_installinit with manual init script installation
# because invoke.rc-d is linked to /bin/true in the knoppix hdd install.
# Should be changed back when/if knoppix is fixed.
# dh_installinit --update-rcd-params="defaults 92"
# dh_installcron # dh_installcron
# dh_installinfo # dh_installinfo
# dh_installman # dh_installman