diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-26 12:38:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:19:23 +0100 |
| commit | c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a (patch) | |
| tree | 44a6d3a12cd11067aea2a4d43eb9133cc25bad2f /scripts/build/lb_binary_iso | |
| parent | 941a47be0ca3061f54a237583092357d1ff80f7c (diff) | |
| download | vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.tar.gz vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.zip | |
Adding debian version 3.0~a1-1.
Diffstat (limited to 'scripts/build/lb_binary_iso')
| -rwxr-xr-x | scripts/build/lb_binary_iso | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index 0394d3654..50ed78100 100755 --- a/scripts/build/lb_binary_iso +++ b/scripts/build/lb_binary_iso @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org> ## ## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -156,18 +156,6 @@ fi if [ "${LB_BOOTLOADER}" = "grub2" ] then - case "${LB_DISTRIBUTION}" in - lenny|lucid) - GRUB_MKIMAGE_OPTIONS="" - ;; - - *) - # grub >= 1.98+20100527 requires -O, see #584415 - GRUB_MKIMAGE_OPTIONS="-O i386-pc" - ;; - - esac - cat > binary.sh << EOF #!/bin/sh @@ -175,7 +163,7 @@ input_dir=/usr/lib/grub/i386-pc # build core.img core_img=\$(mktemp) -grub-mkimage -d \${input_dir} -o \${core_img} ${GRUB_MKIMAGE_OPTIONS} biosdisk iso9660 +grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660 # build grub_eltorito image cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito |