Bug#624450: grub-common: grub-mkconfig reports new syntax error from previously good custom script

[Hazel Russman]

Package: grub-common
Version: 1.99~rc1-13
Severity: important

I have a custom script (included by reportbug) for booting Crux (40_custom).
Previous versions of update-grub and grub-mkconfig have accepted this script.
The new version gives the following messages:
error: syntax error
error: Incorrect command
error: syntax error
error: line no: 88 (this is the line on which the EOF<< command occurs)

and creates a new file /boot/grub/grub.cfg.new. If I make 40_custom
unexecutable before running update-grub, the error disappears but then I have
no access to crux.



-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 2.6.38-2-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages grub-common depends on:
ii  base-files              6.3              Debian base system miscellaneous f
ii  dpkg                    1.16.0.2         Debian package management system
ii  gettext-base            0.18.1.1-3       GNU Internationalization utilities
ii  install-info            4.13a.dfsg.1-6   Manage installed documentation in 
ii  libc6                   2.11.2-11        Embedded GNU C Library: Shared lib
ii  libdevmapper1.02.1      2:1.02.63-3      The Linux Kernel Device Mapper use
ii  libfreetype6            2.4.4-1          FreeType 2 font engine, shared lib
ii  libfuse2                2.8.4-1.3        Filesystem in USErspace library
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

Versions of packages grub-common recommends:
pn  os-prober                     <none>     (no description available)

Versions of packages grub-common suggests:
pn  grub-emu                      <none>     (no description available)
pn  multiboot-doc                 <none>     (no description available)
pn  xorriso                       <none>     (no description available)

-- Configuration Files:
/etc/grub.d/40_custom changed:
echo "Adding Crux on sda1">&2
cat <<EOF
menuentry "Crux, kernel 2.6.35"{ 
set root=(hd0,1)
linux	/boot/vmlinuz-2.6.35 /dev/sda1 quiet noapic
}
EOF
exec tail -n +3 $0


-- no debconf information
-------------- next part --------------
#
# DO NOT EDIT THIS FILE
#
# It is automatically generated by grub-mkconfig using templates
# from /etc/grub.d and settings from /etc/default/grub
#

### BEGIN /etc/grub.d/00_header ###
if [ -s $prefix/grubenv ]; then
  load_env
fi
set default="3"
if [ "${prev_saved_entry}" ]; then
  set saved_entry="${prev_saved_entry}"
  save_env saved_entry
  set prev_saved_entry=
  save_env prev_saved_entry
  set boot_once=true
fi

function savedefault {
  if [ -z "${boot_once}" ]; then
    saved_entry="${chosen}"
    save_env saved_entry
  fi
}

function load_video {
  insmod vbe
  insmod vga
  insmod video_bochs
  insmod video_cirrus
}

insmod part_msdos
insmod ext2
set root='(hd0,msdos4)'
search --no-floppy --fs-uuid --set=root d3e78eed-cfed-4415-ac36-79212b38eb02
if loadfont /usr/share/grub/unicode.pf2 ; then
  set gfxmode=640x480
  load_video
  insmod gfxterm
fi
terminal_output gfxterm
insmod part_msdos
insmod ext2
set root='(hd0,msdos4)'
search --no-floppy --fs-uuid --set=root d3e78eed-cfed-4415-ac36-79212b38eb02
set locale_dir=($root)/boot/grub/locale
set lang=en_GB
insmod gettext
set timeout=15
### END /etc/grub.d/00_header ###

### BEGIN /etc/grub.d/05_debian_theme ###
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
### END /etc/grub.d/05_debian_theme ###

### BEGIN /etc/grub.d/10_linux ###
menuentry 'Debian GNU/Linux, with Linux 2.6.38-2-686' --class debian --class gnu-linux --class gnu --class os {
	insmod part_msdos
	insmod ext2
	set root='(hd0,msdos4)'
	search --no-floppy --fs-uuid --set=root d3e78eed-cfed-4415-ac36-79212b38eb02
	echo	'Loading Linux 2.6.38-2-686 ...'
	linux	/boot/vmlinuz-2.6.38-2-686 root=UUID=d3e78eed-cfed-4415-ac36-79212b38eb02 ro quiet 
	echo	'Loading initial ramdisk ...'
	initrd	/boot/initrd.img-2.6.38-2-686
}
menuentry 'Debian GNU/Linux, with Linux 2.6.38-2-686 (recovery mode)' --class debian --class gnu-linux --class gnu --class os {
	insmod part_msdos
	insmod ext2
	set root='(hd0,msdos4)'
	search --no-floppy --fs-uuid --set=root d3e78eed-cfed-4415-ac36-79212b38eb02
	echo	'Loading Linux 2.6.38-2-686 ...'
	linux	/boot/vmlinuz-2.6.38-2-686 root=UUID=d3e78eed-cfed-4415-ac36-79212b38eb02 ro single quiet
	echo	'Loading initial ramdisk ...'
	initrd	/boot/initrd.img-2.6.38-2-686
}
### END /etc/grub.d/10_linux ###

### BEGIN /etc/grub.d/40_custom ###
menuentry "Crux, kernel 2.6.35"{ 
set root=(hd0,1)
linux	/boot/vmlinuz-2.6.35 /dev/sda1 quiet noapic
}
cat <<EOF
menuentry "Crux, kernel 2.6.35"{ 
set root=(hd0,1)
linux	/boot/vmlinuz-2.6.35 /dev/sda1 quiet noapic
}
EOF
exec tail -n +3 $0
# This file provides an easy way to add custom menu entries.  Simply type the
# menu entries you want to add before this comment.  Be careful not to change
# the 'exec tail' line above.
### END /etc/grub.d/40_custom ###