diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-30 00:56:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-30 00:56:49 +0200 |
| commit | 96e86b96d8b0c38cfcbef4201c5de112030d0326 (patch) | |
| tree | 0513043052e30d5fccd8679a94c5b85fe9332bdd /scripts/build/lb_chroot_live-packages | |
| parent | 6b8183c277c3306d3d497f0479fb0545b9d3d990 (diff) | |
| download | vyos-live-build-96e86b96d8b0c38cfcbef4201c5de112030d0326.tar.gz vyos-live-build-96e86b96d8b0c38cfcbef4201c5de112030d0326.zip | |
Adding --system option to define the resulting image type to be a live system or a normal, non-live system.
Diffstat (limited to 'scripts/build/lb_chroot_live-packages')
| -rwxr-xr-x | scripts/build/lb_chroot_live-packages | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages index 31734a8d8..ef8292e09 100755 --- a/scripts/build/lb_chroot_live-packages +++ b/scripts/build/lb_chroot_live-packages @@ -36,25 +36,22 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -_PACKAGES="" - -# Queue installation of linux-image and ${LB_INITRAMFS} -if [ "${LB_INITRAMFS}" != "none" ] +# Queue installation of live-boot +if [ -n "${LB_INITRAMFS}" ] && [ "${LB_INITRAMFS}" != "none" ] then _PACKAGES="${LB_INITRAMFS}" fi # Queue installation of live-config -if [ "${LB_INITSYSTEM}" != "none" ] +if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "none" ] then _PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}" fi # Do initsystem specific hacks -if [ "${LB_INITSYSTEM}" != "sysvinit" ] +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="$?" |