From 83c3b4312743dc2801b519e10e6ad630349ec39c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 2 Jun 2009 23:33:21 +0200 Subject: [PATCH] Fix bootoption toram: it should be toram=$FLAVOUR.squashfs --- debian/changelog | 7 +++++-- grml2usb | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b6617f..65d5304 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -grml2usb (0.9.7) UNRELEASED; urgency=low +grml2usb (0.9.7) unstable; urgency=low * Fix typo in manpage of grml2usb (thanks to Wernfried Haas). + * Fix bootoption toram: it should be toram=$FLAVOUR.squashfs instead + of toram=$FLAVOUR. Thanks to Wernfried Haas and Frank Prochnow + for the bugreport and debugging! [Closes: issue680] - -- Michael Prokop Tue, 02 Jun 2009 00:37:35 +0200 + -- Michael Prokop Tue, 02 Jun 2009 23:32:13 +0200 grml2usb (0.9.6) unstable; urgency=low diff --git a/grml2usb b/grml2usb index ad896f3..8aac683 100755 --- a/grml2usb +++ b/grml2usb @@ -324,7 +324,7 @@ menuentry "%(grml_flavour)s-persistent" { ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s2ram" { set root=(hd0,%(install_partition)s) - linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s %(bootoptions)s + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } @@ -396,7 +396,7 @@ initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] title %(grml_flavour)s2ram -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s %(bootoptions)s +kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] @@ -576,7 +576,7 @@ APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live n # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s2ram KERNEL /boot/release/%(grml_flavour)s/linux26 -APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s %(bootoptions)s +APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s-debug -- 2.1.4