From cfergeau at redhat.com Wed Mar 4 12:18:42 2015 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 4 Mar 2015 13:18:42 +0100 Subject: [Libosinfo] [PATCH] os: Free minimum/recommended resources in _finalize() Message-ID: <1425471522-27824-1-git-send-email-cfergeau@redhat.com> These OsinfoResourcesList objects will be leaked otherwise. --- osinfo/osinfo_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c index ab97c67..4f74331 100644 --- a/osinfo/osinfo_os.c +++ b/osinfo/osinfo_os.c @@ -117,6 +117,8 @@ osinfo_os_finalize(GObject *object) g_object_unref(os->priv->medias); g_object_unref(os->priv->trees); g_object_unref(os->priv->variants); + g_object_unref(os->priv->minimum); + g_object_unref(os->priv->recommended); g_object_unref(os->priv->scripts); -- 2.1.0 From fabiano at fidencio.org Wed Mar 4 12:27:22 2015 From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Wed, 4 Mar 2015 13:27:22 +0100 Subject: [Libosinfo] [PATCH] os: Free minimum/recommended resources in _finalize() In-Reply-To: <1425471522-27824-1-git-send-email-cfergeau@redhat.com> References: <1425471522-27824-1-git-send-email-cfergeau@redhat.com> Message-ID: On Wed, Mar 4, 2015 at 1:18 PM, Christophe Fergeau wrote: > These OsinfoResourcesList objects will be leaked otherwise. > --- > osinfo/osinfo_os.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c > index ab97c67..4f74331 100644 > --- a/osinfo/osinfo_os.c > +++ b/osinfo/osinfo_os.c > @@ -117,6 +117,8 @@ osinfo_os_finalize(GObject *object) > g_object_unref(os->priv->medias); > g_object_unref(os->priv->trees); > g_object_unref(os->priv->variants); > + g_object_unref(os->priv->minimum); > + g_object_unref(os->priv->recommended); > > g_object_unref(os->priv->scripts); > > -- > 2.1.0 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo ACK! -- Fabiano Fid?ncio From cfergeau at redhat.com Mon Mar 9 14:45:51 2015 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 9 Mar 2015 15:45:51 +0100 Subject: [Libosinfo] [PATCH] Add a Windows 7 CD ID In-Reply-To: <20141222094128.GB12050@edamame.cdg.redhat.com> References: <1419109161-5138-1-git-send-email-rick.2889@gmail.com> <20141222094128.GB12050@edamame.cdg.redhat.com> Message-ID: <20150309144551.GE7679@edamame.cdg.redhat.com> Hi, On Mon, Dec 22, 2014 at 10:41:28AM +0100, Christophe Fergeau wrote: > Hey, > > Thanks for the patch! Do you know if this is a Professional, Family, ... > edition of Windows or is it unknown? > It would be useful if you could provide the output of > isoinfo -d -i youriso.iso > so that it can be added to the test-suite. For what it's worth, I got a private answer to that mail: ? Hi Christophe, Thanks for your reply! I have never worked with a mailing list before so excuse me if this is not the right way of replying. The ISO is a direct rip of a Dutch Windows 7 x86/32-bit Professional disc. The isoinfo output is enclosed in the text document attached. If you need anything else, please let me know. Thanks, Rick Kerkhof ? Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From rick.2889 at gmail.com Mon Mar 9 14:47:46 2015 From: rick.2889 at gmail.com (Rick Kerkhof) Date: Mon, 9 Mar 2015 15:47:46 +0100 Subject: [Libosinfo] unsubscribe Message-ID: <001f01d05a78$020b6160$06222420$@gmail.com> unsubscribe -------------- next part -------------- An HTML attachment was scrubbed... URL: From cfergeau at redhat.com Mon Mar 9 14:49:50 2015 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 9 Mar 2015 15:49:50 +0100 Subject: [Libosinfo] [PATCH v2] Add a Windows 7 CD ID In-Reply-To: <20150309144551.GE7679@edamame.cdg.redhat.com> References: <20150309144551.GE7679@edamame.cdg.redhat.com> Message-ID: <1425912590-12488-1-git-send-email-cfergeau@redhat.com> From: Rick Kerkhof --- data/oses/windows.xml.in | 2 +- test/isodata/windows/win7/Win7ProX86.iso.txt | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/isodata/windows/win7/Win7ProX86.iso.txt diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 38c8ae6..f5052b9 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -779,7 +779,7 @@ - (GSP1RMCN?PRFRER|GSP1RMCPRVOL)_ + (GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_ MICROSOFT CORPORATION [[:upper:][:digit:]]*_([[:upper:]]*) diff --git a/test/isodata/windows/win7/Win7ProX86.iso.txt b/test/isodata/windows/win7/Win7ProX86.iso.txt new file mode 100644 index 0000000..5e6999f --- /dev/null +++ b/test/isodata/windows/win7/Win7ProX86.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: GRMCPRFREO_NL_DVD +Volume set id: GRMCPRFREO_NL_DVD +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.54 (01/01/2005 TM) +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1167144 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 2DF 735 -- 2.1.0 From zeeshanak at gnome.org Mon Mar 9 19:09:34 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 9 Mar 2015 19:09:34 +0000 Subject: [Libosinfo] [PATCH v2] Add a Windows 7 CD ID In-Reply-To: <1425912590-12488-1-git-send-email-cfergeau@redhat.com> References: <20150309144551.GE7679@edamame.cdg.redhat.com> <1425912590-12488-1-git-send-email-cfergeau@redhat.com> Message-ID: On Mon, Mar 9, 2015 at 2:49 PM, Christophe Fergeau wrote: > From: Rick Kerkhof > > --- ACK. Thanks for cleaning-up the patch. > data/oses/windows.xml.in | 2 +- > test/isodata/windows/win7/Win7ProX86.iso.txt | 29 ++++++++++++++++++++++++++++ > 2 files changed, 30 insertions(+), 1 deletion(-) > create mode 100644 test/isodata/windows/win7/Win7ProX86.iso.txt > > diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in > index 38c8ae6..f5052b9 100644 > --- a/data/oses/windows.xml.in > +++ b/data/oses/windows.xml.in > @@ -779,7 +779,7 @@ > > > > - (GSP1RMCN?PRFRER|GSP1RMCPRVOL)_ > + (GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_ > MICROSOFT CORPORATION > [[:upper:][:digit:]]*_([[:upper:]]*) > > diff --git a/test/isodata/windows/win7/Win7ProX86.iso.txt b/test/isodata/windows/win7/Win7ProX86.iso.txt > new file mode 100644 > index 0000000..5e6999f > --- /dev/null > +++ b/test/isodata/windows/win7/Win7ProX86.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: GRMCPRFREO_NL_DVD > +Volume set id: GRMCPRFREO_NL_DVD > +Publisher id: MICROSOFT CORPORATION > +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 > +Application id: CDIMAGE 2.54 (01/01/2005 TM) > +Copyright File id: > +Abstract File id: > +Bibliographic File id: > +Volume set size is: 1 > +Volume set sequence number is: 1 > +Logical block size is: 2048 > +Volume size is: 1167144 > +El Torito VD version 1 found, boot catalog is in sector 22 > +NO Joliet present > +NO Rock Ridge present > +Eltorito validation header: > + Hid 1 > + Arch 0 (x86) > + ID 'Microsoft Corporation' > + Key 55 AA > + Eltorito defaultboot header: > + Bootid 88 (bootable) > + Boot media 0 (No Emulation Boot) > + Load segment 0 > + Sys type 0 > + Nsect 8 > + Bootoff 2DF 735 > -- > 2.1.0 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -- Regards, Zeeshan Ali (Khattak) ________________________________________ Befriend GNOME: http://www.gnome.org/friends/ From cfergeau at redhat.com Tue Mar 10 09:41:21 2015 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 10 Mar 2015 10:41:21 +0100 Subject: [Libosinfo] [PATCH v2] Add a Windows 7 CD ID In-Reply-To: References: <20150309144551.GE7679@edamame.cdg.redhat.com> <1425912590-12488-1-git-send-email-cfergeau@redhat.com> Message-ID: <20150310094121.GH7679@edamame.cdg.redhat.com> Hey, On Mon, Mar 09, 2015 at 07:09:34PM +0000, Zeeshan Ali (Khattak) wrote: > On Mon, Mar 9, 2015 at 2:49 PM, Christophe Fergeau wrote: > > From: Rick Kerkhof > > > > --- > > ACK. Thanks for cleaning-up the patch. Thanks, pushed now. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: From zeeshanak at gnome.org Sun Mar 15 15:56:15 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 15:56:15 +0000 Subject: [Libosinfo] [PATCH] Correct indentation in .syms file Message-ID: <1426434975-4514-1-git-send-email-zeeshanak@gnome.org> --- Pushed under trivial rule. osinfo/libosinfo.syms | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index 86de581..5c423b9 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -500,10 +500,10 @@ LIBOSINFO_0.2.10 { osinfo_install_script_injection_method_get_type; } LIBOSINFO_0.2.9; - LIBOSINFO_0.2.11 { +LIBOSINFO_0.2.11 { global: osinfo_install_script_get_needs_internet; - } LIBOSINFO_0.2.10; +} LIBOSINFO_0.2.10; /* Symbols in next release... -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:47 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:47 +0000 Subject: [Libosinfo] Volume-size patch series Message-ID: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> This series of patches, 1. Makes it possible to specify volume-size for ISO media entries. 2. Make use of volume-size for detection. This is actually the main point of all this effort. Many times the volume-id is the same for different medias of the same OS and hence volume-id makes it much easier to differetiate between those different medias. 3. Add volume-size info to fedora medias. 4. Add many missing Fedora testcases. From zeeshanak at gnome.org Sun Mar 15 16:04:48 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:48 +0000 Subject: [Libosinfo] [PATCH 01/12] schema: Allow volume-size attribute for ISO9660 media In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-2-git-send-email-zeeshanak@gnome.org> Allow medias to specify the size of ISO9660 volumes. --- data/schemas/libosinfo.rng | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index 1580d9a..db6e145 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -310,6 +310,11 @@ + + + + + -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:49 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:49 +0000 Subject: [Libosinfo] [PATCH 02/12] media: API to get/set ISO9660 volume size In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-3-git-send-email-zeeshanak@gnome.org> --- osinfo/libosinfo.syms | 5 +++++ osinfo/osinfo_media.c | 43 +++++++++++++++++++++++++++++++++++++++++++ osinfo/osinfo_media.h | 2 ++ 3 files changed, 50 insertions(+) diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index 5c423b9..2dba411 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -505,6 +505,11 @@ LIBOSINFO_0.2.11 { osinfo_install_script_get_needs_internet; } LIBOSINFO_0.2.10; +LIBOSINFO_0.2.12 { + global: + osinfo_media_get_volume_size; +} LIBOSINFO_0.2.11; + /* Symbols in next release... LIBOSINFO_0.0.2 { diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 96f9603..e86df11 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -156,6 +156,7 @@ enum { PROP_INSTALLER_REBOOTS, PROP_OS, PROP_LANGUAGES, + PROP_VOLUME_SIZE }; static void @@ -230,6 +231,11 @@ osinfo_media_get_property(GObject *object, g_value_set_pointer(value, osinfo_media_get_languages(media)); break; + case PROP_VOLUME_SIZE: + g_value_set_int64(value, + osinfo_media_get_volume_size(media)); + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); @@ -320,6 +326,12 @@ osinfo_media_set_property(GObject *object, osinfo_media_set_languages(media, g_value_get_pointer(value)); break; + case PROP_VOLUME_SIZE: + osinfo_entity_set_param_int64(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_VOLUME_SIZE, + g_value_get_int64(value)); + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); @@ -547,6 +559,21 @@ osinfo_media_class_init(OsinfoMediaClass *klass) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_property(g_klass, PROP_LANGUAGES, pspec); + + /** + * OsinfoMedia:volume-size: + * + * Expected volume size, in bytes for ISO9660 image/device. + */ + pspec = g_param_spec_int64("volume-size", + "VolumeSize", + _("Expected ISO9660 volume size, in bytes"), + G_MININT, + G_MAXINT64, + 1 /* default value */, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); + g_object_class_install_property(g_klass, PROP_VOLUME_SIZE, pspec); } static void @@ -1217,6 +1244,22 @@ void osinfo_media_set_languages(OsinfoMedia *media, GList *languages) OSINFO_MEDIA_PROP_LANG, it->data); } + +/** + * osinfo_media_get_volume_size: + * @media: an #OsinfoMedia instance + * + * Returns: (transfer none): the ISO9660 volume size, in bytes or -1 if size is + * unknown or media is not a ISO9660 device/image. + */ +gint64 osinfo_media_get_volume_size(OsinfoMedia *media) +{ + g_return_val_if_fail(OSINFO_IS_MEDIA(media), -1); + + return osinfo_entity_get_param_value_int64_with_default + (OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_VOLUME_SIZE, -1); +} + /* * Local variables: * indent-tabs-mode: nil diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h index 8cf3e05..8ad39c4 100644 --- a/osinfo/osinfo_media.h +++ b/osinfo/osinfo_media.h @@ -86,6 +86,7 @@ typedef struct _OsinfoMediaPrivate OsinfoMediaPrivate; #define OSINFO_MEDIA_PROP_LANG_REGEX "l10n-language-regex" #define OSINFO_MEDIA_PROP_LANG_MAP "l10n-language-map" #define OSINFO_MEDIA_PROP_VARIANT "variant" +#define OSINFO_MEDIA_PROP_VOLUME_SIZE "volume-size" /* object */ struct _OsinfoMedia @@ -135,6 +136,7 @@ GList *osinfo_media_get_languages(OsinfoMedia *media); gboolean osinfo_media_get_installer(OsinfoMedia *media); gboolean osinfo_media_get_live(OsinfoMedia *media); gint osinfo_media_get_installer_reboots(OsinfoMedia *media); +gint64 osinfo_media_get_volume_size(OsinfoMedia *media); #endif /* __OSINFO_MEDIA_H__ */ /* -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:50 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:50 +0000 Subject: [Libosinfo] [PATCH 03/12] media: Extract volume size from ISO9660 device/image In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-4-git-send-email-zeeshanak@gnome.org> When creating a media object from an ISO9660 device/image, extract volume size too along with other other information. --- osinfo/osinfo_media.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index e86df11..d9f3e0b 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -46,11 +46,15 @@ struct _PrimaryVolumeDescriptor { guint8 ignored[8]; gchar system[MAX_SYSTEM]; /* System ID */ gchar volume[MAX_VOLUME]; /* Volume ID */ - guint8 ignored2[246]; + guint8 ignored2[8]; + gint32 volume_space_size[2]; + guint8 ignored3[40]; + gint16 logical_blk_size[2]; + guint8 ignored4[186]; gchar publisher[MAX_PUBLISHER]; /* Publisher ID */ - guint8 ignored3[128]; + guint8 ignored5[128]; gchar application[MAX_APPLICATION]; /* Application ID */ - guint8 ignored4[1346]; + guint8 ignored6[1346]; }; /* the PrimaryVolumeDescriptor struct must exactly 2048 bytes long @@ -677,6 +681,8 @@ static void on_svd_read(GObject *source, GError *error = NULL; CreateFromLocationAsyncData *data; gssize ret; + guint8 index; + gint64 vol_size; data = (CreateFromLocationAsyncData *)user_data; @@ -745,6 +751,13 @@ static void on_svd_read(GObject *source, OSINFO_MEDIA_PROP_APPLICATION_ID, data->pvd.application); + index = (G_BYTE_ORDER == G_LITTLE_ENDIAN)? 0 : 1; + vol_size = ((gint64) data->pvd.volume_space_size[index]) * + data->pvd.logical_blk_size[index]; + osinfo_entity_set_param_int64(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_VOLUME_SIZE, + vol_size); + EXIT: if (error != NULL) g_simple_async_result_take_error(data->res, error); -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:51 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:51 +0000 Subject: [Libosinfo] [PATCH 04/12] loader: Load volume-size for ISO9660 medias In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-5-git-send-email-zeeshanak@gnome.org> --- osinfo/osinfo_loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index 845eda3..4e8f942 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -999,7 +999,9 @@ static OsinfoMedia *osinfo_loader_media(OsinfoLoader *loader, strcmp((const gchar *)nodes[i]->name, OSINFO_MEDIA_PROP_APPLICATION_ID) != 0 && strcmp((const gchar *)nodes[i]->name, - OSINFO_MEDIA_PROP_LANG) != 0)) + OSINFO_MEDIA_PROP_LANG) != 0 && + strcmp((const gchar *)nodes[i]->name, + OSINFO_MEDIA_PROP_VOLUME_SIZE) != 0)) continue; if (strcmp((const gchar *)nodes[i]->name, -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:52 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:52 +0000 Subject: [Libosinfo] [PATCH 05/12] test-isodetect: Load volume size info In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-6-git-send-email-zeeshanak@gnome.org> Our data on various ISOs provide volume size information. Lets load that information so that its part of our tests. --- test/test-isodetect.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test-isodetect.c b/test/test-isodetect.c index 5bd211a..a051df7 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -93,6 +93,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar * GDataInputStream *dis = NULL; gchar *line; const gchar *arch; + gint64 vol_size = -1, blk_size; if (!(fis = g_file_read(file, NULL, error))) goto error; @@ -148,9 +149,18 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar * osinfo_entity_set_param(OSINFO_ENTITY(info->media), OSINFO_MEDIA_PROP_APPLICATION_ID, line + 16); + } else if (g_str_has_prefix(line, "Logical block size is:")) { + blk_size = (gint64) atoll (line + 23); + } else if (g_str_has_prefix(line, "Volume size is:")) { + vol_size = atoll (line + 16); } } + if (vol_size > 0) + osinfo_entity_set_param_int64(OSINFO_ENTITY(info->media), + OSINFO_MEDIA_PROP_VOLUME_SIZE, + vol_size * blk_size); + if (*error) goto error; -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:53 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:53 +0000 Subject: [Libosinfo] [PATCH 06/12] db: Use volume-size info for detection In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-7-git-send-email-zeeshanak@gnome.org> If volume-size is known of a media, ensure that its the same as media being compared with, for detection. This will enable us to differentiate ISOs with exactly same volume-id, system-id and application-id. Its possible that we encounter two different ISOs that have the same volume-size, not just the other IDs but chances of that happening are extremely small. Even if that happens, this patch doesn't make things worse for that scenerio. --- osinfo/osinfo_db.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c index 241ee47..c7730c8 100644 --- a/osinfo/osinfo_db.c +++ b/osinfo/osinfo_db.c @@ -548,6 +548,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db, const gchar *media_system; const gchar *media_publisher; const gchar *media_application; + gint64 media_vol_size; g_return_val_if_fail(OSINFO_IS_DB(db), NULL); g_return_val_if_fail(media != NULL, NULL); @@ -556,6 +557,7 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db, media_system = osinfo_media_get_system_id(media); media_publisher = osinfo_media_get_publisher_id(media); media_application = osinfo_media_get_application_id(media); + media_vol_size = osinfo_media_get_volume_size(media); oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses)); for (os_iter = oss; os_iter; os_iter = os_iter->next) { @@ -572,11 +574,14 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db, const gchar *os_system = osinfo_media_get_system_id(os_media); const gchar *os_publisher = osinfo_media_get_publisher_id(os_media); const gchar *os_application = osinfo_media_get_application_id(os_media); + gint64 os_vol_size = osinfo_media_get_volume_size(os_media); if (match_regex(os_volume, media_volume) && match_regex(os_application, media_application) && match_regex(os_system, media_system) && - match_regex(os_publisher, media_publisher)) { + match_regex(os_publisher, media_publisher) && + (os_vol_size <= 0 || + os_vol_size == media_vol_size)) { ret = os; if (matched_media != NULL) *matched_media = os_media; -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:54 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:54 +0000 Subject: [Libosinfo] [PATCH 07/12] test: Replace F19 & F21 Alpha ISO data w/ released In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-8-git-send-email-zeeshanak@gnome.org> Both F19 and F21 has been released. Not only its better to keep test data against released ISOs rather than Alpha ISOs, the volume-size is obviously different between released and Alpha ISO so if we want to add volume-size for these ISOs to our database, we need this change to avoid breaking the tests. --- .../Fedora-19-i386-netinst.iso.txt} | 8 +++--- ...etinst.iso.txt => Fedora-19-x86_64-DVD.iso.txt} | 8 +++--- ...o.txt => Fedora-Live-Desktop-i686-19-1.iso.txt} | 4 +-- ...txt => Fedora-Live-Desktop-x86_64-19-1.iso.txt} | 6 ++--- .../fedora19/Fedora-Live-KDE-i686-19-1.iso.txt | 29 ++++++++++++++++++++++ ...iso.txt => Fedora-Live-KDE-x86_64-19-1.iso.txt} | 6 ++--- ...so.txt => Fedora-Live-LXDE-x86_64-19-1.iso.txt} | 6 ++--- ...so.txt => Fedora-Live-XFCE-x86_64-19-1.iso.txt} | 6 ++--- .../Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt | 29 ---------------------- .../fedora21/Fedora-Server-DVD-i386-21.iso.txt | 29 ++++++++++++++++++++++ 10 files changed, 80 insertions(+), 51 deletions(-) rename test/isodata/fedora/{fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt => fedora19/Fedora-19-i386-netinst.iso.txt} (82%) rename test/isodata/fedora/fedora19/{Fedora-19-Alpha-x86_64-netinst.iso.txt => Fedora-19-x86_64-DVD.iso.txt} (82%) rename test/isodata/fedora/fedora19/{Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt => Fedora-Live-Desktop-i686-19-1.iso.txt} (92%) rename test/isodata/fedora/fedora19/{Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt => Fedora-Live-Desktop-x86_64-19-1.iso.txt} (89%) create mode 100644 test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt rename test/isodata/fedora/fedora19/{Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt => Fedora-Live-KDE-x86_64-19-1.iso.txt} (89%) rename test/isodata/fedora/fedora19/{Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt => Fedora-Live-LXDE-x86_64-19-1.iso.txt} (89%) rename test/isodata/fedora/fedora19/{Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt => Fedora-Live-XFCE-x86_64-19-1.iso.txt} (89%) delete mode 100644 test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt b/test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt similarity index 82% rename from test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt rename to test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt index f4e9436..dab2a8d 100644 --- a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-19-i386-netinst.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-S-21_A_T7-x86_64 +Volume id: Fedora 19 i386 Volume set id: Publisher id: Data preparer id: @@ -11,8 +11,8 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 979923 -El Torito VD version 1 found, boot catalog is in sector 439 +Volume size is: 180667 +El Torito VD version 1 found, boot catalog is in sector 40 Joliet with UCS level 3 found Rock Ridge signatures version 1 found Eltorito validation header: @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 1B8 440 + Bootoff 3D14 15636 diff --git a/test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt b/test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt similarity index 82% rename from test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt rename to test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt index f425cf5..3ad2f70 100644 --- a/test/isodata/fedora/fedora19/Fedora-19-Alpha-x86_64-netinst.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-19-x86_64-DVD.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora 19-Alpha x86_64 +Volume id: Fedora 19 x86_64 Volume set id: Publisher id: Data preparer id: @@ -11,8 +11,8 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 159569 -El Torito VD version 1 found, boot catalog is in sector 46 +Volume size is: 2170157 +El Torito VD version 1 found, boot catalog is in sector 659 Joliet with UCS level 3 found Rock Ridge signatures version 1 found Eltorito validation header: @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 3B86 15238 + Bootoff 294 660 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt similarity index 92% rename from test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt rename to test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt index 8dd33f4..7cf764a 100644 --- a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-Alpha-1.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-i686-19-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-Live-Desktop-i686-19-Alph +Volume id: Fedora-Live-Desktop-i686-19-1 Volume set id: Publisher id: Data preparer id: @@ -11,7 +11,7 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 492490 +Volume size is: 470060 El Torito VD version 1 found, boot catalog is in sector 36 Joliet with UCS level 3 found Rock Ridge signatures version 1 found diff --git a/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt similarity index 89% rename from test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt rename to test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt index 0f94172..44cb133 100644 --- a/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-Alpha-1.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-Live-LXDE-x86_64-19-Alpha +Volume id: Fedora-Live-Desktop-x86_64-19-1 Volume set id: Publisher id: Data preparer id: @@ -11,7 +11,7 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 379826 +Volume size is: 486873 El Torito VD version 1 found, boot catalog is in sector 42 Joliet with UCS level 3 found Rock Ridge signatures version 1 found @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 9CA 2506 + Bootoff 9F6 2550 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt new file mode 100644 index 0000000..a24aae1 --- /dev/null +++ b/test/isodata/fedora/fedora19/Fedora-Live-KDE-i686-19-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-KDE-i686-19-1 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 431436 +El Torito VD version 1 found, boot catalog is in sector 36 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 25 37 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt similarity index 89% rename from test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt rename to test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt index 4d5635d..c1df730 100644 --- a/test/isodata/fedora/fedora19/Fedora-Live-SoaS-x86_64-19-Alpha-1.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-Live-SoaS-x86_64-19-Alpha +Volume id: Fedora-Live-KDE-x86_64-19-1 Volume set id: Publisher id: Data preparer id: @@ -11,7 +11,7 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 333903 +Volume size is: 449225 El Torito VD version 1 found, boot catalog is in sector 42 Joliet with UCS level 3 found Rock Ridge signatures version 1 found @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 9CA 2506 + Bootoff 9F6 2550 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt similarity index 89% rename from test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt rename to test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt index 6af34bb..4634ecc 100644 --- a/test/isodata/fedora/fedora19/Fedora-Live-Desktop-x86_64-19-Alpha-1.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-Live-LXDE-x86_64-19-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-Live-Desktop-x86_64-19-Al +Volume id: Fedora-Live-LXDE-x86_64-19-1 Volume set id: Publisher id: Data preparer id: @@ -11,7 +11,7 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 510034 +Volume size is: 353701 El Torito VD version 1 found, boot catalog is in sector 42 Joliet with UCS level 3 found Rock Ridge signatures version 1 found @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 9CA 2506 + Bootoff 9F6 2550 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt similarity index 89% rename from test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt rename to test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt index 61e9c6b..6874d0d 100644 --- a/test/isodata/fedora/fedora19/Fedora-Live-KDE-x86_64-19-Alpha-1.iso.txt +++ b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-1.iso.txt @@ -1,6 +1,6 @@ CD-ROM is in ISO 9660 format System id: LINUX -Volume id: Fedora-Live-KDE-x86_64-19-Alpha- +Volume id: Fedora-Live-XFCE-x86_64-19-1 Volume set id: Publisher id: Data preparer id: @@ -11,7 +11,7 @@ Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 -Volume size is: 454492 +Volume size is: 317471 El Torito VD version 1 found, boot catalog is in sector 42 Joliet with UCS level 3 found Rock Ridge signatures version 1 found @@ -26,4 +26,4 @@ Eltorito validation header: Load segment 0 Sys type 0 Nsect 4 - Bootoff 9CA 2506 + Bootoff 9F6 2550 diff --git a/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt b/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt deleted file mode 100644 index 7425d02..0000000 --- a/test/isodata/fedora/fedora19/Fedora-Live-XFCE-x86_64-19-Alpha-1.iso.txt +++ /dev/null @@ -1,29 +0,0 @@ -CD-ROM is in ISO 9660 format -System id: LINUX -Volume id: Fedora-Live-XFCE-x86_64-19-Alpha -Volume set id: -Publisher id: -Data preparer id: -Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM -Copyright File id: -Abstract File id: -Bibliographic File id: -Volume set size is: 1 -Volume set sequence number is: 1 -Logical block size is: 2048 -Volume size is: 386506 -El Torito VD version 1 found, boot catalog is in sector 42 -Joliet with UCS level 3 found -Rock Ridge signatures version 1 found -Eltorito validation header: - Hid 1 - Arch 0 (x86) - ID '' - Key 55 AA - Eltorito defaultboot header: - Bootid 88 (bootable) - Boot media 0 (No Emulation Boot) - Load segment 0 - Sys type 0 - Nsect 4 - Bootoff 9CA 2506 diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt new file mode 100644 index 0000000..f1717cc --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-i386-21.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-21-i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1051499 +El Torito VD version 1 found, boot catalog is in sector 435 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 1B4 436 -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:56 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:56 +0000 Subject: [Libosinfo] [PATCH 09/12] tests, fedora: Add testcases for all F20 ISOs In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-10-git-send-email-zeeshanak@gnome.org> --- .../fedora/fedora20/Fedora-20-i386-DVD.iso.txt | 29 ++++++++++++++++++++++ .../fedora/fedora20/Fedora-20-i386-netinst.iso.txt | 29 ++++++++++++++++++++++ .../fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt | 29 ++++++++++++++++++++++ .../fedora20/Fedora-20-x86_64-netinst.iso.txt | 29 ++++++++++++++++++++++ .../fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt | 29 ++++++++++++++++++++++ .../Fedora-Live-Desktop-x86_64-20-1.iso.txt | 29 ++++++++++++++++++++++ .../fedora20/Fedora-Live-KDE-i686-20-1.iso.txt | 29 ++++++++++++++++++++++ .../fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt | 29 ++++++++++++++++++++++ 8 files changed, 232 insertions(+) create mode 100644 test/isodata/fedora/fedora20/Fedora-20-i386-DVD.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-20-i386-netinst.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-20-x86_64-netinst.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-Live-Desktop-x86_64-20-1.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-Live-KDE-i686-20-1.iso.txt create mode 100644 test/isodata/fedora/fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt diff --git a/test/isodata/fedora/fedora20/Fedora-20-i386-DVD.iso.txt b/test/isodata/fedora/fedora20/Fedora-20-i386-DVD.iso.txt new file mode 100644 index 0000000..70ffbf2 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-20-i386-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora 20 i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2284805 +El Torito VD version 1 found, boot catalog is in sector 658 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 293 659 diff --git a/test/isodata/fedora/fedora20/Fedora-20-i386-netinst.iso.txt b/test/isodata/fedora/fedora20/Fedora-20-i386-netinst.iso.txt new file mode 100644 index 0000000..d67cb04 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-20-i386-netinst.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora 20 i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 182695 +El Torito VD version 1 found, boot catalog is in sector 40 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 407A 16506 diff --git a/test/isodata/fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt b/test/isodata/fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt new file mode 100644 index 0000000..c8e45e6 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-20-x86_64-DVD.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora 20 x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 2247232 +El Torito VD version 1 found, boot catalog is in sector 676 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 2A5 677 diff --git a/test/isodata/fedora/fedora20/Fedora-20-x86_64-netinst.iso.txt b/test/isodata/fedora/fedora20/Fedora-20-x86_64-netinst.iso.txt new file mode 100644 index 0000000..4f269cd --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-20-x86_64-netinst.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora 20 x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 164242 +El Torito VD version 1 found, boot catalog is in sector 46 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 423F 16959 diff --git a/test/isodata/fedora/fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt b/test/isodata/fedora/fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt new file mode 100644 index 0000000..a7dc8d7 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-Live-Desktop-i686-20-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-Desktop-i686-20-1 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 471867 +El Torito VD version 1 found, boot catalog is in sector 36 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 25 37 diff --git a/test/isodata/fedora/fedora20/Fedora-Live-Desktop-x86_64-20-1.iso.txt b/test/isodata/fedora/fedora20/Fedora-Live-Desktop-x86_64-20-1.iso.txt new file mode 100644 index 0000000..4aab969 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-Live-Desktop-x86_64-20-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-Desktop-x86_64-20-1 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 487536 +El Torito VD version 1 found, boot catalog is in sector 42 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 9FF 2559 diff --git a/test/isodata/fedora/fedora20/Fedora-Live-KDE-i686-20-1.iso.txt b/test/isodata/fedora/fedora20/Fedora-Live-KDE-i686-20-1.iso.txt new file mode 100644 index 0000000..3c12552 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-Live-KDE-i686-20-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-KDE-i686-20-1 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 458566 +El Torito VD version 1 found, boot catalog is in sector 36 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 25 37 diff --git a/test/isodata/fedora/fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt b/test/isodata/fedora/fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt new file mode 100644 index 0000000..5f42220 --- /dev/null +++ b/test/isodata/fedora/fedora20/Fedora-Live-KDE-x86_64-20-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-KDE-x86_64-20-1 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 474711 +El Torito VD version 1 found, boot catalog is in sector 42 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 9FF 2559 -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:57 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:57 +0000 Subject: [Libosinfo] [PATCH 10/12] fedora: Add volume size info for F21 ISOs In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-11-git-send-email-zeeshanak@gnome.org> --- data/oses/fedora.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index 96d523c..d56d024 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -3928,6 +3928,7 @@ Fedora-Live-WS-i686-21.* LINUX + 1335937024 isolinux/vmlinuz0 isolinux/initrd0.img @@ -3938,6 +3939,7 @@ Fedora-Live-WS-x86_64-21.* LINUX + 1471502336 isolinux/vmlinuz0 isolinux/initrd0.img @@ -3951,6 +3953,7 @@ Fedora-S.*21.*-i386 LINUX + 2153469952 isolinux/vmlinuz isolinux/initrd.img @@ -3961,6 +3964,7 @@ Fedora-S.*-21.*-x86_64 LINUX + 2047315968 isolinux/vmlinuz isolinux/initrd.img @@ -3993,6 +3997,7 @@ Fedora-C.*21.*-i386 LINUX + 505688064 isolinux/vmlinuz isolinux/initrd.img @@ -4003,6 +4008,7 @@ Fedora-C.*-21.*-x86_64 LINUX + 444221440 isolinux/vmlinuz isolinux/initrd.img -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:58 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:58 +0000 Subject: [Libosinfo] [PATCH 11/12] fedora: Add netiso media entries In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-12-git-send-email-zeeshanak@gnome.org> --- data/oses/fedora.xml.in | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index d56d024..9eaa691 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -3947,6 +3947,7 @@ + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso @@ -3970,6 +3971,30 @@ isolinux/initrd.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso + + Fedora-S.*21.*-i386 + LINUX + 505403392 + + isolinux/vmlinuz + isolinux/initrd.img + + + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso + + Fedora-S.*-21.*-x86_64 + LINUX + 444067840 + + isolinux/vmlinuz + isolinux/initrd.img + + http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/ -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:59 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:59 +0000 Subject: [Libosinfo] [PATCH 12/12] test: Add all F21 ISO testcases In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-13-git-send-email-zeeshanak@gnome.org> --- .../fedora21/Fedora-Cloud-netinst-i386-21.iso.txt | 29 ++++++++++++++++++++++ .../fedora21/Fedora-Cloud-netinst-x86_64-21.iso | 29 ++++++++++++++++++++++ .../Fedora-Live-Workstation-i686-21-5.iso.txt | 29 ++++++++++++++++++++++ .../Fedora-Live-Workstation-x86_64-21-5.iso.txt | 29 ++++++++++++++++++++++ .../fedora21/Fedora-Server-DVD-x86_64-21.iso.txt | 29 ++++++++++++++++++++++ .../fedora21/Fedora-Server-netinst-i386-21.iso.txt | 29 ++++++++++++++++++++++ .../Fedora-Server-netinst-x86_64-21.iso.txt | 29 ++++++++++++++++++++++ 7 files changed, 203 insertions(+) create mode 100644 test/isodata/fedora/fedora21/Fedora-Cloud-netinst-i386-21.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Cloud-netinst-x86_64-21.iso create mode 100644 test/isodata/fedora/fedora21/Fedora-Live-Workstation-i686-21-5.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Live-Workstation-x86_64-21-5.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-netinst-i386-21.iso.txt create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-netinst-x86_64-21.iso.txt diff --git a/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-i386-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-i386-21.iso.txt new file mode 100644 index 0000000..0d1d5d1 --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-i386-21.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-C-21-i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 246918 +El Torito VD version 1 found, boot catalog is in sector 41 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 5162 20834 diff --git a/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-x86_64-21.iso b/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-x86_64-21.iso new file mode 100644 index 0000000..11ccbd9 --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Cloud-netinst-x86_64-21.iso @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-C-21-x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 216905 +El Torito VD version 1 found, boot catalog is in sector 47 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 53AD 21421 diff --git a/test/isodata/fedora/fedora21/Fedora-Live-Workstation-i686-21-5.iso.txt b/test/isodata/fedora/fedora21/Fedora-Live-Workstation-i686-21-5.iso.txt new file mode 100644 index 0000000..f52683f --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Live-Workstation-i686-21-5.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-WS-i686-21-5 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 652313 +El Torito VD version 1 found, boot catalog is in sector 36 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 25 37 diff --git a/test/isodata/fedora/fedora21/Fedora-Live-Workstation-x86_64-21-5.iso.txt b/test/isodata/fedora/fedora21/Fedora-Live-Workstation-x86_64-21-5.iso.txt new file mode 100644 index 0000000..ae7cb2e --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Live-Workstation-x86_64-21-5.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-Live-WS-x86_64-21-5 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 718507 +El Torito VD version 1 found, boot catalog is in sector 42 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff A11 2577 diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21.iso.txt new file mode 100644 index 0000000..4c1cbfd --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-21-x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 999666 +El Torito VD version 1 found, boot catalog is in sector 446 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 1BF 447 diff --git a/test/isodata/fedora/fedora21/Fedora-Server-netinst-i386-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-netinst-i386-21.iso.txt new file mode 100644 index 0000000..f4df422 --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Server-netinst-i386-21.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-21-i386 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 246779 +El Torito VD version 1 found, boot catalog is in sector 41 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 5162 20834 diff --git a/test/isodata/fedora/fedora21/Fedora-Server-netinst-x86_64-21.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-netinst-x86_64-21.iso.txt new file mode 100644 index 0000000..04add7e --- /dev/null +++ b/test/isodata/fedora/fedora21/Fedora-Server-netinst-x86_64-21.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Fedora-S-21-x86_64 +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 216830 +El Torito VD version 1 found, boot catalog is in sector 47 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID '' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 4 + Bootoff 53AD 21421 -- 2.1.0 From zeeshanak at gnome.org Sun Mar 15 16:04:55 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Sun, 15 Mar 2015 16:04:55 +0000 Subject: [Libosinfo] [PATCH 08/12] fedora: Separate media entry for each ISO In-Reply-To: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> References: <1426435499-5104-1-git-send-email-zeeshanak@gnome.org> Message-ID: <1426435499-5104-9-git-send-email-zeeshanak@gnome.org> Different ISOs have different volume sizes so to be able to add volume size info to all medias, we have to create separate media entry for each ISO. Moreover, apart from the fact that this makes one particular XML file a lot bigger than we'd like it to be, this chane makes a lot of sense anyway. This will also make addition of sequence numbers to multi-disk installer medias, much easier later. --- data/oses/fedora.xml.in | 2808 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 2582 insertions(+), 226 deletions(-) diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index 0c01ab9..96d523c 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -21,15 +21,47 @@ + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc1.iso FC/1 i386 LINUX + 660340736 isolinux/vmlinuz isolinux/initrd.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc2.iso + + FC/1 i386 + LINUX + 667516928 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc3.iso + + FC/1 i386 + LINUX + 645464064 + + + + + + + FC/1 i386 + LINUX + 3963158528 + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/iso/yarrow-x86_64-disc1.iso @@ -72,20 +104,107 @@ 2004-05-18 2005-04-11 + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc1.iso FC/2 i386 LINUX + 667529216 isolinux/vmlinuz isolinux/initrd.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc2.iso + + FC/2 i386 + LINUX + 665802752 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc3.iso + + FC/2 i386 + LINUX + 669016064 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc4.iso + + FC/2 i386 + LINUX + 203737088 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-DVD.iso + + FC/2 i386 + LINUX + 4370640896 + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc1.iso FC/2 x86_64 LINUX + 668203008 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc2.iso + + FC/2 x86_64 + LINUX + 666394624 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc3.iso + + FC/2 x86_64 + LINUX + 656420864 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc4.iso + + FC/2 x86_64 + LINUX + 240547840 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-DVD.iso + + FC/2 x86_64 + LINUX + 4273096704 isolinux/vmlinuz isolinux/initrd.img @@ -123,20 +242,107 @@ 2004-11-08 2006-01-16 + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc1.iso FC/3 i386 LINUX + 646987776 isolinux/vmlinuz isolinux/initrd.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc2.iso + + FC/3 i386 + LINUX + 668520448 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc3.iso + + FC/3 i386 + LINUX + 667498496 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc4.iso + + FC/3 i386 + LINUX + 404764672 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-DVD.iso + + FC/3 i386 + LINUX + 2466410496 + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc1.iso FC/3 x86_64 LINUX + 668137472 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc2.iso + + FC/3 x86_64 + LINUX + 669126656 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc3.iso + + FC/3 x86_64 + LINUX + 668422144 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc4.iso + + FC/3 x86_64 + LINUX + 634851328 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-DVD.iso + + FC/3 x86_64 + LINUX + 2639267840 isolinux/vmlinuz isolinux/initrd.img @@ -174,29 +380,181 @@ 2005-06-13 2006-08-07 + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc1.iso FC/4 i386 LINUX + 665434112 isolinux/vmlinuz isolinux/initrd.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc2.iso + + FC/4 i386 + LINUX + 668708864 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc3.iso + + FC/4 i386 + LINUX + 668954624 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc4.iso + + FC/4 i386 + LINUX + 660512768 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-DVD.iso + + FC/4 i386 + LINUX + 2750582784 + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc1.iso FC/4 x86_64 LINUX + 668174336 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc2.iso + + FC/4 x86_64 + LINUX + 666898432 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc3.iso + + FC/4 x86_64 + LINUX + 669458432 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc4.iso + + FC/4 x86_64 + LINUX + 667107328 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc5.iso + + FC/4 x86_64 + LINUX + 173809664 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-DVD.iso + + FC/4 x86_64 + LINUX + 2932850688 isolinux/vmlinuz isolinux/initrd.img + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc1.iso FC/4 ppc - PPC|LINUX + PPC + 661739520 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc2.iso + + FC/4 ppc + LINUX + 642336768 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc3.iso + + FC/4 ppc + LINUX + 614821888 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc4.iso + + FC/4 ppc + LINUX + 662865920 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc5.iso + + FC/4 ppc + LINUX + 462649344 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-DVD.iso + + FC/4 ppc + PPC + 3090690048 isolinux/vmlinuz isolinux/initrd.img @@ -234,29 +592,191 @@ 2006-03-20 2007-07-02 + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc1.iso FC/5 i386 LINUX + 687235072 isolinux/vmlinuz isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc2.iso - FC/5 x86_64 + FC/5 i386 LINUX + 700618752 - isolinux/vmlinuz - isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc3.iso + + FC/5 i386 + LINUX + 721016832 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc4.iso + + FC/5 i386 + LINUX + 720910336 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc5.iso + + FC/5 i386 + LINUX + 387753984 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-DVD.iso + + FC/5 i386 + LINUX + 3253669888 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso + + FC/5 x86_64 + LINUX + 668962816 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc2.iso + + FC/5 x86_64 + LINUX + 718063616 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc3.iso + + FC/5 x86_64 + LINUX + 718374912 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc4.iso + + FC/5 x86_64 + LINUX + 717789184 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc5.iso + + FC/5 x86_64 + LINUX + 613832704 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-DVD.iso + + FC/5 x86_64 + LINUX + 3462629376 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso FC/5 ppc - PPC|LINUX + PPC + 695058432 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc2.iso + + FC/5 ppc + LINUX + 719341568 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc3.iso + + FC/5 ppc + LINUX + 719454208 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc4.iso + + FC/5 ppc + LINUX + 720560128 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc5.iso + + FC/5 ppc + LINUX + 686794752 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-DVD.iso + + FC/5 ppc + PPC + 3631042560 isolinux/vmlinuz isolinux/initrd.img @@ -294,29 +814,211 @@ 2006-10-24 2007-12-07 + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc1.iso - FC(-|/)6 i386 + FC-6 i386 LINUX + 708780032 isolinux/vmlinuz isolinux/initrd.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc2.iso + + FC-6 i386 + LINUX + 714240000 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc3.iso + + FC-6 i386 + LINUX + 711491584 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc4.iso + + FC-6 i386 + LINUX + 715229184 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc5.iso + + FC-6 i386 + LINUX + 677183488 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-DVD.iso + + FC/6 i386 + LINUX + 3525195776 + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc1.iso - FC(-|/)6 x86_64 + FC-6 x86_64 + LINUX + 704204800 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc2.iso + + FC-6 x86_64 + LINUX + 709750784 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc3.iso + + FC-6 x86_64 + LINUX + 706191360 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc4.iso + + FC-6 x86_64 + LINUX + 707473408 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc5.iso + + FC-6 x86_64 + LINUX + 715692032 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc6.iso + + FC-6 x86_64 + LINUX + 546852864 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-DVD.iso + + FC/6 x86_64 LINUX + 4088006656 isolinux/vmlinuz isolinux/initrd.img + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc1.iso - FC(-|/)6 ppc - PPC|LINUX + FC-6 ppc + PPC + 730435584 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc2.iso + + FC-6 ppc + LINUX + 713457664 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc3.iso + + FC-6 ppc + LINUX + 708587520 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc4.iso + + FC-6 ppc + LINUX + 704706560 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc5.iso + + FC-6 ppc + LINUX + 714592256 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc6.iso + + FC-6 ppc + LINUX + 604110848 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-DVD.iso + + FC/6 ppc + PPC + 4285673472 isolinux/vmlinuz isolinux/initrd.img @@ -357,45 +1059,77 @@ http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/iso/F-7-i386-DVD.iso - Fedora 7 i386 (DVD|Disc) + Fedora 7 i386 LINUX + 2900602880 - isolinux/vmlinuz - isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/iso/F-7-x86_64-DVD.iso - Fedora 7 x86_64 (DVD|Disc) + Fedora 7 x86_64 LINUX + 3447975936 isolinux/vmlinuz isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/ppc/iso/F-7-ppc-DVD.iso - Fedora 7 ppc (DVD|Disc) + Fedora 7 ppc PPC + 3620605952 isolinux/vmlinuz isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-Live-i686.iso - Fedora-7-(KDE-)?Live-i386 + Fedora-7-Live-i386 + LINUX + 733427712 + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-KDE-Live-i686.iso + + Fedora-7-KDE-Live-i386 LINUX + 719859712 isolinux/vmlinuz0 isolinux/initrd0.img + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-Live-x86_64.iso - Fedora-7-(KDE-)?Live-x86_64 + Fedora-7-Live-x86_64 LINUX + 817156096 + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-KDE-Live-x86_64.iso + + Fedora-7-KDE-Live-x86_64 + LINUX + 871643136 isolinux/vmlinuz0 isolinux/initrd0.img @@ -440,54 +1174,89 @@ http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/iso/Fedora-8-i386-DVD.iso - Fedora 8 i386 (DVD|Disc) + Fedora 8 i386 LINUX + 3424749568 - isolinux/vmlinuz - isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/iso/Fedora-8-x86_64-DVD.iso - Fedora 8 x86_64 (DVD|Disc) + Fedora 8 x86_64 LINUX + 3876407296 isolinux/vmlinuz isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/ppc/iso/Fedora-8-ppc-DVD.iso - Fedora 8 ppc (DVD|Disc) + Fedora 8 ppc PPC + 4118646784 isolinux/vmlinuz isolinux/initrd.img + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-i686.iso - Fedora-8-Live-(KDE-)?i686 + Fedora-8-Live-i686 LINUX + 731086848 isolinux/vmlinuz0 isolinux/initrd0.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-KDE-i686.iso - Fedora-8-Live-(KDE-)?x86_64 + Fedora-8-Live-KDE-i686 LINUX + 732188672 isolinux/vmlinuz0 isolinux/initrd0.img + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso + + Fedora-8-Live-x86_64 + LINUX + 803870720 + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-KDE-x86_64.iso + + Fedora-8-Live-KDE-x86_64 + LINUX + 844269568 + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/ppc/Fedora-8-Live-ppc.iso - Fedora-8-Live-(KDE-)?ppc + Fedora-8-Live-ppc LINUX + 732942336 isolinux/vmlinuz0 isolinux/initrd0.img @@ -537,242 +1306,341 @@ --> + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-DVD.iso - Fedora 9 i386 (DVD|Disc) + Fedora 9 i386 + LINUX + 3580680192 + + + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc1.iso + + Fedora 9 i386 Disc 1 LINUX + 638533632 isolinux/vmlinuz isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-DVD.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc2.iso - Fedora 9 x86_64 (DVD|Disc) + Fedora 9 i386 Disc 2 LINUX + 668082176 isolinux/vmlinuz isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-DVD.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc3.iso - Fedora 9 ppc (DVD|Disc) - PPC|LINUX + Fedora 9 i386 Disc 3 + LINUX + 652095488 isolinux/vmlinuz isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc4.iso - Fedora-9-Live-(KDE-)?i686 + Fedora 9 i386 Disc 4 LINUX + 668047360 - isolinux/vmlinuz0 - isolinux/initrd0.img + isolinux/vmlinuz + isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live.iso + + + + http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc5.iso - Fedora-9-Live-(KDE-)?x86_64 + Fedora 9 i386 Disc 5 LINUX + 664877056 - isolinux/vmlinuz0 - isolinux/initrd0.img + isolinux/vmlinuz + isolinux/initrd.img - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/ - - Fedora - 9 - i386 - - - - http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/ - - Fedora - 9 - x86_64 - - - - -