diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 08:19:46 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 08:19:48 +0100 |
| commit | 048c0827aed16ba57f1b605f404a7a1d10b979b3 (patch) | |
| tree | bac2c74e9403ad1e89c55b708e5998d2d7a43e69 /scripts | |
| parent | 0e9d949c3d9f2fffaabfa680f0100782bb442538 (diff) | |
| download | vyos-live-build-048c0827aed16ba57f1b605f404a7a1d10b979b3.tar.gz vyos-live-build-048c0827aed16ba57f1b605f404a7a1d10b979b3.zip | |
Somewhat fixing sysvinit and casper legacy support, slightly improved patch from Rui Miguel P. Bernardo <rui.bernardo.pt@gmail.com> (Closes: #772522, #772651).
This however will still not work properly building upstart based
images but they have been broken/unsupported anyway since a long
time.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/config | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/scripts/build/config b/scripts/build/config index 845ec7b3d..91bc6ae4a 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -64,7 +64,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--ignore-system-defaults]\n\ \t [--initramfs auto|none|live-boot|casper]\n\ \t [--initramfs-compression bzip2|gzip|lzma]\n\ -\t [--initsystem sysvinit|runit|systemd|upstart|none]\n\ +\t [--initsystem sysvinit|systemd|upstart|none]\n\ \t [--image-name [NAME]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ @@ -1355,19 +1355,41 @@ if [ ! -e config/package-lists/live.list.chroot ] then mkdir -p config/package-lists -cat > config/package-lists/live.list.chroot << EOF -live-boot -live-config -EOF - -case "${LB_PARENT_DISTRIBUTION}" in - wheezy) - echo "live-config-sysvinit" >> config/package-lists/live.list.chroot - ;; - - *) - echo "live-config-systemd" >> config/package-lists/live.list.chroot - ;; + case "${LB_INITRAMFS}" in + live-boot) + echo "live-boot" > config/package-lists/live.list.chroot + echo "live-config" >> config/package-lists/live.list.chroot + + case "${LB_PARENT_DISTRIBUTION}" in + wheezy) + echo "live-config-sysvinit" >> config/package-lists/live.list.chroot + ;; + + *) + case "${LB_INITSYSTEM}" in + none) + # do nothing + ;; + + systemd) + echo "live-config-systemd" >> config/package-lists/live.list.chroot + ;; + + sysvinit|upstart) + echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot + echo "sysvinit-core" >> config/package-lists/live.list.chroot + ;; + esac + ;; + esac + ;; + + casper) + echo "casper" > config/package-lists/live.list.chroot + ;; + + *) + ;; esac fi |