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

Re: Bug#474556: partman-base: Please include XEN virtual device recognition



On Tue, 2008-04-22 at 21:44 +0200, Frans Pop wrote:
> I've also committed Ian's patch for grub-installer (#456784).

I noticed I had the attached outstanding once I svn up'd this changeset
and it seems pretty critical. I added an extra pair of \(\) to allow the
selection of s|h|xv but didn't update the replacement to continue to
pickup the partition number from what is now the second match.

Sorry for not including it in the initial bug report (not sure how that
happened).

Ian.

Index: grub-installer
===================================================================
--- grub-installer	(revision 52845)
+++ grub-installer	(working copy)
@@ -101,7 +101,7 @@
 				  -e 's%/part[0-9]*$%/disc%' \
 				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
 				  -e 's%\(/mapper/mpath[0-9]\+\)-part[0-9]\+$%\1%')
-		tmp_part=$(echo "$1" | sed -e 's%.*/\(s\|h\|xv\)d[a-z]\([0-9]*\)$%\1%' \
+		tmp_part=$(echo "$1" | sed -e 's%.*/\(s\|h\|xv\)d[a-z]\([0-9]*\)$%\2%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \


-- 
Ian Campbell

That's life.
	What's life?
A magazine.
	How much does it cost?
Two-fifty.
	I only have a dollar.
That's life.

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: