34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: =?utf-8?b?6LCi54Kc?= <xiewei@kylinos.cn>
|
|
Date: Fri, 30 Mar 2018 11:40:21 +0800
|
|
Subject: ubuntu-no-sysvinit-fixups
|
|
|
|
---
|
|
scripts/build/lb_chroot_live-packages | 14 --------------
|
|
1 file changed, 14 deletions(-)
|
|
|
|
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages
|
|
index 0e4ff44..e8ba0a1 100755
|
|
--- a/scripts/build/lb_chroot_live-packages
|
|
+++ b/scripts/build/lb_chroot_live-packages
|
|
@@ -48,20 +48,6 @@ then
|
|
_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
|
|
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
|
|
-
|
|
# Install live packages
|
|
if [ -n "${_PACKAGES}" ]
|
|
then
|