On Thu, Feb 23, 2012 at 12:44 AM, Zeeshan Ali (Khattak) <zeeshanak@xxxxxxxxx> wrote: > On Tue, Feb 21, 2012 at 7:46 PM, Daniel P. Berrange <berrange@xxxxxxxxxx> wrote: >> From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> > > I really should have paid more attention before ACKing some of the > patches. :) Here is the problem introduced by this one: > >> --- >> data/oses/ubuntu.xml | 731 ++++++++++++++++++++++++++++++++++++++++++++++++-- >> 1 files changed, 711 insertions(+), 20 deletions(-) >> >> diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml >> index 78239f6..fb331a3 100644 >> --- a/data/oses/ubuntu.xml >> +++ b/data/oses/ubuntu.xml >> @@ -6,6 +6,35 @@ >> <version>4.10</version> >> <vendor>Canonical</vendor> >> <family>Linux</family> >> + >> + <media arch="i386"> >> + <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-i386.iso</url> >> + <iso> >> + <volume-id>Ubuntu 4.10 i386</volume-id> >> + <system-id>LINUX</system-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> > .. >> + >> + <media arch="i386" live="true" installer="false"> >> + <url>http://old-releases.ubuntu.com/releases/warty/warty-release-live-i386.iso</url> >> + <iso> >> + <volume-id>Ubuntu 4.10 i386</volume-id> >> + <system-id>LINUX</system-id> >> + </iso> >> + <kernel>casper/vmlinuz</kernel> >> + <initrd>casper/initrd.img</initrd> >> + </media> > > With volume and system ID being identical for both medias, only the > first media will be matched against both types of medias. Same goes > for other medias you added in this patch. Wonder what could be a > solution here though. Perhaps detection code should check if there is > multiple matches and it there are, match basename of known URL against > that of media's patch? s/patch/path/ -- Regards, Zeeshan Ali (Khattak) FSF member#5124
