diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-28 11:46:01 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-28 11:46:01 +0100 |
| commit | b7abcb0c01724f3da9f17899008be98f14edef2d (patch) | |
| tree | 69fad20f54a7f4a9f9becc1eb792a2e0b84e7350 /scripts/build/chroot_live-packages | |
| parent | 68b1966b94c4f0fcc82a6226d97ec49beae5fe71 (diff) | |
| download | vyos-live-build-b7abcb0c01724f3da9f17899008be98f14edef2d.tar.gz vyos-live-build-b7abcb0c01724f3da9f17899008be98f14edef2d.zip | |
Shortening initsystem specific hacks for wheezy, systemd on squeeze never was really supported anyway.
Diffstat (limited to 'scripts/build/chroot_live-packages')
| -rwxr-xr-x | scripts/build/chroot_live-packages | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages index 057e423f6..75bf4fb29 100755 --- a/scripts/build/chroot_live-packages +++ b/scripts/build/chroot_live-packages @@ -49,18 +49,11 @@ then fi # Do initsystem specific hacks -if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "sysvinit" ] -then - # 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="$?" - - 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 -fi +case "${LB_INITSYSTEM}" in + systemd) + _PACKAGES="${_PACKAGES} systemd-sysv" + ;; +esac # Install live packages if [ -n "${_PACKAGES}" ] |