Re: Renaming xm-debian.cfg to just debian.cfg

[Ian Campbell <ijc@hellion.org.uk>]

On Tue, 2011-08-16 at 11:55 +0100, Steve McIntyre wrote:
> On Mon, Aug 15, 2011 at 09:26:46PM +0100, Ian Campbell wrote:
> >Hi,
> >
> >I'd quite like to rename the xm-debian.cfg shipped by d-i to just
> >debian.cfg. The "xm" came from the previous Xen toolstack's (xend) cli
> >name, the modern one is called "xl". (it all seems a bit like pedantry,
> >but, you know...)
> >
> >It's slightly tricky due to the need to change both d-i and the
> >debian-cd stuff. IIRC the daily/weekly CD builds are made using the
> >daily installer builds and therefore all that is needed is to check the
> >two changes in at (roughly) the same time.
> >
> >Or do I need to worry about non-daily/weekly builds too? I suppose that
> >if an alpha/beta release is made there will necessarily be a d-i upload
> >first (with this change)?
> >
> >Patches to both are attached, I can checkin the d-i one myself if
> >debian-cd are happy with the approach.
> 
> Hmmm. It'll break the daily "wheezy" CD images that use the last
> testing release instead of the dailt d-i builds. But at the moment I
> think they're broken already... :-(

Hopefully they fail in the "omit that one file" way rather than
completely. I suppose we could go with an interim solution (untested,
debmirror is playing up so I don't have a proper mirror at the
moment :-( ):

diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index 1b23b1b..2cc090b 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -257,7 +257,7 @@ rm -f boot$N/isolinux/isolinux.cfg.with*
 if variant_enabled "xen" ; then
 	extra_image xen/vmlinuz         "../vmlinuz   ../gtk/vmlinuz"
 	extra_image xen/initrd.gz       "../initrd.gz ../gtk/initrd.gz"
-	extra_image xen/debian.cfg
+	extra_image xen/debian.cfg || extra_image xen/xm-debian.cfg
 fi
 
 # Modify win32-loader.ini for the "current" arch

> Go ahead, I'll commit the change now.

Thanks, I've pushed the d-i change too.

Ian.

-- 
Ian Campbell
Current Noise: Amon Amarth - The Last Stand Of Frej

I'm rated PG-34!!