diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-02-10 23:44:40 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:42 +0100 |
| commit | 0762a8e56e8ad79ce3a3884aa0743ee459362ad4 (patch) | |
| tree | 6e69a4c0ebfe00c96d227e1357b067baf2c43550 | |
| parent | fda3fe6310235084202aa479f191eeada6919f13 (diff) | |
| download | vyos-live-build-0762a8e56e8ad79ce3a3884aa0743ee459362ad4.tar.gz vyos-live-build-0762a8e56e8ad79ce3a3884aa0743ee459362ad4.zip | |
Updating upstart support addition to current coding style.
| -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 |