Re: [bug #44238] Add support for menu.c32 and vesamenu.c32 in lib/syslinux_parse

[Lunar]

Andrei Borzenkov:
> В Fri, 13 Feb 2015 22:09:04 +0100
> Lunar <address@hidden> пишет:
> 
> > Andrei Borzenkov:
> > > [… review and comments …]
> > 
> > Ok, here's another try.
> > 
> 
> It looks OK but as someone reported that your patches seem to cause
> problems elsewhere let's wait for confirmation.
> 
> @gluglug - could you test both update versions? Thank you.

fchmmr said that there was an issue with Trisquel 7.0 GNOME. But if
there's one, it doesn't seem to be related to the patches.

Attached is the output of grub-syslinux2cfg without and with the patches
applied on isolinux.cfg from Trisquel 7.0 GNOME. The differences are
only on the linux command lines and the `initrd=` option:

--- /tmp/without        2015-02-14 09:15:07.650468274 +0100
+++ /tmp/with   2015-02-14 09:19:32.398024195 +0100
@@ -23,22 +23,22 @@
  default='vesamenu.c32'
 menuentry 'Try Trisquel without installing' --hotkey 't' --id 'live' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
--
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper 
splash quiet noprompt --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel' --hotkey 'i' --id 'install' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
only-ubiquity --
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper splash 
quiet noprompt only-ubiquity --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel in text mode' --hotkey 'i' --id 'netinstall' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' vga=788 quiet 
BOOT_IMAGE=linux --
+  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' 
initrd=/casper/initrd.netinst vga=788 quiet BOOT_IMAGE=linux --
   initrd$linux_suffix '/'/'/casper/initrd.netinst' 
 }
 menuentry 'Check disc for defects' --hotkey 'c' --id 'check' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check quiet 
splash --
+  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check 
initrd=/casper/initrd quiet splash --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Test memory' --hotkey 'm' --id 'memtest' {
@@ -101,22 +101,22 @@
  default='live'
 menuentry 'Try Trisquel without installing' --hotkey 't' --id 'live' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
--
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper 
splash quiet noprompt --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel' --hotkey 'i' --id 'install' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
only-ubiquity --
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper splash 
quiet noprompt only-ubiquity --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel in text mode' --hotkey 'i' --id 'netinstall' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' vga=788 quiet 
BOOT_IMAGE=linux --
+  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' 
initrd=/casper/initrd.netinst vga=788 quiet BOOT_IMAGE=linux --
   initrd$linux_suffix '/'/'/casper/initrd.netinst' 
 }
 menuentry 'Check disc for defects' --hotkey 'c' --id 'check' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check quiet 
splash --
+  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check 
initrd=/casper/initrd quiet splash --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Test memory' --hotkey 'm' --id 'memtest' {
@@ -192,22 +192,22 @@
  default='vesamenu.c32'
 menuentry 'Try Trisquel without installing' --hotkey 't' --id 'live' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
--
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
persistent file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper 
splash quiet noprompt --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel' --hotkey 'i' --id 'install' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed boot=casper splash quiet noprompt 
only-ubiquity --
+  linux$linux_suffix '/'/'/casper/vmlinuz' cdrom-detect/try-usb=true 
file=/cdrom/preseed/trisquel.seed initrd=/casper/initrd boot=casper splash 
quiet noprompt only-ubiquity --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Install Trisquel in text mode' --hotkey 'i' --id 'netinstall' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' vga=788 quiet 
BOOT_IMAGE=linux --
+  linux$linux_suffix '/'/'/casper/vmlinuz.netinst' 
initrd=/casper/initrd.netinst vga=788 quiet BOOT_IMAGE=linux --
   initrd$linux_suffix '/'/'/casper/initrd.netinst' 
 }
 menuentry 'Check disc for defects' --hotkey 'c' --id 'check' {
  if test x$grub_platform = xpc; then linux_suffix=16; else linux_suffix= ; fi
-  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check quiet 
splash --
+  linux$linux_suffix '/'/'/casper/vmlinuz' boot=casper integrity-check 
initrd=/casper/initrd quiet splash --
   initrd$linux_suffix '/'/'/casper/initrd' 
 }
 menuentry 'Test memory' --hotkey 'm' --id 'memtest' {

-- 
Lunar                                             <address@hidden>

without
Description: Text document

with
Description: Text document

signature.asc
Description: Digital signature