[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#706112: [PATCH v2] grub-installer: Support menu selection of grub boot disk



On Mon, Apr 29, 2013 at 07:16:42PM +0200, Christian PERRIER wrote:
> Quoting Cyril Brulebois (kibi@debian.org):
> > Cyril Brulebois <kibi@debian.org> (29/04/2013):
> > > While I haven't reviewed the patch yet, having the l10n bits in sync
> > > was a point I had in mind this very morning, so I'm glad you did
> > > that. And indeed, some feedback ASAP would be nice. I'll try to look
> > > into this patch in a few hours at most.
> > 
> > Uploaded in time for the 1352 dinstall. Let's see if tests are
> > successful.
> 
> Of course, you're aware that translations are currently not in the git
> tree, as I committed the modified templates this morning, and the sync
> will happen in the upcoming night?
> 
> So, in short, if the patch is OK, we need another upload to get the
> new template translated.
> 
> 

gah. The patch was not ok. My apologies for such a gross error.
I caught this by testing with 1.86 as downloaded from the archive.

[PATCH] Actually set bootdev.

After taking all the trouble to get the right value into
the $bootdev shell variable, ensure that we db_set
grub-installer/bootdev with that value.

Signed-off-by: Vincent McIntyre <vincent.mcintyre@csiro.au>
---
 grub-installer |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grub-installer b/grub-installer
index 71e10c8..f3d62fe 100755
--- a/grub-installer
+++ b/grub-installer
@@ -683,6 +683,7 @@ while : ; do
 				previous_state=1
 			fi
 			if [ -e "$bootdev" ] ; then
+			    db_set grub-installer/bootdev $bootdev
 			    break
 			else
 			    state=2
@@ -703,9 +704,12 @@ while : ; do
 			unset previous_state
 		fi
 
-		if [ ! -e "$bootdev" ]; then
-		    db_input critical grub-installer/bootdev || true
+		if [ -e "$bootdev" ]; then
+		    db_set grub-installer/bootdev $bootdev
+		    break
 		fi
+
+		db_input critical grub-installer/bootdev || true
 		if ! db_go; then
 			if [ "$q" ]; then
 				state=1
-- 
<vincent.mcintyre@csiro.au>


Reply to: