diff options
| -rwxr-xr-x | functions/defaults.sh | 17 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_linux-image | 5 |
2 files changed, 11 insertions, 11 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 86bf23bd3..5f266158c 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -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 diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 411e06e2c..ad8c6e618 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -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 |