diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-09-27 09:58:02 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-10-08 10:14:13 +0200 |
| commit | ec823a8c3c5719ad86fe69555fd394b1b4f07464 (patch) | |
| tree | 36d880dd476e5662565e24e6fa27ab2a7a28ba07 | |
| parent | 33ad814b5a9a948fdba1a842ce82cb4d1703b790 (diff) | |
| download | vyos-live-build-ec823a8c3c5719ad86fe69555fd394b1b4f07464.tar.gz vyos-live-build-ec823a8c3c5719ad86fe69555fd394b1b4f07464.zip | |
iso: move mini and minimal flavors assigment to a cannonical place
| -rwxr-xr-x | helpers/lh_binary_iso | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 82ba2a9f1..11280ee4d 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -102,30 +102,20 @@ case "${LH_BOOTLOADER}" in grub) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito" - - if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] - then - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito" - fi + GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito" ;; syslinux) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat" - - if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] - then - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin" - fi + GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin" ;; yaboot) - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map binary/yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" - - if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] - then - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m yaboot/hfs.map" - fi + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map" + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop" + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" + GENISOIMAGE_EXCLUDE="yaboot/hfs.map" ;; *) @@ -134,6 +124,12 @@ case "${LH_BOOTLOADER}" in ;; esac +case "${LH_PACKAGES_LISTS}" in + minimal|mini) + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" + ;; +esac + case "${LH_CHROOT_BUILD}" in enabled) # Moving image |