Updating upstart support addition to current coding style.

This commit is contained in:
Daniel Baumann 2011-02-10 23:44:40 +01:00
parent fda3fe6310
commit 0762a8e56e
2 changed files with 11 additions and 11 deletions

View File

@ -150,16 +150,15 @@ Set_defaults ()
# Setting initsystem
case "${LB_MODE}" in
ubuntu)
if [ "${LB_INITRAMFS}" = "live-boot" ]
then
LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
else
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
fi
;;
case "${LB_INITRAMFS}" in
live-boot)
LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
;;
*)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
*)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
;;
esac
;;
esac

View File

@ -89,9 +89,10 @@ EOF
# lets see if we still need the squeeze's "pre init system policy discussion" hack:
IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
RC=$?
RC="$?"
if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" == "0" ]; then
if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
then
# sysvinit is both installed and essential, ugly hack to remove it
Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
fi