diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-11 19:36:46 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-11 19:36:46 +0200 |
| commit | df7b3d934f2b31f9e8a783bd1653ab06521a2547 (patch) | |
| tree | f3f08ae77dffc9c83a95c3b3fb6331ac353d98fe /scripts/build/lb_chroot_linux-image | |
| parent | 48e2af1ab9aebb974b718568f6c3060cfeb72cee (diff) | |
| download | vyos-live-build-df7b3d934f2b31f9e8a783bd1653ab06521a2547.tar.gz vyos-live-build-df7b3d934f2b31f9e8a783bd1653ab06521a2547.zip | |
Moving installation of live packages to second pass.
Diffstat (limited to 'scripts/build/lb_chroot_linux-image')
| -rwxr-xr-x | scripts/build/lb_chroot_linux-image | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 39ee0fae5..e060ff3e6 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -52,34 +52,7 @@ then echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages done done -fi - -# Queue installation of linux-image and ${LB_INITRAMFS} -if [ "${LB_INITRAMFS}" != "none" ] -then - echo ${LB_INITRAMFS} >> chroot/root/chroot_packages -fi -# Queue installation of live-config -if [ "${LB_INITSYSTEM}" != "none" ] -then - echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages + # Creating stage file + Create_stagefile .stage/chroot_linux-image fi - -# Do initsystem specific hacks -if [ "${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 - -# Creating stage file -Create_stagefile .stage/chroot_linux-image |