| Message ID | 1270115945-31647-1-git-send-email-stefan.bader@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Andy Whitcroft |
| Headers | show |
(This isn't an SRU, is it, contrary to the subject line? I know it's after kernel freeze ...) On Thu, Apr 01, 2010 at 11:59:05AM +0200, Stefan Bader wrote: > This patch adds the two modules to the d-i/modules files to be included > in the udeb files. > > NOTE: Contrary to the propoal I got throught IRC, I have added the > xen-blkfront modules to block-modules and not scsi-modules. This > seemed more appropriate as it is built in drivers/block and not > drivers/scsi and virtio_blk lands in the same file. > > cjwatson: Please let us/me know if that is not ok. Thanks. That should be fine. I'll need to build a new netboot image based on the generic-pae kernel in order for this to work, but that should be OK. Thanks,
Colin Watson wrote: > (This isn't an SRU, is it, contrary to the subject line? I know it's > after kernel freeze ...) > > On Thu, Apr 01, 2010 at 11:59:05AM +0200, Stefan Bader wrote: >> This patch adds the two modules to the d-i/modules files to be included >> in the udeb files. >> >> NOTE: Contrary to the propoal I got throught IRC, I have added the >> xen-blkfront modules to block-modules and not scsi-modules. This >> seemed more appropriate as it is built in drivers/block and not >> drivers/scsi and virtio_blk lands in the same file. >> >> cjwatson: Please let us/me know if that is not ok. Thanks. > > That should be fine. > > I'll need to build a new netboot image based on the generic-pae kernel > in order for this to work, but that should be OK. > > Thanks, > Its not completely SRU, but as its getting closer and closer to release I start acting as it would be. The SRU tag then slips in naturally. Stefan
On Thu, Apr 01, 2010 at 11:59:05AM +0200, Stefan Bader wrote: > This patch adds the two modules to the d-i/modules files to be included > in the udeb files. > > NOTE: Contrary to the propoal I got throught IRC, I have added the > xen-blkfront modules to block-modules and not scsi-modules. This > seemed more appropriate as it is built in drivers/block and not > drivers/scsi and virtio_blk lands in the same file. > > cjwatson: Please let us/me know if that is not ok. Thanks. > > -Stefan > > From 7d5eb60bada3a3f428f2938b635e8ed6fb43982b Mon Sep 17 00:00:00 2001 > From: Stefan Bader <stefan.bader@canonical.com> > Date: Thu, 1 Apr 2010 11:53:00 +0200 > Subject: [PATCH] UBUNTU: [Config] Add xen netboot support > > BugLink: http://bugs.launchpad.net/bugs/160366 > > This adds xen-netfront and xen-blkfront to the debian installer modules > list. > > Signed-off-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.master/d-i/modules/block-modules | 1 + > debian.master/d-i/modules/nic-modules | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/debian.master/d-i/modules/block-modules b/debian.master/d-i/modules/block-modules > index be8a07b..ada17c5 100644 > --- a/debian.master/d-i/modules/block-modules > +++ b/debian.master/d-i/modules/block-modules > @@ -27,3 +27,4 @@ pt ? > sx8 ? > umem ? > virtio_blk ? > +xen-blkfront ? > diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules > index f9d630d..f121d65 100644 > --- a/debian.master/d-i/modules/nic-modules > +++ b/debian.master/d-i/modules/nic-modules > @@ -151,3 +151,4 @@ winbond-840 ? > yellowfin ? > znet ? > vmxnet3 ? > +xen-netfront ? Acked-by: Andy Whitcroft <apw@canonical.com> -apw
Applied to Lucid. -apw
diff --git a/debian.master/d-i/modules/block-modules b/debian.master/d-i/modules/block-modules index be8a07b..ada17c5 100644 --- a/debian.master/d-i/modules/block-modules +++ b/debian.master/d-i/modules/block-modules @@ -27,3 +27,4 @@ pt ? sx8 ? umem ? virtio_blk ? +xen-blkfront ? diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules index f9d630d..f121d65 100644 --- a/debian.master/d-i/modules/nic-modules +++ b/debian.master/d-i/modules/nic-modules @@ -151,3 +151,4 @@ winbond-840 ? yellowfin ? znet ? vmxnet3 ? +xen-netfront ?