From fidencio at redhat.com Fri Feb 1 16:40:48 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Fri, 1 Feb 2019 17:40:48 +0100 Subject: [Libosinfo] ANNOUNCE: libosinfo 1.3.0 release Message-ID: I am happy to announce a new release of libosinfo, version 1.3.0: https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz This is signed with key DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Add isodata test files for many more distros - Refreshed translations from Zanata - Refuse to load data files which do not follow the documented directory layout and file naming conventions introduced in version 0.3.0 - Avoid warnings when setting GError objects with new glib - Remove outdated FSF address from source file headers - Make several test suites collect & report all errors before exiting with failure for easy diagnosis - Avoid misc memory leaks - Add support for reporting maximum resource settings - Add support for reporting network installer resource settings - Fix data returned for osinfo_devicelinklist_get_devices - Support removal of devices during inheritance processing - Support inheritance of resources settings - Add OsinfoImage class & related APIs for reporting pre-installed disk images - Add API to determine if treeinfo metadata is provided - Add API to determine if media supports installer scripts - Add API to determine preferred install script injection methods - Add support for detecting if PPC ISO images are bootable Thanks to everyone who contributed to this release Best Regards, Fabiano Fid?ncio From fidencio at redhat.com Fri Feb 1 16:40:51 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Fri, 1 Feb 2019 17:40:51 +0100 Subject: [Libosinfo] ANNOUNCE: osinfo-db-tools 1.3.0 release Message-ID: I am happy to announce a new release of osinfo-db-tools, version 1.3.0: https://releases.pagure.org/libosinfo/osinfo-db-tools-1.3.0.tar.gz This is signed with key 09B9 C8FF 223E F113 AFA0 6A39 EE92 6C2B DACC 177B (4096R) https://releases.pagure.org/libosinfo/osinfo-db-tools-1.3.0.tar.gz.asc All historical releases are available from: http://libosinfo.org/download/ Changes in this release include: - Avoid warnings on osinfo-db-export due to calling g_object_unref() on a NULL object - Improvements on osinfo-db-import manpage - Remove outdated FSF address from source file headers - Make osinfo-db-import capable to deal with URLs - Introduce osinfo-db-import --latest - Refreshed translations from zanata Thanks to everyone who contributed to this release Best Regards, Fabiano Fid?ncio From crobinso at redhat.com Sun Feb 3 22:52:05 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:05 -0500 Subject: [Libosinfo] [PATCH osinfo-db 0/5] Misc os data updates Message-ID: Upstream virt-install is now using libosinfo to lookup kernel/initrd paths for iso media, alongside our own legacy detection logic. In testing this my local test suite exposed some missing data in osinfo-db. This series fixes some of those issues Cole Robinson (5): altlinux: Add some kernel/initrd paths ubuntu: Add ppc64el media for 19.04 ubuntu: Add kernel/initrd paths for ppc64el media ubuntu: Add kernel/initrd paths for s390x media ubuntu: Add kernel/initrd paths for arm64 media data/os/altlinux.org/alt-p8.starterkits.xml.in | 4 ++++ data/os/altlinux.org/alt-sisyphus.xml.in | 4 ++++ data/os/ubuntu.com/ubuntu-16.04.xml.in | 4 ++++ data/os/ubuntu.com/ubuntu-16.10.xml.in | 6 ++++++ data/os/ubuntu.com/ubuntu-17.04.xml.in | 6 ++++++ data/os/ubuntu.com/ubuntu-17.10.xml.in | 6 ++++++ data/os/ubuntu.com/ubuntu-18.04.xml.in | 6 ++++++ data/os/ubuntu.com/ubuntu-18.10.xml.in | 6 ++++++ data/os/ubuntu.com/ubuntu-19.04.xml.in | 12 ++++++++++++ 9 files changed, 54 insertions(+) -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:06 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:06 -0500 Subject: [Libosinfo] [PATCH osinfo-db 1/5] altlinux: Add some kernel/initrd paths In-Reply-To: References: Message-ID: Despite being marked as live, the media does provide kernel/initrd paths for direct booting Signed-off-by: Cole Robinson --- data/os/altlinux.org/alt-p8.starterkits.xml.in | 4 ++++ data/os/altlinux.org/alt-sisyphus.xml.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/data/os/altlinux.org/alt-p8.starterkits.xml.in b/data/os/altlinux.org/alt-p8.starterkits.xml.in index 8e6a973..822eae0 100644 --- a/data/os/altlinux.org/alt-p8.starterkits.xml.in +++ b/data/os/altlinux.org/alt-p8.starterkits.xml.in @@ -21,6 +21,8 @@ ALT LINUX TEAM ALT-P8-.* + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz @@ -29,6 +31,8 @@ ALT LINUX TEAM ALT-P8-.* + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz diff --git a/data/os/altlinux.org/alt-sisyphus.xml.in b/data/os/altlinux.org/alt-sisyphus.xml.in index 43b8f5f..a4cbb49 100644 --- a/data/os/altlinux.org/alt-sisyphus.xml.in +++ b/data/os/altlinux.org/alt-sisyphus.xml.in @@ -21,6 +21,8 @@ ALT LINUX TEAM REGULAR-.* + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz @@ -29,6 +31,8 @@ ALT LINUX TEAM REGULAR-.* + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:07 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:07 -0500 Subject: [Libosinfo] [PATCH libosinfo] ubuntu: Add 19.04 ppc64el test data In-Reply-To: References: Message-ID: Signed-off-by: Cole Robinson --- .../ubuntu19.04/disco-server-ppc64el.iso.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/isodata/ubuntu/ubuntu19.04/disco-server-ppc64el.iso.txt diff --git a/tests/isodata/ubuntu/ubuntu19.04/disco-server-ppc64el.iso.txt b/tests/isodata/ubuntu/ubuntu19.04/disco-server-ppc64el.iso.txt new file mode 100644 index 0000000..f798e4a --- /dev/null +++ b/tests/isodata/ubuntu/ubuntu19.04/disco-server-ppc64el.iso.txt @@ -0,0 +1,17 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Ubuntu-Server 19.04 ppc64 +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: 411869 +CD-ROM uses ISO 9660:1999 relaxed format +NO Joliet present +Rock Ridge signatures version 1 found -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:08 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:08 -0500 Subject: [Libosinfo] [PATCH osinfo-db 2/5] ubuntu: Add ppc64el media for 19.04 In-Reply-To: References: Message-ID: <0c94ef3d389c08e7cb6f4c66875631232baae1e9.1549234133.git.crobinso@redhat.com> Signed-off-by: Cole Robinson --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 69a9789..cf890c3 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -54,6 +54,12 @@ Ubuntu-Server 19.04(.\d)? arm64 + + http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-ppc64el.iso + + Ubuntu-Server 19.04(.\d)? ppc64 + + http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-s390x.iso -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:09 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:09 -0500 Subject: [Libosinfo] [PATCH osinfo-db 3/5] ubuntu: Add kernel/initrd paths for ppc64el media In-Reply-To: References: Message-ID: <10537716ef4c8c2979d4c762c5b950136fd5d40c.1549234133.git.crobinso@redhat.com> Signed-off-by: Cole Robinson --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-16.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 ++ 7 files changed, 14 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 1281ca1..791eb67 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -73,6 +73,8 @@ Ubuntu-Server 16.04(.\d)? LTS ppc64 + install/vmlinux + install/initrd.gz http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 9557340..5e43576 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -79,6 +79,8 @@ Ubuntu-Server 16.10(.\d)? ppc64 + install/vmlinux + install/initrd.gz http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 63bffd6..25a8be4 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -87,6 +87,8 @@ Ubuntu-Server 17.04(.\d)? ppc64 + install/vmlinux + install/initrd.gz http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 0e9ad0f..6575b4f 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -65,6 +65,8 @@ Ubuntu-Server 17.10(.\d)? ppc64 + install/vmlinux + install/initrd.gz http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index b39d1b7..1f4d44a 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -58,6 +58,8 @@ Ubuntu-Server 18.04(.\d)? LTS ppc64 + install/vmlinux + install/initrd.gz http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 9ad9a69..c9fb827 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -68,6 +68,8 @@ Ubuntu-Server 18.10(.\d)? ppc64 + install/vmlinux + install/initrd.gz http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-s390x.iso diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index cf890c3..4217bf1 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -59,6 +59,8 @@ Ubuntu-Server 19.04(.\d)? ppc64 + install/vmlinux + install/initrd.gz http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-s390x.iso -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:10 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:10 -0500 Subject: [Libosinfo] [PATCH osinfo-db 4/5] ubuntu: Add kernel/initrd paths for s390x media In-Reply-To: References: Message-ID: <350f930f343642ab843150e84e576db7065e67f0.1549234133.git.crobinso@redhat.com> Signed-off-by: Cole Robinson --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-16.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 ++ 7 files changed, 14 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 791eb67..3752ac4 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -81,6 +81,8 @@ Ubuntu-Server 16.04(.\d)? LTS s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 5e43576..63262ce 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -87,6 +87,8 @@ Ubuntu-Server 16.10(.\d)? s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 25a8be4..d01d882 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -95,6 +95,8 @@ Ubuntu-Server 17.04(.\d)? s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 6575b4f..0cc0e9f 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -73,6 +73,8 @@ Ubuntu-Server 17.10(.\d)? s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 1f4d44a..1c93aa6 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -66,6 +66,8 @@ Ubuntu-Server 18.04(.\d)? LTS s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index c9fb827..a47846b 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -76,6 +76,8 @@ Ubuntu-Server 18.10(.\d)? s390x + boot/kernel.ubuntu + boot/initrd.ubuntu diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 4217bf1..4b4c10d 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -67,6 +67,8 @@ Ubuntu-Server 19.04(.\d)? s390x + boot/kernel.ubuntu + boot/initrd.ubuntu -- 2.20.1 From crobinso at redhat.com Sun Feb 3 22:52:11 2019 From: crobinso at redhat.com (Cole Robinson) Date: Sun, 3 Feb 2019 17:52:11 -0500 Subject: [Libosinfo] [PATCH osinfo-db 5/5] ubuntu: Add kernel/initrd paths for arm64 media In-Reply-To: References: Message-ID: Signed-off-by: Cole Robinson --- data/os/ubuntu.com/ubuntu-16.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-17.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 ++ data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 ++ 6 files changed, 12 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 63262ce..ea0b64d 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -67,6 +67,8 @@ Ubuntu-Server 16.10(.\d)? arm64 + install/vmlinuz + install/initrd.gz http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-powerpc.iso diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index d01d882..7b7ca59 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -81,6 +81,8 @@ Ubuntu-Server 17.04(.\d)? arm64 + install/vmlinuz + install/initrd.gz http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 0cc0e9f..1aae23f 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -59,6 +59,8 @@ Ubuntu-Server 17.10(.\d)? arm64 + install/vmlinuz + install/initrd.gz http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-ppc64el.iso diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 1c93aa6..0bb0658 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -52,6 +52,8 @@ Ubuntu-Server 18.04(.\d)? LTS arm64 + install/vmlinuz + install/initrd.gz http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-ppc64el.iso diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index a47846b..1086541 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -62,6 +62,8 @@ Ubuntu-Server 18.10(.\d)? arm64 + install/vmlinuz + install/initrd.gz http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-ppc64el.iso diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 4b4c10d..73c4c4e 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -53,6 +53,8 @@ Ubuntu-Server 19.04(.\d)? arm64 + install/vmlinuz + install/initrd.gz http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-ppc64el.iso -- 2.20.1 From berrange at redhat.com Mon Feb 4 11:18:08 2019 From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=) Date: Mon, 4 Feb 2019 11:18:08 +0000 Subject: [Libosinfo] [PATCH] tests: add one test case per OS tested Message-ID: <20190204111808.32553-1-berrange@redhat.com> The image, media & tree URIs test suites just register one test case for all the work they do. As a result when they run they just sit there printing no progress information for a long time. This changes then to register one test case per OS in the database. As a result we get progress information. An added benefit is that it is possible to now run tests for individual OS by passing the -p argument. Signed-off-by: Daniel P. Berrang? --- tests/test-imageuris.c | 62 ++++++++++++++++++++++------------------- tests/test-mediauris.c | 63 +++++++++++++++++++++++------------------- tests/test-treeuris.c | 62 ++++++++++++++++++++++------------------- 3 files changed, 100 insertions(+), 87 deletions(-) diff --git a/tests/test-imageuris.c b/tests/test-imageuris.c index 775e80f..d58df02 100644 --- a/tests/test-imageuris.c +++ b/tests/test-imageuris.c @@ -64,14 +64,11 @@ static void test_image(OsinfoImageList *imagelist, GError **error, CURL *curl) } static void -test_uris(void) +test_uris(gconstpointer data) { + OsinfoOs *os = OSINFO_OS(data); CURL *curl; - OsinfoLoader *loader = osinfo_loader_new(); - OsinfoDb *db = osinfo_loader_get_db(loader); GError *error = NULL; - OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; const gchar *debugstr; curl = curl_easy_init(); @@ -87,33 +84,15 @@ test_uris(void) curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); } - g_assert_true(OSINFO_IS_LOADER(loader)); - g_assert_true(OSINFO_IS_DB(db)); - - osinfo_loader_process_default_path(loader, &error); - g_assert_no_error(error); - - oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - OsinfoImageList *imagelist = osinfo_os_get_image_list(os); + OsinfoImageList *imagelist = osinfo_os_get_image_list(os); - test_image(imagelist, &error, curl); + test_image(imagelist, &error, curl); - g_assert_no_error(error); + g_assert_no_error(error); - g_object_unref(imagelist); - tmp = tmp->next; - } + g_object_unref(imagelist); curl_easy_cleanup(curl); - - g_list_free(osel); - if (oslist) - g_object_unref(oslist); - - g_object_unref(loader); } @@ -122,12 +101,15 @@ int main(int argc, char *argv[]) { int ret; + OsinfoLoader *loader = osinfo_loader_new(); + OsinfoDb *db = osinfo_loader_get_db(loader); + OsinfoOsList *oslist = NULL; + GList *osel = NULL, *tmp; + GError *error = NULL; g_test_init(&argc, &argv, NULL); g_test_set_nonfatal_assertions(); - g_test_add_func("/imageuris/uris", test_uris); - if (!g_getenv("LIBOSINFO_NETWORK_TESTS")) return 77; /* Skip */ @@ -139,8 +121,30 @@ main(int argc, char *argv[]) osinfo_oslist_get_type(); osinfo_filter_get_type(); + osinfo_loader_process_default_path(loader, &error); + g_assert_no_error(error); + + oslist = osinfo_db_get_os_list(db); + tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); + while (tmp) { + OsinfoOs *os = tmp->data; + gchar *name = g_strdup_printf("/imageuris/uris/%s", + osinfo_product_get_short_id(OSINFO_PRODUCT(os))); + + g_test_add_data_func(name, os, test_uris); + g_free(name); + + tmp = tmp->next; + } + ret = g_test_run(); + g_list_free(osel); + if (oslist) + g_object_unref(oslist); + + g_object_unref(loader); + curl_global_cleanup(); return ret; diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c index 220dfb8..c5cde0d 100644 --- a/tests/test-mediauris.c +++ b/tests/test-mediauris.c @@ -64,14 +64,11 @@ static void test_media(OsinfoMediaList *medialist, GError **error, CURL *curl) } static void -test_uris(void) +test_uris(gconstpointer data) { + OsinfoOs *os = OSINFO_OS(data); CURL *curl; - OsinfoLoader *loader = osinfo_loader_new(); - OsinfoDb *db = osinfo_loader_get_db(loader); GError *error = NULL; - OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; const gchar *debugstr; curl = curl_easy_init(); @@ -87,33 +84,15 @@ test_uris(void) curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); } - g_assert_true(OSINFO_IS_LOADER(loader)); - g_assert_true(OSINFO_IS_DB(db)); - - osinfo_loader_process_default_path(loader, &error); - g_assert_no_error(error); - - oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - OsinfoMediaList *medialist = osinfo_os_get_media_list(os); + OsinfoMediaList *medialist = osinfo_os_get_media_list(os); - test_media(medialist, &error, curl); + test_media(medialist, &error, curl); - g_assert_no_error(error); + g_assert_no_error(error); - g_object_unref(medialist); - tmp = tmp->next; - } + g_object_unref(medialist); curl_easy_cleanup(curl); - - g_list_free(osel); - if (oslist) - g_object_unref(oslist); - - g_object_unref(loader); } @@ -122,12 +101,15 @@ int main(int argc, char *argv[]) { int ret; + OsinfoLoader *loader = osinfo_loader_new(); + OsinfoDb *db = osinfo_loader_get_db(loader); + OsinfoOsList *oslist = NULL; + GList *osel = NULL, *tmp; + GError *error = NULL; g_test_init(&argc, &argv, NULL); g_test_set_nonfatal_assertions(); - g_test_add_func("/mediauris/uris", test_uris); - if (!g_getenv("LIBOSINFO_NETWORK_TESTS")) return 77; /* Skip */ @@ -144,8 +126,31 @@ main(int argc, char *argv[]) osinfo_oslist_get_type(); osinfo_filter_get_type(); + + osinfo_loader_process_default_path(loader, &error); + g_assert_no_error(error); + + oslist = osinfo_db_get_os_list(db); + tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); + while (tmp) { + OsinfoOs *os = tmp->data; + gchar *name = g_strdup_printf("/mediauris/uris/%s", + osinfo_product_get_short_id(OSINFO_PRODUCT(os))); + + g_test_add_data_func(name, os, test_uris); + g_free(name); + + tmp = tmp->next; + } + ret = g_test_run(); + g_list_free(osel); + if (oslist) + g_object_unref(oslist); + + g_object_unref(loader); + curl_global_cleanup(); return ret; diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c index 26c949b..547696b 100644 --- a/tests/test-treeuris.c +++ b/tests/test-treeuris.c @@ -64,14 +64,11 @@ static void test_tree(OsinfoTreeList *treelist, GError **error, CURL *curl) } static void -test_uris(void) +test_uris(gconstpointer data) { + OsinfoOs *os = OSINFO_OS(data); CURL *curl; - OsinfoLoader *loader = osinfo_loader_new(); - OsinfoDb *db = osinfo_loader_get_db(loader); GError *error = NULL; - OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; const gchar *debugstr; curl = curl_easy_init(); @@ -87,33 +84,15 @@ test_uris(void) curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); } - g_assert_true(OSINFO_IS_LOADER(loader)); - g_assert_true(OSINFO_IS_DB(db)); - - osinfo_loader_process_default_path(loader, &error); - g_assert_no_error(error); - - oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - OsinfoTreeList *treelist = osinfo_os_get_tree_list(os); + OsinfoTreeList *treelist = osinfo_os_get_tree_list(os); - test_tree(treelist, &error, curl); + test_tree(treelist, &error, curl); - g_assert_no_error(error); + g_assert_no_error(error); - g_object_unref(treelist); - tmp = tmp->next; - } + g_object_unref(treelist); curl_easy_cleanup(curl); - - g_list_free(osel); - if (oslist) - g_object_unref(oslist); - - g_object_unref(loader); } @@ -122,12 +101,15 @@ int main(int argc, char *argv[]) { int ret; + OsinfoLoader *loader = osinfo_loader_new(); + OsinfoDb *db = osinfo_loader_get_db(loader); + OsinfoOsList *oslist = NULL; + GList *osel = NULL, *tmp; + GError *error = NULL; g_test_init(&argc, &argv, NULL); g_test_set_nonfatal_assertions(); - g_test_add_func("/treeuris/uris", test_uris); - if (!g_getenv("LIBOSINFO_NETWORK_TESTS")) return 77; /* Skip */ @@ -144,8 +126,30 @@ main(int argc, char *argv[]) osinfo_oslist_get_type(); osinfo_filter_get_type(); + osinfo_loader_process_default_path(loader, &error); + g_assert_no_error(error); + + oslist = osinfo_db_get_os_list(db); + tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); + while (tmp) { + OsinfoOs *os = tmp->data; + gchar *name = g_strdup_printf("/treeuris/uris/%s", + osinfo_product_get_short_id(OSINFO_PRODUCT(os))); + + g_test_add_data_func(name, os, test_uris); + g_free(name); + + tmp = tmp->next; + } + ret = g_test_run(); + g_list_free(osel); + if (oslist) + g_object_unref(oslist); + + g_object_unref(loader); + curl_global_cleanup(); return ret; -- 2.20.1 From fidencio at redhat.com Mon Feb 4 11:35:31 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 12:35:31 +0100 Subject: [Libosinfo] [PATCH] tests: add one test case per OS tested In-Reply-To: <20190204111808.32553-1-berrange@redhat.com> References: <20190204111808.32553-1-berrange@redhat.com> Message-ID: On Mon, Feb 4, 2019 at 12:18 PM Daniel P. Berrang? wrote: > > The image, media & tree URIs test suites just register one test case for > all the work they do. As a result when they run they just sit there > printing no progress information for a long time. > > This changes then to register one test case per OS in the database. As a > result we get progress information. An added benefit is that it is > possible to now run tests for individual OS by passing the -p argument. I would just add one more comment with an example of what -p takes as argument. Apart from that: Reviewed-by: Fabiano Fid?ncio [snip] From fidencio at redhat.com Mon Feb 4 11:36:03 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 12:36:03 +0100 Subject: [Libosinfo] [PATCH osinfo-db 0/5] Misc os data updates In-Reply-To: References: Message-ID: On Sun, Feb 3, 2019 at 11:52 PM Cole Robinson wrote: > > Upstream virt-install is now using libosinfo to lookup > kernel/initrd paths foReviewed-by: Fabiano Fid?ncio r iso media, alongside our own legacy > detection logic. In testing this my local test suite exposed > some missing data in osinfo-db. This series fixes some of > those issues Reviewed-by: Fabiano Fid?ncio [snip] From fidencio at redhat.com Mon Feb 4 11:36:27 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 12:36:27 +0100 Subject: [Libosinfo] [PATCH libosinfo] ubuntu: Add 19.04 ppc64el test data In-Reply-To: References: Message-ID: On Sun, Feb 3, 2019 at 11:52 PM Cole Robinson wrote: > > Signed-off-by: Cole Robinson Reviewed-by: Fabiano Fid?ncio [snip] From fidencio at redhat.com Mon Feb 4 12:00:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 13:00:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH] debian9: Update URL links to 9.7.0 Message-ID: <20190204120053.26760-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio --- data/os/debian.org/debian-9.xml.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in index 5ee944b..2c02a69 100644 --- a/data/os/debian.org/debian-9.xml.in +++ b/data/os/debian.org/debian-9.xml.in @@ -52,7 +52,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/i386/iso-cd/debian-9.6.0-i386-netinst.iso + http://cdimage.debian.org/cdimage/release/9.7.0/i386/iso-cd/debian-9.7.0-i386-netinst.iso Debian 9.(\d)+.(\d)+ i386 n @@ -61,7 +61,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/amd64/iso-cd/debian-9.6.0-amd64-netinst.iso + http://cdimage.debian.org/cdimage/release/9.7.0/amd64/iso-cd/debian-9.7.0-amd64-netinst.iso Debian 9.(\d)+.(\d)+ amd64 n @@ -70,7 +70,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/arm64/iso-cd/debian-9.6.0-arm64-netinst.iso + http://cdimage.debian.org/cdimage/release/9.7.0/arm64/iso-cd/debian-9.7.0-arm64-netinst.iso Debian 9.(\d)+.(\d)+ arm64 n @@ -79,7 +79,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/armhf/iso-cd/debian-9.6.0-armhf-netinst.iso + http://cdimage.debian.org/cdimage/release/9.7.0/armhf/iso-cd/debian-9.7.0-armhf-netinst.iso Debian 9.(\d)+.(\d)+ armhf n @@ -90,7 +90,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/i386/iso-dvd/debian-9.6.0-i386-DVD-1.iso + http://cdimage.debian.org/cdimage/release/9.7.0/i386/iso-dvd/debian-9.7.0-i386-DVD-1.iso Debian 9.(\d)+.(\d)+ i386 1 @@ -99,7 +99,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/amd64/iso-dvd/debian-9.6.0-amd64-DVD-1.iso + http://cdimage.debian.org/cdimage/release/9.7.0/amd64/iso-dvd/debian-9.7.0-amd64-DVD-1.iso Debian 9.(\d)+.(\d)+ amd64 1 @@ -108,7 +108,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/arm64/iso-dvd/debian-9.6.0-arm64-DVD-1.iso + http://cdimage.debian.org/cdimage/release/9.7.0/arm64/iso-dvd/debian-9.7.0-arm64-DVD-1.iso Debian 9.(\d)+.(\d)+ arm64 1 @@ -117,7 +117,7 @@ - http://cdimage.debian.org/cdimage/release/9.6.0/armhf/iso-dvd/debian-9.6.0-armhf-DVD-1.iso + http://cdimage.debian.org/cdimage/release/9.7.0/armhf/iso-dvd/debian-9.7.0-armhf-DVD-1.iso Debian 9.(\d)+.(\d)+ armhf 1 -- 2.20.1 From fidencio at redhat.com Mon Feb 4 13:44:25 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 14:44:25 +0100 Subject: [Libosinfo] [libosinfo PATCH 1/2] tests: Avoid re-using the curl handler on URIs tests Message-ID: <20190204134426.19704-1-fidencio@redhat.com> On CentOS, we've hit an issue that when a curl handler is re-used we end up receiving malfunctioning responses from NetBSD CDN. Dan investigated the issue and suggested that the problem may be a timing issue happening only in certain versions of libcurl (as it only hit us when testing on el7). The main difference of a working and a non-working system is that in the former when trying to re-use connection, we always get it's dead, and a new connection is opened; while in the latter sometimes the connection is detected as dead (but sometimes not), causing then the issue described above when the connection is not detected as dead. In order to work the issue around, let's no re-use the curl handler but always open a new one for each of the URIs. Signed-off-by: Fabiano Fid?ncio --- tests/test-imageuris.c | 37 ++++++++++++++++++------------------- tests/test-mediauris.c | 37 ++++++++++++++++++------------------- tests/test-treeuris.c | 38 ++++++++++++++++++-------------------- 3 files changed, 54 insertions(+), 58 deletions(-) diff --git a/tests/test-imageuris.c b/tests/test-imageuris.c index d58df02..4fb0675 100644 --- a/tests/test-imageuris.c +++ b/tests/test-imageuris.c @@ -24,7 +24,7 @@ #include #include -static void test_image(OsinfoImageList *imagelist, GError **error, CURL *curl) +static void test_image(OsinfoImageList *imagelist, GError **error) { GList *imageel = NULL, *tmp; @@ -32,6 +32,8 @@ static void test_image(OsinfoImageList *imagelist, GError **error, CURL *curl) while (tmp) { OsinfoImage *image = tmp->data; const gchar *url = osinfo_image_get_url(image); + const gchar *debugstr; + CURL *curl; CURLcode res; long response_code; @@ -40,6 +42,19 @@ static void test_image(OsinfoImageList *imagelist, GError **error, CURL *curl) continue; } + curl = curl_easy_init(); + curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + + if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { + int debug_level = atoi(debugstr); + + curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); + } + g_test_message("%s", url); curl_easy_setopt(curl, CURLOPT_URL, url); res = curl_easy_perform(curl); @@ -58,6 +73,7 @@ static void test_image(OsinfoImageList *imagelist, GError **error, CURL *curl) } tmp = tmp->next; + curl_easy_cleanup(curl); } g_list_free(imageel); @@ -67,32 +83,15 @@ static void test_uris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); - CURL *curl; GError *error = NULL; - const gchar *debugstr; - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } OsinfoImageList *imagelist = osinfo_os_get_image_list(os); - test_image(imagelist, &error, curl); + test_image(imagelist, &error); g_assert_no_error(error); g_object_unref(imagelist); - - curl_easy_cleanup(curl); } diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c index c5cde0d..6d7319c 100644 --- a/tests/test-mediauris.c +++ b/tests/test-mediauris.c @@ -24,7 +24,7 @@ #include #include -static void test_media(OsinfoMediaList *medialist, GError **error, CURL *curl) +static void test_media(OsinfoMediaList *medialist, GError **error) { GList *mediael = NULL, *tmp; @@ -32,6 +32,8 @@ static void test_media(OsinfoMediaList *medialist, GError **error, CURL *curl) while (tmp) { OsinfoMedia *media = tmp->data; const gchar *url = osinfo_media_get_url(media); + const gchar *debugstr; + CURL *curl; CURLcode res; long response_code; @@ -40,6 +42,19 @@ static void test_media(OsinfoMediaList *medialist, GError **error, CURL *curl) continue; } + curl = curl_easy_init(); + curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + + if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { + int debug_level = atoi(debugstr); + + curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); + } + g_test_message("%s", url); curl_easy_setopt(curl, CURLOPT_URL, url); res = curl_easy_perform(curl); @@ -58,6 +73,7 @@ static void test_media(OsinfoMediaList *medialist, GError **error, CURL *curl) } tmp = tmp->next; + curl_easy_cleanup(curl); } g_list_free(mediael); @@ -67,32 +83,15 @@ static void test_uris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); - CURL *curl; GError *error = NULL; - const gchar *debugstr; - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } OsinfoMediaList *medialist = osinfo_os_get_media_list(os); - test_media(medialist, &error, curl); + test_media(medialist, &error); g_assert_no_error(error); g_object_unref(medialist); - - curl_easy_cleanup(curl); } diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c index 547696b..42376d9 100644 --- a/tests/test-treeuris.c +++ b/tests/test-treeuris.c @@ -24,7 +24,7 @@ #include #include -static void test_tree(OsinfoTreeList *treelist, GError **error, CURL *curl) +static void test_tree(OsinfoTreeList *treelist, GError **error) { GList *treeel = NULL, *tmp; @@ -32,6 +32,8 @@ static void test_tree(OsinfoTreeList *treelist, GError **error, CURL *curl) while (tmp) { OsinfoTree *tree = tmp->data; const gchar *url = osinfo_tree_get_url(tree); + const gchar *debugstr; + CURL *curl; CURLcode res; long response_code; @@ -40,6 +42,19 @@ static void test_tree(OsinfoTreeList *treelist, GError **error, CURL *curl) continue; } + curl = curl_easy_init(); + curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + + if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { + int debug_level = atoi(debugstr); + + curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); + } + g_test_message("%s", url); curl_easy_setopt(curl, CURLOPT_URL, url); res = curl_easy_perform(curl); @@ -58,6 +73,7 @@ static void test_tree(OsinfoTreeList *treelist, GError **error, CURL *curl) } tmp = tmp->next; + curl_easy_cleanup(curl); } g_list_free(treeel); @@ -67,32 +83,14 @@ static void test_uris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); - CURL *curl; GError *error = NULL; - const gchar *debugstr; - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } - OsinfoTreeList *treelist = osinfo_os_get_tree_list(os); - test_tree(treelist, &error, curl); + test_tree(treelist, &error); g_assert_no_error(error); g_object_unref(treelist); - - curl_easy_cleanup(curl); } -- 2.20.1 From fidencio at redhat.com Mon Feb 4 13:44:26 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 14:44:26 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/2] tests: abort() in case curl misbehaves In-Reply-To: <20190204134426.19704-1-fidencio@redhat.com> References: <20190204134426.19704-1-fidencio@redhat.com> Message-ID: <20190204134426.19704-2-fidencio@redhat.com> Although the issue with curl should be fixed by the previous commit, let's abort in case it misbehaves, avoiding then to have all the data printed on stdout. Signed-off-by: Fabiano Fid?ncio --- tests/test-imageuris.c | 9 +++++++++ tests/test-mediauris.c | 9 +++++++++ tests/test-treeuris.c | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/tests/test-imageuris.c b/tests/test-imageuris.c index 4fb0675..33fdc19 100644 --- a/tests/test-imageuris.c +++ b/tests/test-imageuris.c @@ -24,6 +24,14 @@ #include #include +static size_t write_callback(char *ptr, + size_t size, + size_t nmemb, + void *userdata) +{ + abort(); +} + static void test_image(OsinfoImageList *imagelist, GError **error) { GList *imageel = NULL, *tmp; @@ -48,6 +56,7 @@ static void test_image(OsinfoImageList *imagelist, GError **error) curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { int debug_level = atoi(debugstr); diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c index 6d7319c..e35f152 100644 --- a/tests/test-mediauris.c +++ b/tests/test-mediauris.c @@ -24,6 +24,14 @@ #include #include +static size_t write_callback(char *ptr, + size_t size, + size_t nmemb, + void *userdata) +{ + abort(); +} + static void test_media(OsinfoMediaList *medialist, GError **error) { GList *mediael = NULL, *tmp; @@ -48,6 +56,7 @@ static void test_media(OsinfoMediaList *medialist, GError **error) curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { int debug_level = atoi(debugstr); diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c index 42376d9..76ab862 100644 --- a/tests/test-treeuris.c +++ b/tests/test-treeuris.c @@ -24,6 +24,14 @@ #include #include +static size_t write_callback(char *ptr, + size_t size, + size_t nmemb, + void *userdata) +{ + abort(); +} + static void test_tree(OsinfoTreeList *treelist, GError **error) { GList *treeel = NULL, *tmp; @@ -48,6 +56,7 @@ static void test_tree(OsinfoTreeList *treelist, GError **error) curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { int debug_level = atoi(debugstr); -- 2.20.1 From berrange at redhat.com Mon Feb 4 13:50:28 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 4 Feb 2019 13:50:28 +0000 Subject: [Libosinfo] [libosinfo PATCH 1/2] tests: Avoid re-using the curl handler on URIs tests In-Reply-To: <20190204134426.19704-1-fidencio@redhat.com> References: <20190204134426.19704-1-fidencio@redhat.com> Message-ID: <20190204135028.GL1905@redhat.com> On Mon, Feb 04, 2019 at 02:44:25PM +0100, Fabiano Fid?ncio wrote: > On CentOS, we've hit an issue that when a curl handler is re-used we end > up receiving malfunctioning responses from NetBSD CDN. > > Dan investigated the issue and suggested that the problem may be a > timing issue happening only in certain versions of libcurl (as it only > hit us when testing on el7). The HTTP spec says "A response to a HEAD method should not have a body. If so, it must be ignored." the problem is that libcurl in centos7 at least is not ignoring the body.... Sometimes it closes the keepalive connetion so this doesn't matter, but other times it gives us back the body that it should be ignoring. Anyway, closing the connection is a robust solution > > The main difference of a working and a non-working system is that in the > former when trying to re-use connection, we always get it's dead, and a new > connection is opened; while in the latter sometimes the connection is > detected as dead (but sometimes not), causing then the issue described > above when the connection is not detected as dead. > > In order to work the issue around, let's no re-use the curl handler but > always open a new one for each of the URIs. > > Signed-off-by: Fabiano Fid?ncio > --- > tests/test-imageuris.c | 37 ++++++++++++++++++------------------- > tests/test-mediauris.c | 37 ++++++++++++++++++------------------- > tests/test-treeuris.c | 38 ++++++++++++++++++-------------------- > 3 files changed, 54 insertions(+), 58 deletions(-) Reviewed-by: Daniel P. Berrang? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From berrange at redhat.com Mon Feb 4 13:51:55 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 4 Feb 2019 13:51:55 +0000 Subject: [Libosinfo] [libosinfo PATCH 2/2] tests: abort() in case curl misbehaves In-Reply-To: <20190204134426.19704-2-fidencio@redhat.com> References: <20190204134426.19704-1-fidencio@redhat.com> <20190204134426.19704-2-fidencio@redhat.com> Message-ID: <20190204135155.GM1905@redhat.com> On Mon, Feb 04, 2019 at 02:44:26PM +0100, Fabiano Fid?ncio wrote: > Although the issue with curl should be fixed by the previous commit, > let's abort in case it misbehaves, avoiding then to have all the data > printed on stdout. > > Signed-off-by: Fabiano Fid?ncio > --- > tests/test-imageuris.c | 9 +++++++++ > tests/test-mediauris.c | 9 +++++++++ > tests/test-treeuris.c | 9 +++++++++ > 3 files changed, 27 insertions(+) Reviewed-by: Daniel P. Berrang? There's probably a case to be made for merging these three tests into one test file as they duplicate 90% of each others code. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From fidencio at redhat.com Mon Feb 4 14:17:06 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 15:17:06 +0100 Subject: [Libosinfo] [osinfo-db PATCH] debian9: Update URL links to 9.7.0 In-Reply-To: <20190204120053.26760-1-fidencio@redhat.com> References: <20190204120053.26760-1-fidencio@redhat.com> Message-ID: On Mon, Feb 4, 2019 at 1:01 PM Fabiano Fid?ncio wrote: > > Signed-off-by: Fabiano Fid?ncio This one has been pushed under test breakage rule. From crobinso at redhat.com Mon Feb 4 14:32:08 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 4 Feb 2019 09:32:08 -0500 Subject: [Libosinfo] [osinfo-db PATCH] debian9: Update URL links to 9.7.0 In-Reply-To: <20190204120053.26760-1-fidencio@redhat.com> References: <20190204120053.26760-1-fidencio@redhat.com> Message-ID: <5de281fd-09d7-7fb2-fea8-ed98b1bda9c6@redhat.com> On 2/4/19 7:00 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio > --- > data/os/debian.org/debian-9.xml.in | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: Cole Robinson - Cole From fabiano at fidencio.org Mon Feb 4 15:42:56 2019 From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 4 Feb 2019 16:42:56 +0100 Subject: [Libosinfo] [libosinfo PATCH] tests: Reduce code duplication in URI tests Message-ID: <1549294976-30648-1-git-send-email-fabiano@fidencio.org> From: Fabiano Fid?ncio Let's introduce a common file that does the check of the URI for all the URI related tests. By doing this we can avoid code duplication while also avoiding to have all the tests merged together into a single one, which is not so good as limits the developer to run and wait for the whole set of tests instead of having the ability to just run the a specific one. Signed-off-by: Fabiano Fid?ncio --- tests/Makefile.am | 6 +-- tests/test-imageuris.c | 84 ++---------------------------------- tests/test-mediauris.c | 84 ++---------------------------------- tests/test-treeuris.c | 84 ++---------------------------------- tests/test-uris-common.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test-uris-common.h | 26 +++++++++++ 6 files changed, 151 insertions(+), 243 deletions(-) create mode 100644 tests/test-uris-common.c create mode 100644 tests/test-uris-common.h diff --git a/tests/Makefile.am b/tests/Makefile.am index 45703df..f073b41 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -113,15 +113,15 @@ test_isodetect_SOURCES = test-isodetect.c if HAVE_CURL test_mediauris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_mediauris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_mediauris_SOURCES = test-mediauris.c +test_mediauris_SOURCES = test-mediauris.c test-uris-common.c test_treeuris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_treeuris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_treeuris_SOURCES = test-treeuris.c +test_treeuris_SOURCES = test-treeuris.c test-uris-common.c test_imageuris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_imageuris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_imageuris_SOURCES = test-imageuris.c +test_imageuris_SOURCES = test-imageuris.c test-uris-common.c endif test_install_script_LDADD = $(COMMON_LDADD) diff --git a/tests/test-imageuris.c b/tests/test-imageuris.c index 33fdc19..ca6e648 100644 --- a/tests/test-imageuris.c +++ b/tests/test-imageuris.c @@ -24,87 +24,23 @@ #include #include -static size_t write_callback(char *ptr, - size_t size, - size_t nmemb, - void *userdata) -{ - abort(); -} - -static void test_image(OsinfoImageList *imagelist, GError **error) -{ - GList *imageel = NULL, *tmp; - - tmp = imageel = osinfo_list_get_elements(OSINFO_LIST(imagelist)); - while (tmp) { - OsinfoImage *image = tmp->data; - const gchar *url = osinfo_image_get_url(image); - const gchar *debugstr; - CURL *curl; - CURLcode res; - long response_code; - - if (url == NULL || g_str_equal(url, "")) { - tmp = tmp->next; - continue; - } - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } - - g_test_message("%s", url); - curl_easy_setopt(curl, CURLOPT_URL, url); - res = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); - - g_test_message("res=%d, %s; code=%ld", res, curl_easy_strerror(res), response_code); - - if (res == CURLE_OPERATION_TIMEDOUT) { - g_printerr("Ignoring network timeout failure for %s\n", url); - } else { - if (res != CURLE_OK) { - g_printerr("Failed URI %s res=%d (%s) code=%ld\n", - url, res, curl_easy_strerror(res), response_code); - } - g_assert_cmpint(res, ==, CURLE_OK); - } - - tmp = tmp->next; - curl_easy_cleanup(curl); - } - - g_list_free(imageel); -} +#include "test-uris-common.h" static void -test_uris(gconstpointer data) +test_imageuris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); GError *error = NULL; OsinfoImageList *imagelist = osinfo_os_get_image_list(os); - test_image(imagelist, &error); + test_uri(OSINFO_LIST(imagelist), (GetURLFunc) osinfo_image_get_url, &error); g_assert_no_error(error); g_object_unref(imagelist); } - - int main(int argc, char *argv[]) { @@ -112,7 +48,6 @@ main(int argc, char *argv[]) OsinfoLoader *loader = osinfo_loader_new(); OsinfoDb *db = osinfo_loader_get_db(loader); OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; GError *error = NULL; g_test_init(&argc, &argv, NULL); @@ -133,21 +68,10 @@ main(int argc, char *argv[]) g_assert_no_error(error); oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - gchar *name = g_strdup_printf("/imageuris/uris/%s", - osinfo_product_get_short_id(OSINFO_PRODUCT(os))); - - g_test_add_data_func(name, os, test_uris); - g_free(name); - - tmp = tmp->next; - } + test_uris(oslist, "/imageuris/uris", test_imageuris); ret = g_test_run(); - g_list_free(osel); if (oslist) g_object_unref(oslist); diff --git a/tests/test-mediauris.c b/tests/test-mediauris.c index e35f152..c9e09c7 100644 --- a/tests/test-mediauris.c +++ b/tests/test-mediauris.c @@ -24,87 +24,23 @@ #include #include -static size_t write_callback(char *ptr, - size_t size, - size_t nmemb, - void *userdata) -{ - abort(); -} - -static void test_media(OsinfoMediaList *medialist, GError **error) -{ - GList *mediael = NULL, *tmp; - - tmp = mediael = osinfo_list_get_elements(OSINFO_LIST(medialist)); - while (tmp) { - OsinfoMedia *media = tmp->data; - const gchar *url = osinfo_media_get_url(media); - const gchar *debugstr; - CURL *curl; - CURLcode res; - long response_code; - - if (url == NULL || g_str_equal(url, "")) { - tmp = tmp->next; - continue; - } - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } - - g_test_message("%s", url); - curl_easy_setopt(curl, CURLOPT_URL, url); - res = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); - - g_test_message("res=%d, %s; code=%ld", res, curl_easy_strerror(res), response_code); - - if (res == CURLE_OPERATION_TIMEDOUT) { - g_printerr("Ignoring network timeout failure for %s\n", url); - } else { - if (res != CURLE_OK) { - g_printerr("Failed URI %s res=%d (%s) code=%ld\n", - url, res, curl_easy_strerror(res), response_code); - } - g_assert_cmpint(res, ==, CURLE_OK); - } - - tmp = tmp->next; - curl_easy_cleanup(curl); - } - - g_list_free(mediael); -} +#include "test-uris-common.h" static void -test_uris(gconstpointer data) +test_mediauris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); GError *error = NULL; OsinfoMediaList *medialist = osinfo_os_get_media_list(os); - test_media(medialist, &error); + test_uri(OSINFO_LIST(medialist), (GetURLFunc) osinfo_media_get_url, &error); g_assert_no_error(error); g_object_unref(medialist); } - - int main(int argc, char *argv[]) { @@ -112,7 +48,6 @@ main(int argc, char *argv[]) OsinfoLoader *loader = osinfo_loader_new(); OsinfoDb *db = osinfo_loader_get_db(loader); OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; GError *error = NULL; g_test_init(&argc, &argv, NULL); @@ -139,21 +74,10 @@ main(int argc, char *argv[]) g_assert_no_error(error); oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - gchar *name = g_strdup_printf("/mediauris/uris/%s", - osinfo_product_get_short_id(OSINFO_PRODUCT(os))); - - g_test_add_data_func(name, os, test_uris); - g_free(name); - - tmp = tmp->next; - } + test_uris(oslist, "/mediauris/uris", test_mediauris); ret = g_test_run(); - g_list_free(osel); if (oslist) g_object_unref(oslist); diff --git a/tests/test-treeuris.c b/tests/test-treeuris.c index 76ab862..48ce82a 100644 --- a/tests/test-treeuris.c +++ b/tests/test-treeuris.c @@ -24,86 +24,22 @@ #include #include -static size_t write_callback(char *ptr, - size_t size, - size_t nmemb, - void *userdata) -{ - abort(); -} - -static void test_tree(OsinfoTreeList *treelist, GError **error) -{ - GList *treeel = NULL, *tmp; - - tmp = treeel = osinfo_list_get_elements(OSINFO_LIST(treelist)); - while (tmp) { - OsinfoTree *tree = tmp->data; - const gchar *url = osinfo_tree_get_url(tree); - const gchar *debugstr; - CURL *curl; - CURLcode res; - long response_code; - - if (url == NULL || g_str_equal(url, "")) { - tmp = tmp->next; - continue; - } - - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); - curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); - - if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { - int debug_level = atoi(debugstr); - - curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); - } - - g_test_message("%s", url); - curl_easy_setopt(curl, CURLOPT_URL, url); - res = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); - - g_test_message("res=%d, %s; code=%ld", res, curl_easy_strerror(res), response_code); - - if (res == CURLE_OPERATION_TIMEDOUT) { - g_printerr("Ignoring network timeout failure for %s\n", url); - } else { - if (res != CURLE_OK) { - g_printerr("Failed URI %s res=%d (%s) code=%ld\n", - url, res, curl_easy_strerror(res), response_code); - } - g_assert_cmpint(res, ==, CURLE_OK); - } - - tmp = tmp->next; - curl_easy_cleanup(curl); - } - - g_list_free(treeel); -} +#include "test-uris-common.h" static void -test_uris(gconstpointer data) +test_treeuris(gconstpointer data) { OsinfoOs *os = OSINFO_OS(data); GError *error = NULL; OsinfoTreeList *treelist = osinfo_os_get_tree_list(os); - test_tree(treelist, &error); + test_uri(OSINFO_LIST(treelist), (GetURLFunc) osinfo_tree_get_url, &error); g_assert_no_error(error); g_object_unref(treelist); } - - int main(int argc, char *argv[]) { @@ -111,7 +47,6 @@ main(int argc, char *argv[]) OsinfoLoader *loader = osinfo_loader_new(); OsinfoDb *db = osinfo_loader_get_db(loader); OsinfoOsList *oslist = NULL; - GList *osel = NULL, *tmp; GError *error = NULL; g_test_init(&argc, &argv, NULL); @@ -137,21 +72,10 @@ main(int argc, char *argv[]) g_assert_no_error(error); oslist = osinfo_db_get_os_list(db); - tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); - while (tmp) { - OsinfoOs *os = tmp->data; - gchar *name = g_strdup_printf("/treeuris/uris/%s", - osinfo_product_get_short_id(OSINFO_PRODUCT(os))); - - g_test_add_data_func(name, os, test_uris); - g_free(name); - - tmp = tmp->next; - } + test_uris(oslist, "/treeuris/uris", test_treeuris); ret = g_test_run(); - g_list_free(osel); if (oslist) g_object_unref(oslist); diff --git a/tests/test-uris-common.c b/tests/test-uris-common.c new file mode 100644 index 0000000..0352ce1 --- /dev/null +++ b/tests/test-uris-common.c @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2019 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see + */ + +#include + +#include +#include +#include + +#include "test-uris-common.h" + +static size_t write_callback(char *ptr, + size_t size, + size_t nmemb, + void *userdata) +{ + abort(); +} + +void test_uri(OsinfoList *list, GetURLFunc get_url_func, GError **error) +{ + GList *el = NULL, *tmp; + + tmp = el = osinfo_list_get_elements(list); + while (tmp) { + const gchar *url = get_url_func(tmp->data); + const gchar *debugstr; + CURL *curl; + CURLcode res; + long response_code; + + if (url == NULL || g_str_equal(url, "")) { + tmp = tmp->next; + continue; + } + + curl = curl_easy_init(); + curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, 60L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); + + if ((debugstr = g_getenv("LIBOSINFO_TEST_DEBUG"))) { + int debug_level = atoi(debugstr); + + curl_easy_setopt(curl, CURLOPT_VERBOSE, debug_level > 0 ? 1L : 0L); + } + + g_test_message("%s", url); + curl_easy_setopt(curl, CURLOPT_URL, url); + res = curl_easy_perform(curl); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); + + g_test_message("res=%d, %s; code=%ld", res, curl_easy_strerror(res), response_code); + + if (res == CURLE_OPERATION_TIMEDOUT) { + g_printerr("Ignoring network timeout failure for %s\n", url); + } else { + if (res != CURLE_OK) { + g_printerr("Failed URI %s res=%d (%s) code=%ld\n", + url, res, curl_easy_strerror(res), response_code); + } + g_assert_cmpint(res, ==, CURLE_OK); + } + + tmp = tmp->next; + curl_easy_cleanup(curl); + } + + g_list_free(el); +} + + +void test_uris(OsinfoOsList *oslist, const gchar *prefix, TestURLFunc test_func) +{ + GList *osel = NULL, *tmp; + + tmp = osel = osinfo_list_get_elements(OSINFO_LIST(oslist)); + + while (tmp) { + OsinfoOs *os = tmp->data; + gchar *name = g_strdup_printf("%s/%s", + prefix, + osinfo_product_get_short_id(OSINFO_PRODUCT(os))); + + g_test_add_data_func(name, os, test_func); + g_free(name); + + tmp = tmp->next; + } + + g_list_free(osel); +} + diff --git a/tests/test-uris-common.h b/tests/test-uris-common.h new file mode 100644 index 0000000..34cc242 --- /dev/null +++ b/tests/test-uris-common.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2019 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see + */ + +#include + +#include + +typedef const gchar *(*GetURLFunc)(gpointer p); +typedef void (*TestURLFunc)(gconstpointer p); + +void test_uri(OsinfoList *list, GetURLFunc get_url_func, GError **error); +void test_uris(OsinfoOsList *oslist, const gchar *prefix, TestURLFunc test_func); -- 1.8.3.1 From fidencio at redhat.com Tue Feb 5 19:40:33 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 5 Feb 2019 20:40:33 +0100 Subject: [Libosinfo] [osinfo-db PATCH 0/3] Fixes for Windows JeOS installations Message-ID: <20190205194036.23797-1-fidencio@redhat.com> Those fixes are needed in order to perform an JeOS installation of a Windows ISO. Fabiano Fid?ncio (3): windows,unattend: Fix "arch" template windows,unattend: Set password as plain text windows,unattend: Fix group name .../microsoft.com/windows-unattend-jeos.xml.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.20.1 From fidencio at redhat.com Tue Feb 5 19:40:34 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 5 Feb 2019 20:40:34 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/3] windows, unattend: Fix "arch" template In-Reply-To: <20190205194036.23797-1-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> Message-ID: <20190205194036.23797-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio --- .../microsoft.com/windows-unattend-jeos.xml.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in index 3fd90e5..f738b86 100644 --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in @@ -40,8 +40,11 @@ - - + + amd64 + + + x86 x86 -- 2.20.1 From fidencio at redhat.com Tue Feb 5 19:40:35 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 5 Feb 2019 20:40:35 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/3] windows, unattend: Set password as plain text In-Reply-To: <20190205194036.23797-1-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> Message-ID: <20190205194036.23797-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio --- data/install-script/microsoft.com/windows-unattend-jeos.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in index f738b86..27acc7f 100644 --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in @@ -171,7 +171,7 @@ - false</PlainText> + <PlainText>true</PlainText> </Password> <Name><xsl:value-of select="config/user-login"/></Name> <DisplayName><xsl:value-of select="config/user-realname"/></DisplayName> -- 2.20.1 From fidencio at redhat.com Tue Feb 5 19:40:36 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 5 Feb 2019 20:40:36 +0100 Subject: [Libosinfo] [osinfo-db PATCH 3/3] windows, unattend: Fix group name In-Reply-To: <20190205194036.23797-1-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> Message-ID: <20190205194036.23797-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/microsoft.com/windows-unattend-jeos.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in index 27acc7f..11c5868 100644 --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in @@ -175,7 +175,7 @@ </Password> <Name><xsl:value-of select="config/user-login"/></Name> <DisplayName><xsl:value-of select="config/user-realname"/></DisplayName> - <Group>users</Group> + <Group>Users</Group> </LocalAccount> </LocalAccounts> </xsl:if> -- 2.20.1 From berrange at redhat.com Wed Feb 6 09:13:00 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Wed, 6 Feb 2019 09:13:00 +0000 Subject: [Libosinfo] [osinfo-db PATCH 2/3] windows, unattend: Set password as plain text In-Reply-To: <20190205194036.23797-3-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> <20190205194036.23797-3-fidencio@redhat.com> Message-ID: <20190206091300.GC12331@redhat.com> On Tue, Feb 05, 2019 at 08:40:35PM +0100, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/install-script/microsoft.com/windows-unattend-jeos.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > index f738b86..27acc7f 100644 > --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > @@ -171,7 +171,7 @@ > <LocalAccount wcm:action="add"> > <Password> > <Value><xsl:value-of select="config/user-password"/></Value> > - <PlainText>false</PlainText> > + <PlainText>true</PlainText> Surely this is going to break existing applications that are using this template & passing an already encrypted password. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From fidencio at redhat.com Wed Feb 6 11:40:32 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Wed, 6 Feb 2019 12:40:32 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/3] windows, unattend: Set password as plain text In-Reply-To: <20190206091300.GC12331@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> <20190205194036.23797-3-fidencio@redhat.com> <20190206091300.GC12331@redhat.com> Message-ID: <CAAY6Xsf0fKdmm5Uim0HOkiOcHLDKChVJh62JVf=tU3z1CBd_BA@mail.gmail.com> On Wed, Feb 6, 2019 at 10:13 AM Daniel P. Berrang? <berrange at redhat.com> wrote: > > On Tue, Feb 05, 2019 at 08:40:35PM +0100, Fabiano Fid?ncio wrote: > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > data/install-script/microsoft.com/windows-unattend-jeos.xml.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > index f738b86..27acc7f 100644 > > --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > @@ -171,7 +171,7 @@ > > <LocalAccount wcm:action="add"> > > <Password> > > <Value><xsl:value-of select="config/user-password"/></Value> > > - <PlainText>false</PlainText> > > + <PlainText>true</PlainText> > > Surely this is going to break existing applications that are using > this template & passing an already encrypted password. Yep, but keep in mind that there's no existing applications using this template. Boxes doesn't use JeOS at all and support for virt-install is something that I'm working on right now (and thus, having those bits tested). So, what to do? > > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From berrange at redhat.com Wed Feb 6 11:43:43 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Wed, 6 Feb 2019 11:43:43 +0000 Subject: [Libosinfo] [osinfo-db PATCH 2/3] windows, unattend: Set password as plain text In-Reply-To: <CAAY6Xsf0fKdmm5Uim0HOkiOcHLDKChVJh62JVf=tU3z1CBd_BA@mail.gmail.com> References: <20190205194036.23797-1-fidencio@redhat.com> <20190205194036.23797-3-fidencio@redhat.com> <20190206091300.GC12331@redhat.com> <CAAY6Xsf0fKdmm5Uim0HOkiOcHLDKChVJh62JVf=tU3z1CBd_BA@mail.gmail.com> Message-ID: <20190206114343.GG12331@redhat.com> On Wed, Feb 06, 2019 at 12:40:32PM +0100, Fabiano Fid?ncio wrote: > On Wed, Feb 6, 2019 at 10:13 AM Daniel P. Berrang? <berrange at redhat.com> wrote: > > > > On Tue, Feb 05, 2019 at 08:40:35PM +0100, Fabiano Fid?ncio wrote: > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > > --- > > > data/install-script/microsoft.com/windows-unattend-jeos.xml.in | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > > index f738b86..27acc7f 100644 > > > --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > > +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > > > @@ -171,7 +171,7 @@ > > > <LocalAccount wcm:action="add"> > > > <Password> > > > <Value><xsl:value-of select="config/user-password"/></Value> > > > - <PlainText>false</PlainText> > > > + <PlainText>true</PlainText> > > > > Surely this is going to break existing applications that are using > > this template & passing an already encrypted password. > > Yep, but keep in mind that there's no existing applications using this > template. Boxes doesn't use JeOS at all and support for virt-install > is something that I'm working on right now (and thus, having those > bits tested). Ah I missed that. I also see this is the outlier - all the other cases of <PlainText>..</PlainText> are already set to true. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From fidencio at redhat.com Wed Feb 6 15:54:06 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 6 Feb 2019 16:54:06 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/3] schema: Add installer to the media Message-ID: <20190206155408.4324-1-fidencio@redhat.com> Having the instsaller tied to the OS is something that has been shown not optimal, unfortunately. An OS may have a few different medias and each media may support a specific type of script or, even, not support an installer script at all. With this in mind, let's have the installer scripts tied to the medias themselves. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/schema/osinfo.rng.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in index 5e6f5e7..6fc03a1 100644 --- a/data/schema/osinfo.rng.in +++ b/data/schema/osinfo.rng.in @@ -412,6 +412,11 @@ <text/> </element> </optional> + <optional> + <zeroOrMore> + <ref name='installer'/> + </zeroOrMore> + </optional> </interleave> </element> </define> -- 2.20.1 From fidencio at redhat.com Wed Feb 6 15:54:07 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 6 Feb 2019 16:54:07 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/3] media: Add installer to the media In-Reply-To: <20190206155408.4324-1-fidencio@redhat.com> References: <20190206155408.4324-1-fidencio@redhat.com> Message-ID: <20190206155408.4324-2-fidencio@redhat.com> Having the installer tied to the OS is something that has been shown not optimal, unfortunately. An OS may have a few different medias and each media may support a specific type of script or, even, not support an installer script at all. With this in mind, let's have the installer scripts tied to the medias themselves. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- osinfo/libosinfo.syms | 5 +++++ osinfo/osinfo_loader.c | 26 ++++++++++++++++++++++++++ osinfo/osinfo_media.c | 36 ++++++++++++++++++++++++++++++++++++ osinfo/osinfo_media.h | 2 ++ 4 files changed, 69 insertions(+) diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms index 2a60689..dad0c3b 100644 --- a/osinfo/libosinfo.syms +++ b/osinfo/libosinfo.syms @@ -562,6 +562,11 @@ LIBOSINFO_1.3.0 { osinfo_tree_has_treeinfo; } LIBOSINFO_0.2.13; +LIBOSINFO_1.4.0 { + osinfo_media_add_install_script; + osinfo_media_get_install_script_list; +} LIBOSINFO_1.3.0; + /* Symbols in next release... LIBOSINFO_0.0.2 { diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index a6f111c..95d4424 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1192,6 +1192,32 @@ static OsinfoMedia *osinfo_loader_media(OsinfoLoader *loader, g_free(nodes); + nnodes = osinfo_loader_nodeset("./installer/script", loader, ctxt, &nodes, + err); + if (error_is_set(err)) { + g_object_unref(media); + return NULL; + } + + for (i = 0; i < nnodes; i++) { + OsinfoInstallScript *script; + gchar *scriptid; + + scriptid = (gchar *)xmlGetProp(nodes[i], BAD_CAST "id"); + if (scriptid == NULL) { + OSINFO_LOADER_SET_ERROR(err, _("Missing Media install script property")); + g_object_unref(media); + return NULL; + } + + script = osinfo_loader_get_install_script(loader, scriptid); + xmlFree(scriptid); + + osinfo_media_add_install_script(media, script); + } + + g_free(nodes); + return media; } diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 6bd1f66..6720736 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -193,6 +193,7 @@ G_DEFINE_TYPE(OsinfoMedia, osinfo_media, OSINFO_TYPE_ENTITY); struct _OsinfoMediaPrivate { GWeakRef os; + OsinfoInstallScriptList *scripts; }; enum { @@ -421,6 +422,10 @@ osinfo_media_set_property(GObject *object, static void osinfo_media_finalize(GObject *object) { + OsinfoMedia *media = OSINFO_MEDIA(object); + + g_object_unref(media->priv->scripts); + /* Chain up to the parent class */ G_OBJECT_CLASS(osinfo_media_parent_class)->finalize(object); } @@ -694,6 +699,7 @@ osinfo_media_init(OsinfoMedia *media) { media->priv = OSINFO_MEDIA_GET_PRIVATE(media); g_weak_ref_init(&media->priv->os, NULL); + media->priv->scripts = osinfo_install_scriptlist_new(); } OsinfoMedia *osinfo_media_new(const gchar *id, @@ -1670,6 +1676,36 @@ gboolean osinfo_media_supports_installer_script(OsinfoMedia *media) return ret; } +/** + * osinfo_media_add_install_script: + * @media: an #OsinfoMedia instance + * @script: an #OsinfoInstallScript instance + * + * Adds an @script to the specified @media + */ +void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript *script) +{ + g_return_if_fail(OSINFO_IS_MEDIA(media)); + + osinfo_list_add(OSINFO_LIST(media->priv->scripts), OSINFO_ENTITY(script)); +} + +/** + * osinfo_media_get_install_script_list: + * @media: an #OsinfoMedia instance + * + * Returns: (transfer full): a list of the install scripts for the specified media + */ +OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia *media) +{ + OsinfoList *new_list; + + g_return_val_if_fail(OSINFO_IS_MEDIA(media), NULL); + new_list = osinfo_list_new_copy(OSINFO_LIST(media->priv->scripts)); + + return OSINFO_INSTALL_SCRIPTLIST(new_list); +} + /* * Local variables: * indent-tabs-mode: nil diff --git a/osinfo/osinfo_media.h b/osinfo/osinfo_media.h index 6adc4be..3cac587 100644 --- a/osinfo/osinfo_media.h +++ b/osinfo/osinfo_media.h @@ -145,6 +145,8 @@ gint osinfo_media_get_installer_reboots(OsinfoMedia *media); gint64 osinfo_media_get_volume_size(OsinfoMedia *media); gboolean osinfo_media_get_eject_after_install(OsinfoMedia *media); gboolean osinfo_media_supports_installer_script(OsinfoMedia *media); +void osinfo_media_add_install_script(OsinfoMedia *media, OsinfoInstallScript *install_script); +OsinfoInstallScriptList *osinfo_media_get_install_script_list(OsinfoMedia *media); #endif /* __OSINFO_MEDIA_H__ */ /* -- 2.20.1 From fidencio at redhat.com Wed Feb 6 15:54:08 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 6 Feb 2019 16:54:08 +0100 Subject: [Libosinfo] [libosinfo PATCH 3/3] test-media: Add test for media installer script In-Reply-To: <20190206155408.4324-1-fidencio@redhat.com> References: <20190206155408.4324-1-fidencio@redhat.com> Message-ID: <20190206155408.4324-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../test-os-media-installer-script.xml | 16 ++++++++++ tests/test-media.c | 32 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 tests/dbdata/os/libosinfo.org/test-os-media-installer-script.xml diff --git a/tests/dbdata/os/libosinfo.org/test-os-media-installer-script.xml b/tests/dbdata/os/libosinfo.org/test-os-media-installer-script.xml new file mode 100644 index 0000000..f6422ee --- /dev/null +++ b/tests/dbdata/os/libosinfo.org/test-os-media-installer-script.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<libosinfo version="0.0.1"> + <os id="http://libosinfo.org/test/os/media-installer-script"> + <short-id>media-no-installer</short-id> + <name>Media no installer</name> + <version>unknown</version> + <vendor>libosinfo.org</vendor> + <family>test</family> + + <media arch="x86_64"> + <installer> + <script id="http://example.com/libosinfo/test-install-script"/> + </installer> + </media> + </os> +</libosinfo> diff --git a/tests/test-media.c b/tests/test-media.c index bfa053f..e8bd702 100644 --- a/tests/test-media.c +++ b/tests/test-media.c @@ -110,6 +110,37 @@ test_loaded_no_installer(void) g_object_unref(loader); } +static void +test_loaded_installer_script(void) +{ + + OsinfoLoader *loader = osinfo_loader_new(); + OsinfoDb *db; + OsinfoOs *os; + OsinfoMedia *media; + OsinfoMediaList *list; + OsinfoInstallScriptList *scripts; + gint list_len; + GError *error = NULL; + + osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error); + g_assert_no_error(error); + db = osinfo_loader_get_db(loader); + + os = osinfo_db_get_os(db, "http://libosinfo.org/test/os/media-installer-script"); + + list = osinfo_os_get_media_list(os); + list_len = osinfo_list_get_length(OSINFO_LIST(list)); + g_assert_cmpint(list_len, ==, 1); + + media = OSINFO_MEDIA(osinfo_list_get_nth(OSINFO_LIST(list), 0)); + scripts = osinfo_media_get_install_script_list(media); + g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(scripts)), ==, 1); + + g_object_unref(scripts); + g_object_unref(list); + g_object_unref(loader); +} int main(int argc, char *argv[]) @@ -119,6 +150,7 @@ main(int argc, char *argv[]) g_test_add_func("/media/basic", test_basic); g_test_add_func("/media/loaded/attributes", test_loaded_attributes); g_test_add_func("/media/loaded/no-installer", test_loaded_no_installer); + g_test_add_func("/media/loaded/installer-script", test_loaded_installer_script); /* Upfront so we don't confuse valgrind */ osinfo_media_get_type(); -- 2.20.1 From fidencio at redhat.com Thu Feb 7 07:39:17 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 7 Feb 2019 08:39:17 +0100 Subject: [Libosinfo] [libosinfo PATCH] media: Make _supports_installer_sript() aware of media installers Message-ID: <20190207073917.16284-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- This has been written atop of https://www.redhat.com/archives/libosinfo/2019-February/msg00028.html --- osinfo/osinfo_media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 6720736..9f77504 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -1661,7 +1661,8 @@ gboolean osinfo_media_supports_installer_script(OsinfoMedia *media) os = osinfo_media_get_os(media); list = osinfo_os_get_install_script_list(os); - if (osinfo_list_get_length(OSINFO_LIST(list)) == 0) { + if (osinfo_list_get_length(OSINFO_LIST(list)) == 0 && + osinfo_list_get_length(OSINFO_LIST(media->priv->scripts)) == 0) { ret = FALSE; goto cleanup; } -- 2.20.1 From eblake at redhat.com Thu Feb 7 17:51:29 2019 From: eblake at redhat.com (Eric Blake) Date: Thu, 7 Feb 2019 11:51:29 -0600 Subject: [Libosinfo] [libosinfo PATCH] media: Make _supports_installer_sript() aware of media installers In-Reply-To: <20190207073917.16284-1-fidencio@redhat.com> References: <20190207073917.16284-1-fidencio@redhat.com> Message-ID: <61e630e1-5116-bcde-40d9-a156e2ea1813@redhat.com> On 2/7/19 1:39 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> s/sript/script/ in the subject > --- > This has been written atop of > https://www.redhat.com/archives/libosinfo/2019-February/msg00028.html > --- > osinfo/osinfo_media.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c > index 6720736..9f77504 100644 > --- a/osinfo/osinfo_media.c > +++ b/osinfo/osinfo_media.c > @@ -1661,7 +1661,8 @@ gboolean osinfo_media_supports_installer_script(OsinfoMedia *media) > os = osinfo_media_get_os(media); > list = osinfo_os_get_install_script_list(os); > > - if (osinfo_list_get_length(OSINFO_LIST(list)) == 0) { > + if (osinfo_list_get_length(OSINFO_LIST(list)) == 0 && > + osinfo_list_get_length(OSINFO_LIST(media->priv->scripts)) == 0) { > ret = FALSE; > goto cleanup; > } > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190207/20b120c3/attachment.sig> From fidencio at redhat.com Fri Feb 8 14:39:56 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Fri, 8 Feb 2019 15:39:56 +0100 Subject: [Libosinfo] [osinfo-db PATCH] ubuntu: Fix initrd path for 16.04, 18.10 and 19.04 Message-ID: <20190208143956.3552-1-fidencio@redhat.com> ubuntu desktop ISOs do not have their initrd file consistently named. For the majority of the releases their initrd is named as "initrd.lz" for some releases, as 16.04, 18.10 and, 19.04, the initrd is just named as "initrd". Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 4 ++-- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 3752ac4..c1c6dd4 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -52,7 +52,7 @@ <volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url> @@ -60,7 +60,7 @@ <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="ppc"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url> diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 0b1b975..e6fd9d2 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -55,7 +55,7 @@ <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 73c4c4e..b7fe87c 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -46,7 +46,7 @@ <volume-id>Ubuntu 19.04(.\d)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> -- 2.20.1 From fidencio at redhat.com Fri Feb 8 14:46:46 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Fri, 8 Feb 2019 15:46:46 +0100 Subject: [Libosinfo] [osinfo-db PATCH] ubuntu: Fix initrd path for 16.04, 18.10 and 19.04 In-Reply-To: <20190208143956.3552-1-fidencio@redhat.com> References: <20190208143956.3552-1-fidencio@redhat.com> Message-ID: <CAAY6XsdTOytTZ675TMa=r-s2P6f+t_pD2QZzK19OG-pkNuNy2g@mail.gmail.com> On Fri, Feb 8, 2019 at 3:40 PM Fabiano Fid?ncio <fidencio at redhat.com> wrote: > > ubuntu desktop ISOs do not have their initrd file consistently named. > For the majority of the releases their initrd is named as "initrd.lz" > for some releases, as 16.04, 18.10 and, 19.04, the initrd is just named > as "initrd". Hmm. Ignore this patch (at least for now). Seems that the kernel location is also wrong for a bunch of ISOs as some use casper/vmlinuz and some others casper/vmlinuz.efi. I'll re-submit a v2 including all the changes. From fidencio at redhat.com Mon Feb 11 08:43:42 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:42 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 00/13] Fix kernel/initrd of Ubuntu (desktop) ISOs Message-ID: <20190211084355.18468-1-fidencio@redhat.com> Ubuntu's ISOs do not have their initrd/kernel files named consistently accross the releases. Let's fix those for desktop ISOs according to: initrd: ------- [fidencio at dahmer Downloads]$ for i in `ls ubuntu-* | grep desktop`; do echo $i && isoinfo -J -i $i -f | grep initrd && echo ''; done ubuntu-10.04-desktop-amd64.iso /casper/initrd.lz ubuntu-10.04-desktop-i386.iso /casper/initrd.lz ubuntu-10.10-desktop-amd64.iso /casper/initrd.lz ubuntu-10.10-desktop-i386.iso /casper/initrd.lz ubuntu-11.04-desktop-amd64.iso /casper/initrd.lz ubuntu-11.04-desktop-i386.iso /casper/initrd.lz ubuntu-11.10-desktop-amd64.iso /casper/initrd.lz ubuntu-11.10-desktop-i386.iso /casper/initrd.lz ubuntu-12.04-desktop-amd64.iso /casper/initrd.lz ubuntu-12.04-desktop-i386.iso /casper/initrd.lz ubuntu-12.10-desktop-amd64.iso /casper/initrd.lz ubuntu-12.10-desktop-i386.iso /casper/initrd.lz ubuntu-13.04-desktop-amd64.iso /casper/initrd.lz ubuntu-13.04-desktop-i386.iso /casper/initrd.lz ubuntu-13.10-desktop-amd64.iso /casper/initrd.lz ubuntu-13.10-desktop-i386.iso /casper/initrd.lz ubuntu-14.04.5-desktop-amd64.iso /casper/initrd.lz ubuntu-14.04.5-desktop-i386.iso /casper/initrd.lz ubuntu-14.10-desktop-amd64.iso /casper/initrd.lz ubuntu-14.10-desktop-i386.iso /casper/initrd.lz ubuntu-15.04-desktop-amd64.iso /casper/initrd.lz ubuntu-15.04-desktop-i386.iso /casper/initrd.lz ubuntu-15.10-desktop-amd64.iso /casper/initrd.lz ubuntu-15.10-desktop-i386.iso /casper/initrd.lz ubuntu-16.04.5-desktop-amd64.iso /casper/initrd ubuntu-16.10-desktop-amd64.iso /casper/initrd.lz ubuntu-16.10-desktop-i386.iso /casper/initrd.lz ubuntu-17.04-desktop-amd64.iso /casper/initrd.lz ubuntu-17.04-desktop-i386.iso /casper/initrd.lz ubuntu-17.10.1-desktop-amd64.iso /casper/initrd.lz ubuntu-18.04.1-desktop-amd64.iso /casper/initrd.lz ubuntu-18.10-desktop-amd64.iso /casper/initrd ubuntu-6.06.1-desktop-amd64.iso /casper/initrd.gz ubuntu-6.06-desktop-amd64.iso /casper/initrd.gz ubuntu-6.06-desktop-i386.iso /casper/initrd.gz ubuntu-6.10-desktop-amd64.iso /casper/initrd.gz ubuntu-6.10-desktop-i386.iso /casper/initrd.gz ubuntu-7.04-desktop-amd64.iso /casper/initrd.gz ubuntu-7.04-desktop-i386.iso /casper/initrd.gz ubuntu-7.10-desktop-amd64.iso /casper/initrd.gz ubuntu-7.10-desktop-i386.iso /casper/initrd.gz ubuntu-8.04-desktop-amd64.iso /casper/initrd.gz ubuntu-8.04-desktop-i386.iso /casper/initrd.gz ubuntu-8.10-desktop-amd64.iso /casper/initrd.gz ubuntu-8.10-desktop-i386.iso /casper/initrd.gz ubuntu-9.04-desktop-amd64.iso /casper/initrd.gz ubuntu-9.04-desktop-i386.iso /casper/initrd.gz ubuntu-9.10-desktop-amd64.iso /casper/initrd.lz ubuntu-9.10-desktop-i386.iso /casper/initrd.lz kernel: ------- [fidencio at dahmer Downloads]$ for i in `ls ubuntu-* | grep desktop`; do echo $i && isoinfo -J -i $i -f | grep vmlinuz && echo ''; done ubuntu-10.04-desktop-amd64.iso /casper/vmlinuz ubuntu-10.04-desktop-i386.iso /casper/vmlinuz ubuntu-10.10-desktop-amd64.iso /casper/vmlinuz ubuntu-10.10-desktop-i386.iso /casper/vmlinuz ubuntu-11.04-desktop-amd64.iso /casper/vmlinuz ubuntu-11.04-desktop-i386.iso /casper/vmlinuz ubuntu-11.10-desktop-amd64.iso /casper/vmlinuz ubuntu-11.10-desktop-i386.iso /casper/vmlinuz ubuntu-12.04-desktop-amd64.iso /casper/vmlinuz ubuntu-12.04-desktop-i386.iso /casper/vmlinuz ubuntu-12.10-desktop-amd64.iso /casper/vmlinuz /casper/vmlinuz.efi.signed ubuntu-12.10-desktop-i386.iso /casper/vmlinuz ubuntu-13.04-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-13.04-desktop-i386.iso /casper/vmlinuz ubuntu-13.10-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-13.10-desktop-i386.iso /casper/vmlinuz ubuntu-14.04.5-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-14.04.5-desktop-i386.iso /casper/vmlinuz ubuntu-14.10-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-14.10-desktop-i386.iso /casper/vmlinuz ubuntu-15.04-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-15.04-desktop-i386.iso /casper/vmlinuz ubuntu-15.10-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-15.10-desktop-i386.iso /casper/vmlinuz ubuntu-16.04.5-desktop-amd64.iso /casper/vmlinuz ubuntu-16.10-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-16.10-desktop-i386.iso /casper/vmlinuz ubuntu-17.04-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-17.04-desktop-i386.iso /casper/vmlinuz ubuntu-17.10.1-desktop-amd64.iso /casper/vmlinuz.efi ubuntu-18.04.1-desktop-amd64.iso /casper/vmlinuz ubuntu-18.10-desktop-amd64.iso /casper/vmlinuz ubuntu-6.06.1-desktop-amd64.iso /casper/vmlinuz ubuntu-6.06-desktop-amd64.iso /casper/vmlinuz ubuntu-6.06-desktop-i386.iso /casper/vmlinuz ubuntu-6.10-desktop-amd64.iso /casper/vmlinuz ubuntu-6.10-desktop-i386.iso /casper/vmlinuz ubuntu-7.04-desktop-amd64.iso /casper/vmlinuz ubuntu-7.04-desktop-i386.iso /casper/vmlinuz ubuntu-7.10-desktop-amd64.iso /casper/vmlinuz ubuntu-7.10-desktop-i386.iso /casper/vmlinuz ubuntu-8.04-desktop-amd64.iso /casper/vmlinuz ubuntu-8.04-desktop-i386.iso /casper/vmlinuz ubuntu-8.10-desktop-amd64.iso /casper/vmlinuz ubuntu-8.10-desktop-i386.iso /casper/vmlinuz ubuntu-9.04-desktop-amd64.iso /casper/vmlinuz ubuntu-9.04-desktop-i386.iso /casper/vmlinuz ubuntu-9.10-desktop-amd64.iso /casper/vmlinuz ubuntu-9.10-desktop-i386.iso /casper/vmlinuz Fabiano Fid?ncio (13): ubuntu: Fix initrd path for 11.04 desktop ISO ubuntu: Fix kernel path for 13.04 desktop ISOs ubuntu: Fix kernel path for 13.10 desktop ISO ubuntu: Fix kernel path for 14.04 desktop ISO ubuntu: Fix kernel path for 14.10 desktop ISO ubuntu: Fix kernel path for 15.04 desktop ISO ubuntu: Fix kernel path for 15.10 desktop ISO ubuntu: Fix kernel path for 16.04 desktop ISO ubuntu: Fix kernel path for 16.10 desktop ISO ubuntu: Fix kernel path for 17.04 desktop ISO ubuntu: Fix kernel path for 17.10 desktop ISO ubuntu: Fix initrd path for 18.10 desktop ISO ubuntu: Fix initrd path for 19.04 desktop ISO data/os/ubuntu.com/ubuntu-11.04.xml.in | 2 +- data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ++-- data/os/ubuntu.com/ubuntu-13.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-14.04.xml.in | 2 +- data/os/ubuntu.com/ubuntu-14.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-15.04.xml.in | 2 +- data/os/ubuntu.com/ubuntu-15.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-16.04.xml.in | 2 +- data/os/ubuntu.com/ubuntu-16.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-17.04.xml.in | 2 +- data/os/ubuntu.com/ubuntu-17.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:43 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:43 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 01/13] ubuntu: Fix initrd path for 11.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-11.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-11.04.xml.in b/data/os/ubuntu.com/ubuntu-11.04.xml.in index c0640fc..c9985be 100644 --- a/data/os/ubuntu.com/ubuntu-11.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-11.04.xml.in @@ -65,7 +65,7 @@ <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.img</initrd> + <initrd>casper/initrd.lz</initrd> </media> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:44 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:44 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 02/13] ubuntu: Fix kernel path for 13.04 desktop ISOs In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in index 07fe3ac..8e175d1 100644 --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in @@ -50,7 +50,7 @@ <iso> <volume-id>Ubuntu 13.04 i386</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.</kernel> <initrd>casper/initrd.lz</initrd> </media> <media arch="x86_64" live="true"> @@ -58,7 +58,7 @@ <iso> <volume-id>Ubuntu 13.04 amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:45 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:45 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 03/13] ubuntu: Fix kernel path for 13.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in index ae03f0b..ee33b79 100644 --- a/data/os/ubuntu.com/ubuntu-13.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in @@ -58,7 +58,7 @@ <iso> <volume-id>Ubuntu 13.10 amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:46 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:46 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 04/13] ubuntu: Fix kernel path for 14.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 36a3773..ea361e2 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:47 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:47 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 05/13] ubuntu: Fix kernel path for 14.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-6-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in index 4c71132..e4c2217 100644 --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:48 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 06/13] ubuntu: Fix kernel path for 15.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-7-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in index 35acaf7..c440be2 100644 --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:49 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:49 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 07/13] ubuntu: Fix kernel path for 15.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-8-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in index 4ef334b..dea49b3 100644 --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:50 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:50 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 08/13] ubuntu: Fix kernel path for 16.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-9-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 3752ac4..ccc0c62 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> <media arch="ppc"> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 09/13] ubuntu: Fix kernel path for 16.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-10-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index ea0b64d..1a0e16b 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -59,7 +59,7 @@ <iso> <volume-id>Ubuntu 16.10(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> <media arch="aarch64"> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:52 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 10/13] ubuntu: Fix kernel path for 17.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-11-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 7b7ca59..0b9028f 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -73,7 +73,7 @@ <iso> <volume-id>Ubuntu 17.04(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> <media arch="aarch64"> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 11/13] ubuntu: Fix kernel path for 17.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-12-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 1aae23f..8532586 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -51,7 +51,7 @@ <iso> <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id> </iso> - <kernel>casper/vmlinuz</kernel> + <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> <media arch="aarch64"> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:54 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:54 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 12/13] ubuntu: Fix initrd path for 18.10 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-13-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 1086541..da77bba 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -55,7 +55,7 @@ <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> -- 2.20.1 From fidencio at redhat.com Mon Feb 11 08:43:55 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 09:43:55 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 13/13] ubuntu: Fix initrd path for 19.04 desktop ISO In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <20190211084355.18468-14-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 73c4c4e..b7fe87c 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -46,7 +46,7 @@ <volume-id>Ubuntu 19.04(.\d)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> - <initrd>casper/initrd.lz</initrd> + <initrd>casper/initrd</initrd> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> -- 2.20.1 From berrange at redhat.com Mon Feb 11 10:40:01 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 11 Feb 2019 10:40:01 +0000 Subject: [Libosinfo] [osinfo-db PATCH v2 02/13] ubuntu: Fix kernel path for 13.04 desktop ISOs In-Reply-To: <20190211084355.18468-3-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> <20190211084355.18468-3-fidencio@redhat.com> Message-ID: <20190211104001.GH27585@redhat.com> On Mon, Feb 11, 2019 at 09:43:44AM +0100, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in > index 07fe3ac..8e175d1 100644 > --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in > @@ -50,7 +50,7 @@ > <iso> > <volume-id>Ubuntu 13.04 i386</volume-id> > </iso> > - <kernel>casper/vmlinuz</kernel> > + <kernel>casper/vmlinuz.</kernel> Really ? A trailing "." ? > <initrd>casper/initrd.lz</initrd> > </media> > <media arch="x86_64" live="true"> > @@ -58,7 +58,7 @@ > <iso> > <volume-id>Ubuntu 13.04 amd64</volume-id> > </iso> > - <kernel>casper/vmlinuz</kernel> > + <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > </media> > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From fabiano at fidencio.org Mon Feb 11 10:41:58 2019 From: fabiano at fidencio.org (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 11 Feb 2019 11:41:58 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 02/13] ubuntu: Fix kernel path for 13.04 desktop ISOs In-Reply-To: <20190211104001.GH27585@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> <20190211084355.18468-3-fidencio@redhat.com> <20190211104001.GH27585@redhat.com> Message-ID: <CAK9pz9KGNmeUCstpDUrAPWAo2_8c5XQtK-FsC68h=kpon7M7Kg@mail.gmail.com> On Mon, Feb 11, 2019 at 11:40 AM Daniel P. Berrang? <berrange at redhat.com> wrote: > > On Mon, Feb 11, 2019 at 09:43:44AM +0100, Fabiano Fid?ncio wrote: > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in > > index 07fe3ac..8e175d1 100644 > > --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in > > +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in > > @@ -50,7 +50,7 @@ > > <iso> > > <volume-id>Ubuntu 13.04 i386</volume-id> > > </iso> > > - <kernel>casper/vmlinuz</kernel> > > + <kernel>casper/vmlinuz.</kernel> > > Really ? A trailing "." ? Ops, no, this one is a typo and is on me. :-( Fixed locally already. > > > <initrd>casper/initrd.lz</initrd> > > </media> > > <media arch="x86_64" live="true"> > > @@ -58,7 +58,7 @@ > > <iso> > > <volume-id>Ubuntu 13.04 amd64</volume-id> > > </iso> > > - <kernel>casper/vmlinuz</kernel> > > + <kernel>casper/vmlinuz.efi</kernel> > > <initrd>casper/initrd.lz</initrd> > > </media> > > > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -- Fabiano Fid?ncio From cfergeau at redhat.com Mon Feb 11 17:15:09 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 11 Feb 2019 18:15:09 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/3] schema: Add installer to the media In-Reply-To: <20190206155408.4324-1-fidencio@redhat.com> References: <20190206155408.4324-1-fidencio@redhat.com> Message-ID: <20190211171509.GL20161@natto.ory.fergeau.eu> On Wed, Feb 06, 2019 at 04:54:06PM +0100, Fabiano Fid?ncio wrote: > Having the instsaller tied to the OS is something that has been shown s/instsaller/installer Apart from this, the series looks good to me, Acked-by: Christophe Fergeau <cfergeau at redhat.com> > not optimal, unfortunately. > > An OS may have a few different medias and each media may support a > specific type of script or, even, not support an installer script at > all. With this in mind, let's have the installer scripts tied to the > medias themselves. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/schema/osinfo.rng.in | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in > index 5e6f5e7..6fc03a1 100644 > --- a/data/schema/osinfo.rng.in > +++ b/data/schema/osinfo.rng.in > @@ -412,6 +412,11 @@ > <text/> > </element> > </optional> > + <optional> > + <zeroOrMore> > + <ref name='installer'/> > + </zeroOrMore> > + </optional> > </interleave> > </element> > </define> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190211/5f5b8913/attachment.sig> From cfergeau at redhat.com Mon Feb 11 17:47:11 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 11 Feb 2019 18:47:11 +0100 Subject: [Libosinfo] [libosinfo PATCH] media: Make _supports_installer_sript() aware of media installers In-Reply-To: <20190207073917.16284-1-fidencio@redhat.com> References: <20190207073917.16284-1-fidencio@redhat.com> Message-ID: <20190211174711.GN20161@natto.ory.fergeau.eu> I'd add a call to osinfo_media_supports_installer_script to test_loaded_installer_script Apart from this, Acked-by: Christophe Fergeau <cfergeau at redhat.com> On Thu, Feb 07, 2019 at 08:39:17AM +0100, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > This has been written atop of > https://www.redhat.com/archives/libosinfo/2019-February/msg00028.html > --- > osinfo/osinfo_media.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c > index 6720736..9f77504 100644 > --- a/osinfo/osinfo_media.c > +++ b/osinfo/osinfo_media.c > @@ -1661,7 +1661,8 @@ gboolean osinfo_media_supports_installer_script(OsinfoMedia *media) > os = osinfo_media_get_os(media); > list = osinfo_os_get_install_script_list(os); > > - if (osinfo_list_get_length(OSINFO_LIST(list)) == 0) { > + if (osinfo_list_get_length(OSINFO_LIST(list)) == 0 && > + osinfo_list_get_length(OSINFO_LIST(media->priv->scripts)) == 0) { > ret = FALSE; > goto cleanup; > } > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190211/7094f24d/attachment.sig> From fidencio at redhat.com Tue Feb 12 19:49:31 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 12 Feb 2019 20:49:31 +0100 Subject: [Libosinfo] [libosinfo PATCH] pureos: Add test data for pureos8 Message-ID: <20190212194931.30849-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- ...0-gnome-live_20180904-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ ...0-gnome-live_20181210-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ ...0-gnome-live_20190128-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ ...0-gnome-live_20190210-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt diff --git a/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt new file mode 100644 index 0000000..5c53a7d --- /dev/null +++ b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: PureOS 8.0 GNOME Live +Volume set id: +Publisher id: PURISM +Data preparer id: LIVE-BUILD 1:20180224PUREOS1; HTTPS://DEBIAN-LIVE.ALIOTH.DEBIAN.ORG/LIVE-BUILD +Application id: PUREOS GNU/LINUX +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: 726240 +El Torito VD version 1 found, boot catalog is in sector 70 +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 47 71 diff --git a/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt new file mode 100644 index 0000000..4f00524 --- /dev/null +++ b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: PureOS 8.0 GNOME Live +Volume set id: +Publisher id: PURISM +Data preparer id: LIVE-BUILD 1:20180224PUREOS1; HTTPS://DEBIAN-LIVE.ALIOTH.DEBIAN.ORG/LIVE-BUILD +Application id: PUREOS GNU/LINUX +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: 740376 +El Torito VD version 1 found, boot catalog is in sector 70 +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 47 71 diff --git a/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt new file mode 100644 index 0000000..789d267 --- /dev/null +++ b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: PureOS 8.0 GNOME Live +Volume set id: +Publisher id: PURISM +Data preparer id: LIVE-BUILD 1:20180224PUREOS1; HTTPS://DEBIAN-LIVE.ALIOTH.DEBIAN.ORG/LIVE-BUILD +Application id: PUREOS GNU/LINUX +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: 748512 +El Torito VD version 1 found, boot catalog is in sector 70 +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 47 71 diff --git a/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt new file mode 100644 index 0000000..b1a4c98 --- /dev/null +++ b/tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: PureOS 8.0 GNOME Live +Volume set id: +Publisher id: PURISM +Data preparer id: LIVE-BUILD 1:20180224PUREOS1; HTTPS://DEBIAN-LIVE.ALIOTH.DEBIAN.ORG/LIVE-BUILD +Application id: PUREOS GNU/LINUX +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: 755160 +El Torito VD version 1 found, boot catalog is in sector 70 +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 47 71 -- 2.20.1 From fidencio at redhat.com Wed Feb 13 19:19:23 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 13 Feb 2019 20:19:23 +0100 Subject: [Libosinfo] [osinfo-db | libosinfo PATCH 0/4] Don't assume media identifiers are null terminated strings Message-ID: <20190213191927.12812-1-fidencio@redhat.com> While working on something completely unrelated, I've noticed that one Ubuntu ISO was not being recognized by libosinfo. After spending some time trying to understand why, I've noticed that libosinfo is considering that the maximum size of the volume-id would be '\0', which is not the case. So, this patch series provide: - Improvement for Ubuntu's volume-id regex; - Fixes for libosinfo in order to properly deal with the media identifiers in case those have the maximum allowed size; - Adding test data for Ubuntu that covers the fixed case; osinfo-db: Fabiano Fid?ncio (1): ubuntu: Improve the volume-id regex data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++-- data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++------- data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++-------- data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++------- data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++----- data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++----- data/os/ubuntu.com/ubuntu-6.06.xml.in | 28 +++++++++++++------------- data/os/ubuntu.com/ubuntu-8.04.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-9.04.xml.in | 8 ++++---- 16 files changed, 90 insertions(+), 90 deletions(-) libosinfo: Fabiano Fid?ncio (3): media: Don't assume identifiers are null terminated tests: Add ubuntu 18.04.1 test data tests: Add ubuntu 18.04.1.0 test data osinfo/osinfo_media.c | 37 ++++++++++++------- .../ubuntu-18.04.1-desktop-amd64.iso.txt | 29 +++++++++++++++ ...ubuntu-18.04.1.0-live-server-amd64.iso.txt | 29 +++++++++++++++ 3 files changed, 81 insertions(+), 14 deletions(-) create mode 100644 tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt create mode 100644 tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt -- 2.20.1 From fidencio at redhat.com Wed Feb 13 19:19:24 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 13 Feb 2019 20:19:24 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex In-Reply-To: <20190213191927.12812-1-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> Message-ID: <20190213191927.12812-2-fidencio@redhat.com> The first release of Ubuntu ISOs usually have their volume-id as, for instance: Ubuntu-Server 18.04 LTS amd64 Whenever a new release is done, a new digit is added as, for instance: Ubuntu-Server 18.04.1 LTS amd64 However, at least with 18.04, they had a new release for the server media that looks like: Ubuntu-Server 18.04.1+ LTS amd64 This '+' addition breaks the current used regular expression to match the media's volume-id. In order to take a safer path, let's expand all the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead, being able then to also match the '+'. The command used to change all the entries is: sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++-- data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++---- data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++------- data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++-------- data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++------- data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++----- data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++----- data/os/ubuntu.com/ubuntu-6.06.xml.in | 28 +++++++++++++------------- data/os/ubuntu.com/ubuntu-8.04.xml.in | 12 +++++------ data/os/ubuntu.com/ubuntu-9.04.xml.in | 8 ++++---- 16 files changed, 90 insertions(+), 90 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in index 6a0d759..2a53801 100644 --- a/data/os/ubuntu.com/ubuntu-10.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in @@ -32,7 +32,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu 10.04(.\d\+?)? LTS i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> @@ -41,7 +41,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu 10.04(.\d\+?)? LTS amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in index b81df0a..0093f16 100644 --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in @@ -32,7 +32,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -40,7 +40,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -48,7 +48,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu 12.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -56,7 +56,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu 12.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 40394bb..5e095b6 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu 14.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu 14.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in index 47512cd..e759776 100644 --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 14.10(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 14.10(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 14.10(.\d)? i386</volume-id> + <volume-id>Ubuntu 14.10(.\d\+?)? i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu 14.10(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in index 4aa990d..5848586 100644 --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 15.04(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 15.04(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 15.04(.\d)? i386</volume-id> + <volume-id>Ubuntu 15.04(.\d\+?)? i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 15.04(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in index 1c0d792..7a10190 100644 --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 15.10(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 15.10(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 15.10(.\d)? i386</volume-id> + <volume-id>Ubuntu 15.10(.\d\+?)? i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu 15.10(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 3f96cba..27b2d58 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 16.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 16.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id> + <volume-id>Ubuntu 16.04(.\d\+?)? LTS i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu 16.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> @@ -65,13 +65,13 @@ <media arch="ppc"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url> <iso> - <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc</volume-id> + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc</volume-id> </iso> </media> <media arch="ppc64le"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc64</volume-id> + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -79,7 +79,7 @@ <media arch="s390x"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 16.04(.\d)? LTS s390x</volume-id> + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 43372cb..09fff4f 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 16.10(.\d)? i386</volume-id> + <volume-id>Ubuntu 16.10(.\d\+?)? i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 16.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu 16.10(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> @@ -65,7 +65,7 @@ <media arch="aarch64"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? arm64</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -73,13 +73,13 @@ <media arch="ppc"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-powerpc.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? ppc</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc</volume-id> </iso> </media> <media arch="ppc64le"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? ppc64</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -87,7 +87,7 @@ <media arch="s390x"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 16.10(.\d)? s390x</volume-id> + <volume-id>Ubuntu-Server 16.10(.\d\+?)? s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 40c49dd..53111b9 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -47,7 +47,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 17.04(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 17.04(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -55,7 +55,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 17.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 17.04(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -63,7 +63,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 17.04(.\d)? i386</volume-id> + <volume-id>Ubuntu 17.04(.\d\+?)? i386</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -71,7 +71,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 17.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 17.04(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> @@ -79,7 +79,7 @@ <media arch="aarch64"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 17.04(.\d)? arm64</volume-id> + <volume-id>Ubuntu-Server 17.04(.\d\+?)? arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -87,7 +87,7 @@ <media arch="ppc64le"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 17.04(.\d)? ppc64</volume-id> + <volume-id>Ubuntu-Server 17.04(.\d\+?)? ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -95,7 +95,7 @@ <media arch="s390x"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 17.04(.\d)? s390x</volume-id> + <volume-id>Ubuntu-Server 17.04(.\d\+?)? s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 181e4aa..f31637e 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -33,7 +33,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 17.10(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 17.10(.\d\+?)? i386</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -41,7 +41,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 17.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 17.10(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -49,7 +49,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu 17.10(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> @@ -57,7 +57,7 @@ <media arch="aarch64"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 17.10(.\d)? arm64</volume-id> + <volume-id>Ubuntu-Server 17.10(.\d\+?)? arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -65,7 +65,7 @@ <media arch="ppc64le"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 17.10(.\d)? ppc64</volume-id> + <volume-id>Ubuntu-Server 17.10(.\d\+?)? ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -73,7 +73,7 @@ <media arch="s390x"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 17.10(.\d)? s390x</volume-id> + <volume-id>Ubuntu-Server 17.10(.\d\+?)? s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 3b3c595..41f780b 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -34,7 +34,7 @@ <media arch="x86_64"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 18.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -42,7 +42,7 @@ <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.1-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 18.04(.\d)? LTS amd64</volume-id> + <volume-id>Ubuntu 18.04(.\d\+?)? LTS amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> @@ -50,7 +50,7 @@ <media arch="aarch64"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 18.04(.\d)? LTS arm64</volume-id> + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -58,7 +58,7 @@ <media arch="ppc64le"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 18.04(.\d)? LTS ppc64</volume-id> + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -66,7 +66,7 @@ <media arch="s390x"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 18.04(.\d)? LTS s390x</volume-id> + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index a699dc0..2d2aefa 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -34,7 +34,7 @@ <media arch="x86_64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> <volume-size>751828992</volume-size> </iso> <kernel>install/vmlinuz</kernel> @@ -43,7 +43,7 @@ <media arch="x86_64" live="true" installer-script="false"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> <volume-size>923795456</volume-size> </iso> <kernel>casper/vmlinuz</kernel> @@ -52,7 +52,7 @@ <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id> + <volume-id>Ubuntu 18.10(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> @@ -60,7 +60,7 @@ <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 18.10(.\d)? arm64</volume-id> + <volume-id>Ubuntu-Server 18.10(.\d\+?)? arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -68,7 +68,7 @@ <media arch="ppc64le"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 18.10(.\d)? ppc64</volume-id> + <volume-id>Ubuntu-Server 18.10(.\d\+?)? ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -76,7 +76,7 @@ <media arch="s390x"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 18.10(.\d)? s390x</volume-id> + <volume-id>Ubuntu-Server 18.10(.\d\+?)? s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index fd4083b..09012a6 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -35,7 +35,7 @@ <media arch="x86_64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 19.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 19.04(.\d\+?)? amd64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -43,7 +43,7 @@ <media arch="x86_64" live="true"> <url>http://cdimage.ubuntu.com/daily-live/current/disco-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 19.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 19.04(.\d\+?)? amd64</volume-id> </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> @@ -51,7 +51,7 @@ <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> <iso> - <volume-id>Ubuntu-Server 19.04(.\d)? arm64</volume-id> + <volume-id>Ubuntu-Server 19.04(.\d\+?)? arm64</volume-id> </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> @@ -59,7 +59,7 @@ <media arch="ppc64le"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-ppc64el.iso</url> <iso> - <volume-id>Ubuntu-Server 19.04(.\d)? ppc64</volume-id> + <volume-id>Ubuntu-Server 19.04(.\d\+?)? ppc64</volume-id> </iso> <kernel>install/vmlinux</kernel> <initrd>install/initrd.gz</initrd> @@ -67,7 +67,7 @@ <media arch="s390x"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-s390x.iso</url> <iso> - <volume-id>Ubuntu-Server 19.04(.\d)? s390x</volume-id> + <volume-id>Ubuntu-Server 19.04(.\d\+?)? s390x</volume-id> </iso> <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in index 54dfc4c..8e44116 100644 --- a/data/os/ubuntu.com/ubuntu-6.06.xml.in +++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in @@ -19,7 +19,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -28,7 +28,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -37,7 +37,7 @@ <media arch="ppc"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? ppc</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/powerpc/vmlinux</kernel> @@ -46,7 +46,7 @@ <media arch="parisc"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? hppa</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz-hppa32</kernel> @@ -55,14 +55,14 @@ <media arch="ia64"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? ia64</volume-id> <system-id>LINUX</system-id> </iso> </media> <media arch="sparc64"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url> <iso> - <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id> + <volume-id>Ubuntu-Server 6.06(.\d\+?)? sparc</volume-id> <system-id>LINUX</system-id> </iso> <kernel>boot/sparc64</kernel> @@ -72,7 +72,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? i386</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -81,7 +81,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -90,7 +90,7 @@ <media arch="ppc" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/powerpc/vmlinux</kernel> @@ -100,7 +100,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? i386</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -109,7 +109,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -118,7 +118,7 @@ <media arch="ppc" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/powerpc/vmlinux</kernel> @@ -128,7 +128,7 @@ <media arch="parisc" live="true"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? hppa</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? hppa</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinux-hppa32</kernel> @@ -137,7 +137,7 @@ <media arch="ia64"> <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url> <iso> - <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id> + <volume-id>Ubuntu 6.06(.\d\+?)? ia64</volume-id> <system-id>LINUX</system-id> </iso> </media> diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in index e322f72..77003a8 100644 --- a/data/os/ubuntu.com/ubuntu-8.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in @@ -23,7 +23,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 8.04(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -32,7 +32,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 8.04(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -42,7 +42,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 8.04(.\d)? i386</volume-id> + <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> @@ -51,7 +51,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> @@ -61,7 +61,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url> <iso> - <volume-id>Ubuntu 8.04(.\d)? i386</volume-id> + <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> @@ -70,7 +70,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url> <iso> - <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in index d925615..0551b2f 100644 --- a/data/os/ubuntu.com/ubuntu-9.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in @@ -23,7 +23,7 @@ <media arch="i686"> <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url> <iso> - <volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id> + <volume-id>Ubuntu-Server 9.04(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -32,7 +32,7 @@ <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url> <iso> - <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu-Server 9.04(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>install/vmlinuz</kernel> @@ -42,7 +42,7 @@ <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url> <iso> - <volume-id>Ubuntu 9.04(.\d)? i386</volume-id> + <volume-id>Ubuntu 9.04(.\d\+?)? i386</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> @@ -51,7 +51,7 @@ <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url> <iso> - <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id> + <volume-id>Ubuntu 9.04(.\d\+?)? amd64</volume-id> <system-id>LINUX</system-id> </iso> <kernel>casper/vmlinuz</kernel> -- 2.20.1 From fidencio at redhat.com Wed Feb 13 19:19:25 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 13 Feb 2019 20:19:25 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated In-Reply-To: <20190213191927.12812-1-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> Message-ID: <20190213191927.12812-3-fidencio@redhat.com> Identifiers as volume-id, application, publisher, and system are not null terminated and cannot be assumed as so. By assuming those are null terminated strings, libosinfo ends up not counting the last character of a MAX_* string and, consequently, not properly identifying medias that have their identifiers with the MAX_* size. One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id has exactly 32 characters it's never been matched as when reading the media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'. --- osinfo/osinfo_media.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c index 9f77504..eaf67e2 100644 --- a/osinfo/osinfo_media.c +++ b/osinfo/osinfo_media.c @@ -137,6 +137,11 @@ struct _CreateFromLocationAsyncData { gsize offset; gsize length; + + gchar *volume; + gchar *system; + gchar *application; + gchar *publisher; }; static void create_from_location_async_data_free @@ -144,6 +149,10 @@ static void create_from_location_async_data_free { g_object_unref(data->file); g_object_unref(data->res); + g_free(data->volume); + g_free(data->system); + g_free(data->application); + g_free(data->publisher); g_slice_free(CreateFromLocationAsyncData, data); } @@ -809,18 +818,18 @@ create_from_location_async_data(CreateFromLocationAsyncData *data) OSINFO_MEDIA_PROP_URL, uri); g_free(uri); - if (!is_str_empty(data->pvd.volume)) + if (!is_str_empty(data->volume)) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_VOLUME_ID, - data->pvd.volume); - if (!is_str_empty(data->pvd.system)) + data->volume); + if (!is_str_empty(data->system)) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_SYSTEM_ID, - data->pvd.system); - if (!is_str_empty(data->pvd.publisher)) + data->system); + if (!is_str_empty(data->publisher)) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_PUBLISHER_ID, - data->pvd.publisher); + data->publisher); if (!is_str_empty(data->pvd.application)) osinfo_entity_set_param(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_APPLICATION_ID, @@ -1159,19 +1168,19 @@ static void on_pvd_read(GObject *source, return; } - data->pvd.volume[MAX_VOLUME - 1] = 0; - g_strchomp(data->pvd.volume); + data->volume = g_strndup(data->pvd.volume, MAX_VOLUME); + g_strchomp(data->volume); - data->pvd.system[MAX_SYSTEM - 1] = 0; - g_strchomp(data->pvd.system); + data->system = g_strndup(data->pvd.system, MAX_SYSTEM); + g_strchomp(data->system); - data->pvd.publisher[MAX_PUBLISHER - 1] = 0; - g_strchomp(data->pvd.publisher); + data->publisher = g_strndup(data->pvd.publisher, MAX_PUBLISHER); + g_strchomp(data->publisher); - data->pvd.application[MAX_APPLICATION - 1] = 0; + data->application = g_strndup(data->pvd.application, MAX_APPLICATION); g_strchomp(data->pvd.application); - if (is_str_empty(data->pvd.volume)) { + if (is_str_empty(data->volume)) { g_set_error(&error, OSINFO_MEDIA_ERROR, OSINFO_MEDIA_ERROR_INSUFFICIENT_METADATA, -- 2.20.1 From fidencio at redhat.com Wed Feb 13 19:19:26 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 13 Feb 2019 20:19:26 +0100 Subject: [Libosinfo] [libosinfo PATCH 3/4] tests: Add ubuntu 18.04.1 test data In-Reply-To: <20190213191927.12812-1-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> Message-ID: <20190213191927.12812-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu-18.04.1-desktop-amd64.iso.txt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt diff --git a/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt new file mode 100644 index 0000000..f2ca3de --- /dev/null +++ b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Ubuntu 18.04.1 LTS amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4 +Application id: +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: 953784 +El Torito VD version 1 found, boot catalog is in sector 191 +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 E3B56 932694 -- 2.20.1 From fidencio at redhat.com Wed Feb 13 19:19:27 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 13 Feb 2019 20:19:27 +0100 Subject: [Libosinfo] [libosinfo PATCH 4/4] tests: Add ubuntu 18.04.1.0 test data In-Reply-To: <20190213191927.12812-1-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> Message-ID: <20190213191927.12812-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- ...ubuntu-18.04.1.0-live-server-amd64.iso.txt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt diff --git a/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt new file mode 100644 index 0000000..4358746 --- /dev/null +++ b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1.0-live-server-amd64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Ubuntu-Server 18.04.1+ LTS amd64 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4 +Application id: +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: 415744 +El Torito VD version 1 found, boot catalog is in sector 193 +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 2675F 157535 -- 2.20.1 From cfergeau at redhat.com Thu Feb 14 09:46:04 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 14 Feb 2019 10:46:04 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex In-Reply-To: <20190213191927.12812-2-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-2-fidencio@redhat.com> Message-ID: <20190214094604.GD20161@natto.ory.fergeau.eu> On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fid?ncio wrote: > The first release of Ubuntu ISOs usually have their volume-id as, for > instance: > Ubuntu-Server 18.04 LTS amd64 > > Whenever a new release is done, a new digit is added as, for instance: > Ubuntu-Server 18.04.1 LTS amd64 > > However, at least with 18.04, they had a new release for the server > media that looks like: > Ubuntu-Server 18.04.1+ LTS amd64 > > This '+' addition breaks the current used regular expression to match > the media's volume-id. In order to take a safer path, let's expand all > the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead, > being able then to also match the '+'. > > The command used to change all the entries is: > sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++-- > data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++---- > data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++---- > data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++---- > data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++---- > data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++---- > data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++------- > data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++-------- > data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++------- > data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------ > data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++----- > data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------ > data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++----- > data/os/ubuntu.com/ubuntu-6.06.xml.in | 28 +++++++++++++------------- > data/os/ubuntu.com/ubuntu-8.04.xml.in | 12 +++++------ > data/os/ubuntu.com/ubuntu-9.04.xml.in | 8 ++++---- A bunch of the older releases don't look for xx.yy.zz in the volume id, but only for xx.yy. Your patch is missing these. It's not clear to me if it's intentional that we don't have these matches for these releases, or if it's just something that was overlooked. These releases are: ubuntu-10.10.xml.in ubuntu-11.04.xml.in ubuntu-11.10.xml.in ubuntu-12.10.xml.in ubuntu-13.04.xml.in ubuntu-13.10.xml.in ubuntu-4.10.xml.in ubuntu-5.04.xml.in ubuntu-5.10.xml.in ubuntu-6.10.xml.in ubuntu-7.04.xml.in ubuntu-7.10.xml.in ubuntu-8.10.xml.in ubuntu-9.10.xml.in Apart from this, looks good to me, Reviewed-by: Christophe Fergeau <cfergeau at redhat.com> > 16 files changed, 90 insertions(+), 90 deletions(-) > > diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in > index 6a0d759..2a53801 100644 > --- a/data/os/ubuntu.com/ubuntu-10.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in > @@ -32,7 +32,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu 10.04(.\d\+?)? LTS i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -41,7 +41,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu 10.04(.\d\+?)? LTS amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in > index b81df0a..0093f16 100644 > --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in > @@ -32,7 +32,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -40,7 +40,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -48,7 +48,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu 12.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -56,7 +56,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu 12.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in > index 40394bb..5e095b6 100644 > --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu 14.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu 14.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in > index 47512cd..e759776 100644 > --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in > +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 14.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 14.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 14.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu 14.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 14.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in > index 4aa990d..5848586 100644 > --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 15.04(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 15.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 15.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu 15.04(.\d\+?)? i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 15.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in > index 1c0d792..7a10190 100644 > --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in > +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 15.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 15.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 15.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu 15.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 15.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in > index 3f96cba..27b2d58 100644 > --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id> > + <volume-id>Ubuntu 16.04(.\d\+?)? LTS i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu 16.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -65,13 +65,13 @@ > <media arch="ppc"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc</volume-id> > + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc</volume-id> > </iso> > </media> > <media arch="ppc64le"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc64</volume-id> > + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -79,7 +79,7 @@ > <media arch="s390x"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.04(.\d)? LTS s390x</volume-id> > + <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in > index 43372cb..09fff4f 100644 > --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in > +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 16.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu 16.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 16.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 16.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -65,7 +65,7 @@ > <media arch="aarch64"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? arm64</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -73,13 +73,13 @@ > <media arch="ppc"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-powerpc.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? ppc</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc</volume-id> > </iso> > </media> > <media arch="ppc64le"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? ppc64</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -87,7 +87,7 @@ > <media arch="s390x"> > <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 16.10(.\d)? s390x</volume-id> > + <volume-id>Ubuntu-Server 16.10(.\d\+?)? s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in > index 40c49dd..53111b9 100644 > --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in > @@ -47,7 +47,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 17.04(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -55,7 +55,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 17.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -63,7 +63,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 17.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu 17.04(.\d\+?)? i386</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -71,7 +71,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 17.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 17.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -79,7 +79,7 @@ > <media arch="aarch64"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.04(.\d)? arm64</volume-id> > + <volume-id>Ubuntu-Server 17.04(.\d\+?)? arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -87,7 +87,7 @@ > <media arch="ppc64le"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.04(.\d)? ppc64</volume-id> > + <volume-id>Ubuntu-Server 17.04(.\d\+?)? ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -95,7 +95,7 @@ > <media arch="s390x"> > <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.04(.\d)? s390x</volume-id> > + <volume-id>Ubuntu-Server 17.04(.\d\+?)? s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in > index 181e4aa..f31637e 100644 > --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in > +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in > @@ -33,7 +33,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.10(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 17.10(.\d\+?)? i386</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -41,7 +41,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 17.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -49,7 +49,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 17.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -57,7 +57,7 @@ > <media arch="aarch64"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.10(.\d)? arm64</volume-id> > + <volume-id>Ubuntu-Server 17.10(.\d\+?)? arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -65,7 +65,7 @@ > <media arch="ppc64le"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.10(.\d)? ppc64</volume-id> > + <volume-id>Ubuntu-Server 17.10(.\d\+?)? ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -73,7 +73,7 @@ > <media arch="s390x"> > <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 17.10(.\d)? s390x</volume-id> > + <volume-id>Ubuntu-Server 17.10(.\d\+?)? s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in > index 3b3c595..41f780b 100644 > --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in > @@ -34,7 +34,7 @@ > <media arch="x86_64"> > <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -42,7 +42,7 @@ > <media arch="x86_64" live="true"> > <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.1-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 18.04(.\d)? LTS amd64</volume-id> > + <volume-id>Ubuntu 18.04(.\d\+?)? LTS amd64</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > @@ -50,7 +50,7 @@ > <media arch="aarch64"> > <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.04(.\d)? LTS arm64</volume-id> > + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -58,7 +58,7 @@ > <media arch="ppc64le"> > <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.04(.\d)? LTS ppc64</volume-id> > + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -66,7 +66,7 @@ > <media arch="s390x"> > <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.04(.\d)? LTS s390x</volume-id> > + <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in > index a699dc0..2d2aefa 100644 > --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in > +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in > @@ -34,7 +34,7 @@ > <media arch="x86_64"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> > <volume-size>751828992</volume-size> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -43,7 +43,7 @@ > <media arch="x86_64" live="true" installer-script="false"> > <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> > <volume-size>923795456</volume-size> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -52,7 +52,7 @@ > <media arch="x86_64" live="true"> > <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 18.10(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd</initrd> > @@ -60,7 +60,7 @@ > <media arch="aarch64"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.10(.\d)? arm64</volume-id> > + <volume-id>Ubuntu-Server 18.10(.\d\+?)? arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -68,7 +68,7 @@ > <media arch="ppc64le"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.10(.\d)? ppc64</volume-id> > + <volume-id>Ubuntu-Server 18.10(.\d\+?)? ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -76,7 +76,7 @@ > <media arch="s390x"> > <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 18.10(.\d)? s390x</volume-id> > + <volume-id>Ubuntu-Server 18.10(.\d\+?)? s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in > index fd4083b..09012a6 100644 > --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in > @@ -35,7 +35,7 @@ > <media arch="x86_64"> > <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 19.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 19.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -43,7 +43,7 @@ > <media arch="x86_64" live="true"> > <url>http://cdimage.ubuntu.com/daily-live/current/disco-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 19.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 19.04(.\d\+?)? amd64</volume-id> > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd</initrd> > @@ -51,7 +51,7 @@ > <media arch="aarch64"> > <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 19.04(.\d)? arm64</volume-id> > + <volume-id>Ubuntu-Server 19.04(.\d\+?)? arm64</volume-id> > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > @@ -59,7 +59,7 @@ > <media arch="ppc64le"> > <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-ppc64el.iso</url> > <iso> > - <volume-id>Ubuntu-Server 19.04(.\d)? ppc64</volume-id> > + <volume-id>Ubuntu-Server 19.04(.\d\+?)? ppc64</volume-id> > </iso> > <kernel>install/vmlinux</kernel> > <initrd>install/initrd.gz</initrd> > @@ -67,7 +67,7 @@ > <media arch="s390x"> > <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-s390x.iso</url> > <iso> > - <volume-id>Ubuntu-Server 19.04(.\d)? s390x</volume-id> > + <volume-id>Ubuntu-Server 19.04(.\d\+?)? s390x</volume-id> > </iso> > <kernel>boot/kernel.ubuntu</kernel> > <initrd>boot/initrd.ubuntu</initrd> > diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in > index 54dfc4c..8e44116 100644 > --- a/data/os/ubuntu.com/ubuntu-6.06.xml.in > +++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in > @@ -19,7 +19,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -28,7 +28,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -37,7 +37,7 @@ > <media arch="ppc"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? ppc</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/powerpc/vmlinux</kernel> > @@ -46,7 +46,7 @@ > <media arch="parisc"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? hppa</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz-hppa32</kernel> > @@ -55,14 +55,14 @@ > <media arch="ia64"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? ia64</volume-id> > <system-id>LINUX</system-id> > </iso> > </media> > <media arch="sparc64"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url> > <iso> > - <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id> > + <volume-id>Ubuntu-Server 6.06(.\d\+?)? sparc</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>boot/sparc64</kernel> > @@ -72,7 +72,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? i386</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -81,7 +81,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -90,7 +90,7 @@ > <media arch="ppc" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/powerpc/vmlinux</kernel> > @@ -100,7 +100,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? i386</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -109,7 +109,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -118,7 +118,7 @@ > <media arch="ppc" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/powerpc/vmlinux</kernel> > @@ -128,7 +128,7 @@ > <media arch="parisc" live="true"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? hppa</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? hppa</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinux-hppa32</kernel> > @@ -137,7 +137,7 @@ > <media arch="ia64"> > <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url> > <iso> > - <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id> > + <volume-id>Ubuntu 6.06(.\d\+?)? ia64</volume-id> > <system-id>LINUX</system-id> > </iso> > </media> > diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in > index e322f72..77003a8 100644 > --- a/data/os/ubuntu.com/ubuntu-8.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in > @@ -23,7 +23,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 8.04(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -32,7 +32,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 8.04(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -42,7 +42,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 8.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -51,7 +51,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -61,7 +61,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url> > <iso> > - <volume-id>Ubuntu 8.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -70,7 +70,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in > index d925615..0551b2f 100644 > --- a/data/os/ubuntu.com/ubuntu-9.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in > @@ -23,7 +23,7 @@ > <media arch="i686"> > <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url> > <iso> > - <volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu-Server 9.04(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -32,7 +32,7 @@ > <media arch="x86_64"> > <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url> > <iso> > - <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu-Server 9.04(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>install/vmlinuz</kernel> > @@ -42,7 +42,7 @@ > <media arch="i686" live="true"> > <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 9.04(.\d)? i386</volume-id> > + <volume-id>Ubuntu 9.04(.\d\+?)? i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -51,7 +51,7 @@ > <media arch="x86_64" live="true"> > <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url> > <iso> > - <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id> > + <volume-id>Ubuntu 9.04(.\d\+?)? amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/b5f3c9c2/attachment.sig> From cfergeau at redhat.com Thu Feb 14 09:57:05 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 14 Feb 2019 10:57:05 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated In-Reply-To: <20190213191927.12812-3-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-3-fidencio@redhat.com> Message-ID: <20190214095705.GE20161@natto.ory.fergeau.eu> Hey, On Wed, Feb 13, 2019 at 08:19:25PM +0100, Fabiano Fid?ncio wrote: > Identifiers as volume-id, application, publisher, and system are not > null terminated and cannot be assumed as so. > > By assuming those are null terminated strings, libosinfo ends up not > counting the last character of a MAX_* string and, consequently, not > properly identifying medias that have their identifiers with the MAX_* > size. > > One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which > has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id > has exactly 32 characters it's never been matched as when reading the > media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'. I don't think we have any test case for that code, do we? > --- > osinfo/osinfo_media.c | 37 +++++++++++++++++++++++-------------- > 1 file changed, 23 insertions(+), 14 deletions(-) > > diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c > index 9f77504..eaf67e2 100644 > --- a/osinfo/osinfo_media.c > +++ b/osinfo/osinfo_media.c > @@ -137,6 +137,11 @@ struct _CreateFromLocationAsyncData { > > gsize offset; > gsize length; > + > + gchar *volume; > + gchar *system; > + gchar *application; > + gchar *publisher; > }; > > static void create_from_location_async_data_free > @@ -144,6 +149,10 @@ static void create_from_location_async_data_free > { > g_object_unref(data->file); > g_object_unref(data->res); > + g_free(data->volume); > + g_free(data->system); > + g_free(data->application); > + g_free(data->publisher); > > g_slice_free(CreateFromLocationAsyncData, data); > } > @@ -809,18 +818,18 @@ create_from_location_async_data(CreateFromLocationAsyncData *data) > OSINFO_MEDIA_PROP_URL, > uri); > g_free(uri); > - if (!is_str_empty(data->pvd.volume)) > + if (!is_str_empty(data->volume)) > osinfo_entity_set_param(OSINFO_ENTITY(media), > OSINFO_MEDIA_PROP_VOLUME_ID, > - data->pvd.volume); > - if (!is_str_empty(data->pvd.system)) > + data->volume); > + if (!is_str_empty(data->system)) > osinfo_entity_set_param(OSINFO_ENTITY(media), > OSINFO_MEDIA_PROP_SYSTEM_ID, > - data->pvd.system); > - if (!is_str_empty(data->pvd.publisher)) > + data->system); > + if (!is_str_empty(data->publisher)) > osinfo_entity_set_param(OSINFO_ENTITY(media), > OSINFO_MEDIA_PROP_PUBLISHER_ID, > - data->pvd.publisher); > + data->publisher); > if (!is_str_empty(data->pvd.application)) > osinfo_entity_set_param(OSINFO_ENTITY(media), > OSINFO_MEDIA_PROP_APPLICATION_ID, > @@ -1159,19 +1168,19 @@ static void on_pvd_read(GObject *source, > return; > } > > - data->pvd.volume[MAX_VOLUME - 1] = 0; > - g_strchomp(data->pvd.volume); > + data->volume = g_strndup(data->pvd.volume, MAX_VOLUME); > + g_strchomp(data->volume); > > - data->pvd.system[MAX_SYSTEM - 1] = 0; > - g_strchomp(data->pvd.system); > + data->system = g_strndup(data->pvd.system, MAX_SYSTEM); > + g_strchomp(data->system); > > - data->pvd.publisher[MAX_PUBLISHER - 1] = 0; > - g_strchomp(data->pvd.publisher); > + data->publisher = g_strndup(data->pvd.publisher, MAX_PUBLISHER); > + g_strchomp(data->publisher); > > - data->pvd.application[MAX_APPLICATION - 1] = 0; > + data->application = g_strndup(data->pvd.application, MAX_APPLICATION); > g_strchomp(data->pvd.application); This should be g_strchomp(data->application); Reviewed-by: Christophe Fergeau <cfergeau at redhat.com> Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/a64ed4c6/attachment.sig> From cfergeau at redhat.com Thu Feb 14 09:58:02 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 14 Feb 2019 10:58:02 +0100 Subject: [Libosinfo] [libosinfo PATCH 3/4] tests: Add ubuntu 18.04.1 test data In-Reply-To: <20190213191927.12812-4-fidencio@redhat.com> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-4-fidencio@redhat.com> Message-ID: <20190214095802.GF20161@natto.ory.fergeau.eu> Feel free to squash 3/4 and 4/4 Reviewed-by: Christophe Fergeau <cfergeau at redhat.com> On Wed, Feb 13, 2019 at 08:19:26PM +0100, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu-18.04.1-desktop-amd64.iso.txt | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt > > diff --git a/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt > new file mode 100644 > index 0000000..f2ca3de > --- /dev/null > +++ b/tests/isodata/ubuntu/ubuntu18.04/ubuntu-18.04.1-desktop-amd64.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: Ubuntu 18.04.1 LTS amd64 > +Volume set id: > +Publisher id: > +Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4 > +Application id: > +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: 953784 > +El Torito VD version 1 found, boot catalog is in sector 191 > +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 E3B56 932694 > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/6e747c00/attachment.sig> From fidencio at redhat.com Thu Feb 14 10:03:57 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Thu, 14 Feb 2019 11:03:57 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex In-Reply-To: <20190214094604.GD20161@natto.ory.fergeau.eu> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-2-fidencio@redhat.com> <20190214094604.GD20161@natto.ory.fergeau.eu> Message-ID: <CAAY6XscYGXz=VrwxzqNJyvEw_vCy_nF_2S16FSOiuxRNmEoPCA@mail.gmail.com> On Thu, Feb 14, 2019 at 10:46 AM Christophe Fergeau <cfergeau at redhat.com> wrote: > On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fid?ncio wrote: > > The first release of Ubuntu ISOs usually have their volume-id as, for > > instance: > > Ubuntu-Server 18.04 LTS amd64 > > > > Whenever a new release is done, a new digit is added as, for instance: > > Ubuntu-Server 18.04.1 LTS amd64 > > > > However, at least with 18.04, they had a new release for the server > > media that looks like: > > Ubuntu-Server 18.04.1+ LTS amd64 > > > > This '+' addition breaks the current used regular expression to match > > the media's volume-id. In order to take a safer path, let's expand all > > the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead, > > being able then to also match the '+'. > > > > The command used to change all the entries is: > > sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++-- > > data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++---- > > data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++---- > > data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++---- > > data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++---- > > data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++---- > > data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++------- > > data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++-------- > > data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++------- > > data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------ > > data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++----- > > data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------ > > data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++----- > > data/os/ubuntu.com/ubuntu-6.06.xml.in | 28 +++++++++++++------------- > > data/os/ubuntu.com/ubuntu-8.04.xml.in | 12 +++++------ > > data/os/ubuntu.com/ubuntu-9.04.xml.in | 8 ++++---- > > A bunch of the older releases don't look for xx.yy.zz in the volume id, > but only for xx.yy. Your patch is missing these. It's not clear to me if > it's intentional that we don't have these matches for these releases, or > if it's just something that was overlooked. > I guess it's been overlooked for a few years :-) I'll do the changes on those files as well to keep them as the others. Do you want to see a v2 of this patch? [snip] -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/6a1a9f86/attachment.htm> From fidencio at redhat.com Thu Feb 14 10:05:39 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Thu, 14 Feb 2019 11:05:39 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated In-Reply-To: <20190214095705.GE20161@natto.ory.fergeau.eu> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-3-fidencio@redhat.com> <20190214095705.GE20161@natto.ory.fergeau.eu> Message-ID: <CAAY6Xscc06+rYONBROere37rk1-d=uY9moB8uz3EPy-QEP-P4A@mail.gmail.com> On Thu, Feb 14, 2019 at 10:57 AM Christophe Fergeau <cfergeau at redhat.com> wrote: > Hey, > > On Wed, Feb 13, 2019 at 08:19:25PM +0100, Fabiano Fid?ncio wrote: > > Identifiers as volume-id, application, publisher, and system are not > > null terminated and cannot be assumed as so. > > > > By assuming those are null terminated strings, libosinfo ends up not > > counting the last character of a MAX_* string and, consequently, not > > properly identifying medias that have their identifiers with the MAX_* > > size. > > > > One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which > > has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id > > has exactly 32 characters it's never been matched as when reading the > > media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'. > > I don't think we have any test case for that code, do we? > We don't have any specific test case for this code. But the whole test-isodetect relies on this (and that's the way I found out the issue when adding the new test data). Do you want a specific test for this or are you fine with the patch 4 covering this case? > > > --- > > osinfo/osinfo_media.c | 37 +++++++++++++++++++++++-------------- > > 1 file changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c > > index 9f77504..eaf67e2 100644 > > --- a/osinfo/osinfo_media.c > > +++ b/osinfo/osinfo_media.c > > @@ -137,6 +137,11 @@ struct _CreateFromLocationAsyncData { > > > > gsize offset; > > gsize length; > > + > > + gchar *volume; > > + gchar *system; > > + gchar *application; > > + gchar *publisher; > > }; > > > > static void create_from_location_async_data_free > > @@ -144,6 +149,10 @@ static void create_from_location_async_data_free > > { > > g_object_unref(data->file); > > g_object_unref(data->res); > > + g_free(data->volume); > > + g_free(data->system); > > + g_free(data->application); > > + g_free(data->publisher); > > > > g_slice_free(CreateFromLocationAsyncData, data); > > } > > @@ -809,18 +818,18 @@ > create_from_location_async_data(CreateFromLocationAsyncData *data) > > OSINFO_MEDIA_PROP_URL, > > uri); > > g_free(uri); > > - if (!is_str_empty(data->pvd.volume)) > > + if (!is_str_empty(data->volume)) > > osinfo_entity_set_param(OSINFO_ENTITY(media), > > OSINFO_MEDIA_PROP_VOLUME_ID, > > - data->pvd.volume); > > - if (!is_str_empty(data->pvd.system)) > > + data->volume); > > + if (!is_str_empty(data->system)) > > osinfo_entity_set_param(OSINFO_ENTITY(media), > > OSINFO_MEDIA_PROP_SYSTEM_ID, > > - data->pvd.system); > > - if (!is_str_empty(data->pvd.publisher)) > > + data->system); > > + if (!is_str_empty(data->publisher)) > > osinfo_entity_set_param(OSINFO_ENTITY(media), > > OSINFO_MEDIA_PROP_PUBLISHER_ID, > > - data->pvd.publisher); > > + data->publisher); > > if (!is_str_empty(data->pvd.application)) > > osinfo_entity_set_param(OSINFO_ENTITY(media), > > OSINFO_MEDIA_PROP_APPLICATION_ID, > > @@ -1159,19 +1168,19 @@ static void on_pvd_read(GObject *source, > > return; > > } > > > > - data->pvd.volume[MAX_VOLUME - 1] = 0; > > - g_strchomp(data->pvd.volume); > > + data->volume = g_strndup(data->pvd.volume, MAX_VOLUME); > > + g_strchomp(data->volume); > > > > - data->pvd.system[MAX_SYSTEM - 1] = 0; > > - g_strchomp(data->pvd.system); > > + data->system = g_strndup(data->pvd.system, MAX_SYSTEM); > > + g_strchomp(data->system); > > > > - data->pvd.publisher[MAX_PUBLISHER - 1] = 0; > > - g_strchomp(data->pvd.publisher); > > + data->publisher = g_strndup(data->pvd.publisher, MAX_PUBLISHER); > > + g_strchomp(data->publisher); > > > > - data->pvd.application[MAX_APPLICATION - 1] = 0; > > + data->application = g_strndup(data->pvd.application, > MAX_APPLICATION); > > g_strchomp(data->pvd.application); > > This should be g_strchomp(data->application); > Fixed. > > Reviewed-by: Christophe Fergeau <cfergeau at redhat.com> > > Christophe > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/39680228/attachment.htm> From cfergeau at redhat.com Thu Feb 14 11:01:17 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 14 Feb 2019 12:01:17 +0100 Subject: [Libosinfo] [libosinfo PATCH 2/4] media: Don't assume identifiers are null terminated In-Reply-To: <CAAY6Xscc06+rYONBROere37rk1-d=uY9moB8uz3EPy-QEP-P4A@mail.gmail.com> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-3-fidencio@redhat.com> <20190214095705.GE20161@natto.ory.fergeau.eu> <CAAY6Xscc06+rYONBROere37rk1-d=uY9moB8uz3EPy-QEP-P4A@mail.gmail.com> Message-ID: <20190214110117.GI20161@natto.ory.fergeau.eu> On Thu, Feb 14, 2019 at 11:05:39AM +0100, Fabiano Fid?ncio wrote: > On Thu, Feb 14, 2019 at 10:57 AM Christophe Fergeau <cfergeau at redhat.com> > wrote: > > > Hey, > > > > On Wed, Feb 13, 2019 at 08:19:25PM +0100, Fabiano Fid?ncio wrote: > > > Identifiers as volume-id, application, publisher, and system are not > > > null terminated and cannot be assumed as so. > > > > > > By assuming those are null terminated strings, libosinfo ends up not > > > counting the last character of a MAX_* string and, consequently, not > > > properly identifying medias that have their identifiers with the MAX_* > > > size. > > > > > > One example is the ubuntu-18.04.1.0-live-server-amd64.iso media, which > > > has as volume-id 'Ubuntu-Server 18.04.1+ LTS amd64'. As the volume-id > > > has exactly 32 characters it's never been matched as when reading the > > > media's volume-id it'd be read as 'Ubuntu-Server 18.04.1+ LTS amd6'. > > > > I don't think we have any test case for that code, do we? > > > > We don't have any specific test case for this code. But the whole > test-isodetect relies on this (and that's the way I found out the issue > when adding the new test data). > > Do you want a specific test for this or are you fine with the patch 4 > covering this case? Ideally we would have a test case for this code, but this is just something to add to the bottom of the project todo ;) Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/75e3484d/attachment.sig> From cfergeau at redhat.com Thu Feb 14 11:01:47 2019 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 14 Feb 2019 12:01:47 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex In-Reply-To: <CAAY6XscYGXz=VrwxzqNJyvEw_vCy_nF_2S16FSOiuxRNmEoPCA@mail.gmail.com> References: <20190213191927.12812-1-fidencio@redhat.com> <20190213191927.12812-2-fidencio@redhat.com> <20190214094604.GD20161@natto.ory.fergeau.eu> <CAAY6XscYGXz=VrwxzqNJyvEw_vCy_nF_2S16FSOiuxRNmEoPCA@mail.gmail.com> Message-ID: <20190214110147.GJ20161@natto.ory.fergeau.eu> On Thu, Feb 14, 2019 at 11:03:57AM +0100, Fabiano Fid?ncio wrote: > On Thu, Feb 14, 2019 at 10:46 AM Christophe Fergeau <cfergeau at redhat.com> > wrote: > > > On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fid?ncio wrote: > > > The first release of Ubuntu ISOs usually have their volume-id as, for > > > instance: > > > Ubuntu-Server 18.04 LTS amd64 > > > > > > Whenever a new release is done, a new digit is added as, for instance: > > > Ubuntu-Server 18.04.1 LTS amd64 > > > > > > However, at least with 18.04, they had a new release for the server > > > media that looks like: > > > Ubuntu-Server 18.04.1+ LTS amd64 > > > > > > This '+' addition breaks the current used regular expression to match > > > the media's volume-id. In order to take a safer path, let's expand all > > > the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead, > > > being able then to also match the '+'. > > > > > > The command used to change all the entries is: > > > sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in > > > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > > --- > > > data/os/ubuntu.com/ubuntu-10.04.xml.in | 4 ++-- > > > data/os/ubuntu.com/ubuntu-12.04.xml.in | 8 ++++---- > > > data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 ++++---- > > > data/os/ubuntu.com/ubuntu-14.10.xml.in | 8 ++++---- > > > data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++---- > > > data/os/ubuntu.com/ubuntu-15.10.xml.in | 8 ++++---- > > > data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++------- > > > data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++-------- > > > data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++------- > > > data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------ > > > data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++----- > > > data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------ > > > data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++----- > > > data/os/ubuntu.com/ubuntu-6.06.xml.in | 28 +++++++++++++------------- > > > data/os/ubuntu.com/ubuntu-8.04.xml.in | 12 +++++------ > > > data/os/ubuntu.com/ubuntu-9.04.xml.in | 8 ++++---- > > > > A bunch of the older releases don't look for xx.yy.zz in the volume id, > > but only for xx.yy. Your patch is missing these. It's not clear to me if > > it's intentional that we don't have these matches for these releases, or > > if it's just something that was overlooked. > > > > I guess it's been overlooked for a few years :-) > I'll do the changes on those files as well to keep them as the others. > > Do you want to see a v2 of this patch? Feel free to push directly. Christophe > > [snip] -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190214/e4d61edb/attachment.sig> From crobinso at redhat.com Thu Feb 14 17:14:30 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:14:30 -0500 Subject: [Libosinfo] [osinfo-db PATCH 1/9] fedora, kickstart: Accept initrd as injection-method In-Reply-To: <20181221140941.10490-2-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-2-fidencio@redhat.com> Message-ID: <13095002-b47b-91a9-f794-0aee26ec642a@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../fedora-kickstart-desktop.xml.in | 15 ++++++++++++--- > .../fedora-kickstart-jeos.xml.in | 15 ++++++++++++--- > 2 files changed, 24 insertions(+), 6 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:15:31 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:15:31 -0500 Subject: [Libosinfo] [osinfo-db PATCH 2/9] fedora, kickstart: Use "installation-source" In-Reply-To: <20181221140941.10490-4-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-4-fidencio@redhat.com> Message-ID: <cff96917-7d31-69cd-82ac-cfbb725f8bb0@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > installation-source can be used in order to decide whether the > installation will be done from the media or from the network. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 4 ++-- > .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:17:19 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:17:19 -0500 Subject: [Libosinfo] [osinfo-db PATCH 3/9] silverblue29: Add tree information In-Reply-To: <20181221140941.10490-5-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-5-fidencio@redhat.com> Message-ID: <63142028-e70d-e2f3-56cd-438ace721e7a@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/fedoraproject.org/silverblue-29.xml.in | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/data/os/fedoraproject.org/silverblue-29.xml.in b/data/os/fedoraproject.org/silverblue-29.xml.in > index 369b0b7..444de82 100644 > --- a/data/os/fedoraproject.org/silverblue-29.xml.in > +++ b/data/os/fedoraproject.org/silverblue-29.xml.in > @@ -23,6 +23,16 @@ > <initrd>isolinux/initrd.img</initrd> > </media> > > + <tree arch="x86_64"> > + <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Silverblue/x86_64/os</url> > + <treeinfo> > + <family>Fedora</family> > + <variant>Silverblue</variant> > + <version>29</version> > + <arch>x86_64</arch> > + </treeinfo> > + </tree> > + > <resources arch="all"> > <minimum> > <n-cpus>1</n-cpus> > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:18:16 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:18:16 -0500 Subject: [Libosinfo] [osinfo-db PATCH 4/9] silverblue, kickstart: Accept initrd as injection-method In-Reply-To: <20181221140941.10490-6-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-6-fidencio@redhat.com> Message-ID: <ef315926-46d0-8e3b-c89f-fd503aeb33e3@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../silverblue-kickstart-desktop.xml.in | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:19:49 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:19:49 -0500 Subject: [Libosinfo] [osinfo-db PATCH 5/9] opensuse, autoyast: Accept initrd as injection-method In-Reply-To: <20181221140941.10490-7-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-7-fidencio@redhat.com> Message-ID: <8a1b6afe-510f-d6ba-8e6c-0c7b5e4ac860@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../opensuse.org/opensuse-autoyast-desktop.xml.in | 13 +++++++++++-- > .../opensuse.org/opensuse-autoyast-jeos.xml.in | 13 +++++++++++-- > 2 files changed, 22 insertions(+), 4 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> I've never actually tested initrdinject with opensuse so if it works... cool! I'm sure the method is sound I just didn't know if virt-install's injection machinery actually covers it - Cole From crobinso at redhat.com Thu Feb 14 17:26:10 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:26:10 -0500 Subject: [Libosinfo] [osinfo-db PATCH 6/9] centos: Add its own kickstart files In-Reply-To: <20181221140941.10490-8-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-8-fidencio@redhat.com> Message-ID: <4f11ad28-e27e-fbed-a655-8a6413fab384@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > As CentOS can support initrd as injection-method (mainly when doing an > installation from "tree"), let's create its own files and stop using the > RHEL ones. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../centos-kickstart-desktop.xml.in | 197 ++++++++++++++++++ > .../centos.org/centos-kickstart-jeos.xml.in | 142 +++++++++++++ > 2 files changed, 339 insertions(+) > create mode 100644 data/install-script/centos.org/centos-kickstart-desktop.xml.in > create mode 100644 data/install-script/centos.org/centos-kickstart-jeos.xml.in > Reviewed-by: Cole Robinson <crobinso at redhat.com> I compared them to the RHEL versions... I see this was added: keyboard <xsl:value-of select="config/l10n-keyboard"/> vs. just 'keyboard us'. Should that be added to RHEL as well? - Cole From crobinso at redhat.com Thu Feb 14 17:26:38 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:26:38 -0500 Subject: [Libosinfo] [osinfo-db PATCH 7/9] centos: Use its own install-script In-Reply-To: <20181221140941.10490-9-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-9-fidencio@redhat.com> Message-ID: <27ea7c1b-e94c-8662-9c95-a792d8a51bb5@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/centos.org/centos-6.0.xml.in | 4 ++-- > data/os/centos.org/centos-6.1.xml.in | 4 ++-- > data/os/centos.org/centos-6.10.xml.in | 4 ++-- > data/os/centos.org/centos-6.2.xml.in | 4 ++-- > data/os/centos.org/centos-6.3.xml.in | 4 ++-- > data/os/centos.org/centos-6.4.xml.in | 4 ++-- > data/os/centos.org/centos-6.5.xml.in | 4 ++-- > data/os/centos.org/centos-6.6.xml.in | 4 ++-- > data/os/centos.org/centos-6.7.xml.in | 4 ++-- > data/os/centos.org/centos-6.8.xml.in | 4 ++-- > data/os/centos.org/centos-6.9.xml.in | 4 ++-- > data/os/centos.org/centos-7.0.xml.in | 4 ++-- > 12 files changed, 24 insertions(+), 24 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:28:21 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:28:21 -0500 Subject: [Libosinfo] [osinfo-db PATCH 8/9] centos: Add "centos7" as short-id In-Reply-To: <20181221140941.10490-10-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-10-fidencio@redhat.com> Message-ID: <1896dd25-862e-6143-c72d-109c887db9e6@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/centos.org/centos-7.0.xml.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in > index 8b3531e..cc583b9 100644 > --- a/data/os/centos.org/centos-7.0.xml.in > +++ b/data/os/centos.org/centos-7.0.xml.in > @@ -3,6 +3,7 @@ > See http://www.gnu.org/licenses/ for a copy of the license text --> > <os id="http://centos.org/centos/7.0"> > <short-id>centos7.0</short-id> > + <short-id>centos7</short-id> > <_name>CentOS 7.0</_name> > <version>7.0</version> > <_vendor>CentOS</_vendor> > Huh I didn't know we could do that, but I see we do the same for debian distros, so it makes sense Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:30:56 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:30:56 -0500 Subject: [Libosinfo] [osinfo-db PATCH 9/9] centos7: Increase the recommended ram size In-Reply-To: <20181221140941.10490-11-fidencio@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-11-fidencio@redhat.com> Message-ID: <86a1527d-39a0-1236-4884-9d60c90ae3e2@redhat.com> On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > When doing installation from "tree" we need at least 2GB of RAM in order > to decompress the needed files, otherwise the kickstart installation > will just fail. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/centos.org/centos-7.0.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 17:33:14 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 12:33:14 -0500 Subject: [Libosinfo] [libosinfo PATCH] pureos: Add test data for pureos8 In-Reply-To: <20190212194931.30849-1-fidencio@redhat.com> References: <20190212194931.30849-1-fidencio@redhat.com> Message-ID: <84c65c51-d552-d805-5e70-fe0e6b1c3b55@redhat.com> On 2/12/19 2:49 PM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > ...0-gnome-live_20180904-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ > ...0-gnome-live_20181210-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ > ...0-gnome-live_20190128-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ > ...0-gnome-live_20190210-amd64.hybrid.iso.txt | 29 +++++++++++++++++++ > 4 files changed, 116 insertions(+) > create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20180904-amd64.hybrid.iso.txt > create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20181210-amd64.hybrid.iso.txt > create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190128-amd64.hybrid.iso.txt > create mode 100644 tests/isodata/pureos/pureos8/pureos-8.0-gnome-live_20190210-amd64.hybrid.iso.txt Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 14 18:04:48 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 14 Feb 2019 13:04:48 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 00/13] Fix kernel/initrd of Ubuntu (desktop) ISOs In-Reply-To: <20190211084355.18468-1-fidencio@redhat.com> References: <20190211084355.18468-1-fidencio@redhat.com> Message-ID: <02690bbb-efab-fb84-45d8-a472edc149d9@redhat.com> On 2/11/19 3:43 AM, Fabiano Fid?ncio wrote: > Ubuntu's ISOs do not have their initrd/kernel files named consistently > accross the releases. Let's fix those for desktop ISOs according to: > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From fabiano at fidencio.org Thu Feb 14 21:36:06 2019 From: fabiano at fidencio.org (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 14 Feb 2019 22:36:06 +0100 Subject: [Libosinfo] [osinfo-db PATCH] haiku: Change the family name to "haiku" Message-ID: <1550180166-4086-1-git-send-email-fabiano@fidencio.org> After a discussion with one of the developers of the Haiku project, it's been pointed out that "haiku" should *not* used "beos" as family and, most likely, "haiku" would be a more appropriate family name. Signed-off-by: Fabiano Fid?ncio <fabiano at fidencio.org> --- data/os/haiku-os.org/haiku-nightly.xml.in | 2 +- data/os/haiku-os.org/haiku-r1alpha1.xml.in | 2 +- data/os/haiku-os.org/haiku-r1alpha2.xml.in | 2 +- data/os/haiku-os.org/haiku-r1alpha3.xml.in | 2 +- data/os/haiku-os.org/haiku-r1alpha4.1.xml.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/os/haiku-os.org/haiku-nightly.xml.in b/data/os/haiku-os.org/haiku-nightly.xml.in index 629bdce..4dfd660 100644 --- a/data/os/haiku-os.org/haiku-nightly.xml.in +++ b/data/os/haiku-os.org/haiku-nightly.xml.in @@ -4,7 +4,7 @@ <_name>Haiku Nightly</_name> <version>nightly</version> <_vendor>Haiku, Inc.</_vendor> - <family>beos</family> + <family>haiku</family> <distro>haiku</distro> <upgrades id="http://haiku-os.org/haiku/r1alpha4.1"/> <derives-from id="http://haiku-os.org/haiku/r1alpha4.1"/> diff --git a/data/os/haiku-os.org/haiku-r1alpha1.xml.in b/data/os/haiku-os.org/haiku-r1alpha1.xml.in index af9301f..70b02a2 100644 --- a/data/os/haiku-os.org/haiku-r1alpha1.xml.in +++ b/data/os/haiku-os.org/haiku-r1alpha1.xml.in @@ -4,7 +4,7 @@ <_name>Haiku R1/Alpha1</_name> <version>r1alpha1</version> <_vendor>Haiku, Inc.</_vendor> - <family>beos</family> + <family>haiku</family> <distro>haiku</distro> <release-date>2009-09-14</release-date> diff --git a/data/os/haiku-os.org/haiku-r1alpha2.xml.in b/data/os/haiku-os.org/haiku-r1alpha2.xml.in index 52d0ede..b2fdf23 100644 --- a/data/os/haiku-os.org/haiku-r1alpha2.xml.in +++ b/data/os/haiku-os.org/haiku-r1alpha2.xml.in @@ -4,7 +4,7 @@ <_name>Haiku R1/Alpha2</_name> <version>r1alpha2</version> <_vendor>Haiku, Inc.</_vendor> - <family>beos</family> + <family>haiku</family> <distro>haiku</distro> <upgrades id="http://haiku-os.org/haiku/r1alpha1"/> <derives-from id="http://haiku-os.org/haiku/r1alpha1"/> diff --git a/data/os/haiku-os.org/haiku-r1alpha3.xml.in b/data/os/haiku-os.org/haiku-r1alpha3.xml.in index 12bdd78..86f3614 100644 --- a/data/os/haiku-os.org/haiku-r1alpha3.xml.in +++ b/data/os/haiku-os.org/haiku-r1alpha3.xml.in @@ -4,7 +4,7 @@ <_name>Haiku R1/Alpha3</_name> <version>r1alpha3</version> <_vendor>Haiku, Inc.</_vendor> - <family>beos</family> + <family>haiku</family> <distro>haiku</distro> <upgrades id="http://haiku-os.org/haiku/r1alpha2"/> <derives-from id="http://haiku-os.org/haiku/r1alpha2"/> diff --git a/data/os/haiku-os.org/haiku-r1alpha4.1.xml.in b/data/os/haiku-os.org/haiku-r1alpha4.1.xml.in index 1fb3dba..db3b829 100644 --- a/data/os/haiku-os.org/haiku-r1alpha4.1.xml.in +++ b/data/os/haiku-os.org/haiku-r1alpha4.1.xml.in @@ -4,7 +4,7 @@ <_name>Haiku R1/Alpha4.1</_name> <version>r1alpha4.1</version> <_vendor>Haiku, Inc.</_vendor> - <family>beos</family> + <family>haiku</family> <distro>haiku</distro> <upgrades id="http://haiku-os.org/haiku/r1alpha3"/> <derives-from id="http://haiku-os.org/haiku/r1alpha3"/> -- 1.8.3.1 From ptoscano at redhat.com Fri Feb 15 11:48:20 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:20 +0100 Subject: [Libosinfo] [PATCH 0/8] Support rolling distributions Message-ID: <20190215114828.4865-1-ptoscano@redhat.com> This series adds a simple bit needed to properly track rolling distributions: with a "rolling" release status, it is easier for libosinfo users to handle this kind of distributions properly (e.g. by never considering them EOL). osinfo-db: Pino Toscano (4): schema: add 'rolling' as release status archlinux: add Arch Linux data gentoo: add Gentoo Linux data voidlinux: add Void Linux data libosinfo: Pino Toscano (4): os: add OSINFO_RELEASE_STATUS_ROLLING archlinux: add Arch Linux test data gentoo: add Gentoo Linux test data voidlinux: add Void Linux test data -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:21 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:21 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/8] schema: add 'rolling' as release status In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-2-ptoscano@redhat.com> Add 'rolling' as possible value for the 'release-status' tag: this way, it will be possible to mark rolling distributions as such, making users able to deal with these distributions differently if needed. Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- data/schema/osinfo.rng.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in index 6fc03a1..d778239 100644 --- a/data/schema/osinfo.rng.in +++ b/data/schema/osinfo.rng.in @@ -884,7 +884,7 @@ <define name='release-status'> <element name='release-status'> <data type="string"> - <param name="pattern">snapshot|prerelease|released</param> + <param name="pattern">snapshot|prerelease|released|rolling</param> </data> </element> </define> -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:22 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:22 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/8] archlinux: add Arch Linux data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-3-ptoscano@redhat.com> Set as rolling distribution, with all the devices available in a modern Linux kernel. Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- .../os/archlinux.org/archlinux-rolling.xml.in | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 data/os/archlinux.org/archlinux-rolling.xml.in diff --git a/data/os/archlinux.org/archlinux-rolling.xml.in b/data/os/archlinux.org/archlinux-rolling.xml.in new file mode 100644 index 0000000..2a5b740 --- /dev/null +++ b/data/os/archlinux.org/archlinux-rolling.xml.in @@ -0,0 +1,54 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://archlinux.org/archlinux/rolling"> + <short-id>archlinux</short-id> + <_name>Arch Linux</_name> + <_vendor>Arch Linux</_vendor> + <family>linux</family> + <distro>archlinux</distro> + + <release-status>rolling</release-status> + + <devices> + <device id="http://pcisig.com/pci/1033/0194"/> <!-- nec-xhci --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon --> + <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console --> + <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi --> + <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng --> + <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p --> + <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net --> + <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block --> + <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console --> + <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng --> + <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon --> + <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi --> + <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p --> + <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input --> + <device id="http://pcisig.com/pci/1b36/0004"/> <!-- qemu-xhci --> + <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl --> + <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 --> + <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> + <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet --> + </devices> + + <resources arch="all"> + <minimum> + <ram>536870912</ram> + </minimum> + </resources> + + <media arch="x86_64" live="true"> + <iso> + <volume-id>ARCH_\d{6}</volume-id> + <publisher-id>ARCH LINUX &lt;HTTP://WWW.ARCHLINUX.ORG&gt;</publisher-id> + <application-id>ARCH LINUX LIVE/RESCUE CD</application-id> + </iso> + </media> + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:23 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:23 +0100 Subject: [Libosinfo] [osinfo-db PATCH 3/8] gentoo: add Gentoo Linux data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-4-ptoscano@redhat.com> Set as rolling distribution, with all the devices available in a modern Linux kernel. Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- data/os/gentoo.org/gentoo-rolling.xml.in | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 data/os/gentoo.org/gentoo-rolling.xml.in diff --git a/data/os/gentoo.org/gentoo-rolling.xml.in b/data/os/gentoo.org/gentoo-rolling.xml.in new file mode 100644 index 0000000..6b8159b --- /dev/null +++ b/data/os/gentoo.org/gentoo-rolling.xml.in @@ -0,0 +1,59 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://gentoo.org/gentoo/rolling"> + <short-id>gentoo</short-id> + <_name>Gentoo Linux</_name> + <_vendor>Gentoo Foundation</_vendor> + <family>linux</family> + <distro>gentoo</distro> + + <release-status>rolling</release-status> + + <devices> + <device id="http://pcisig.com/pci/1033/0194"/> <!-- nec-xhci --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon --> + <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console --> + <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi --> + <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng --> + <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p --> + <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net --> + <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block --> + <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console --> + <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng --> + <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon --> + <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi --> + <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p --> + <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input --> + <device id="http://pcisig.com/pci/1b36/0004"/> <!-- qemu-xhci --> + <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl --> + <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 --> + <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> + <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet --> + </devices> + + <resources arch="all"> + <minimum> + <ram>268435456</ram> + <storage>2952790016</storage> + </minimum> + </resources> + + <media arch="i686"> + <iso> + <volume-id>Gentoo x86 \d{8}T\d{6}Z</volume-id> + </iso> + </media> + + <media arch="x86_64"> + <iso> + <volume-id>Gentoo amd64 \d{8}T\d{6}Z</volume-id> + </iso> + </media> + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:24 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:24 +0100 Subject: [Libosinfo] [osinfo-db PATCH 4/8] voidlinux: add Void Linux data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-5-ptoscano@redhat.com> Set as rolling distribution, with all the devices available in a modern Linux kernel. Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- .../os/voidlinux.org/voidlinux-rolling.xml.in | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 data/os/voidlinux.org/voidlinux-rolling.xml.in diff --git a/data/os/voidlinux.org/voidlinux-rolling.xml.in b/data/os/voidlinux.org/voidlinux-rolling.xml.in new file mode 100644 index 0000000..156eb8b --- /dev/null +++ b/data/os/voidlinux.org/voidlinux-rolling.xml.in @@ -0,0 +1,59 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://voidlinux.org/voidlinux/rolling"> + <short-id>voidlinux</short-id> + <_name>Void Linux</_name> + <_vendor>Void Linux</_vendor> + <family>linux</family> + <distro>voidlinux</distro> + + <release-status>rolling</release-status> + + <devices> + <device id="http://pcisig.com/pci/1033/0194"/> <!-- nec-xhci --> + <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net --> + <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block --> + <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon --> + <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console --> + <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi --> + <device id="http://pcisig.com/pci/1af4/1005"/> <!-- virtio-rng --> + <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p --> + <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net --> + <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block --> + <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console --> + <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng --> + <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon --> + <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi --> + <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p --> + <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input --> + <device id="http://pcisig.com/pci/1b36/0004"/> <!-- qemu-xhci --> + <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl --> + <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e --> + <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 --> + <device id="http://pcisig.com/pci/8086/2668"/> <!-- ich6 --> + <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> + <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 --> + <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet --> + </devices> + + <resources arch="all"> + <minimum> + <ram>100663296</ram> + <storage>367001600</storage> + </minimum> + </resources> + + <media arch="i686" live="true"> + <iso> + <volume-id>VOID_LIVE</volume-id> + </iso> + </media> + + <media arch="x86_64" live="true"> + <iso> + <volume-id>VOID_LIVE</volume-id> + </iso> + </media> + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:25 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:25 +0100 Subject: [Libosinfo] [libosinfo PATCH 5/8] os: add OSINFO_RELEASE_STATUS_ROLLING In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-6-ptoscano@redhat.com> Add the OSINFO_RELEASE_STATUS_ROLLING value to the OsinfoReleaseStatus enum, to track the new "rolling" release-status available in the osinfo schema. Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- osinfo/osinfo_os.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h index 5e677e1..cbebd59 100644 --- a/osinfo/osinfo_os.h +++ b/osinfo/osinfo_os.h @@ -91,11 +91,14 @@ struct _OsinfoOsClass * development snapshots of GNOME and nightly build ISOs of Fedora etc. * @OSINFO_RELEASE_STATUS_PRERELEASE: A pre-release. For example, alpha and * beta pre-releases of Fedora etc. + * @OSINFO_RELEASE_STATUS_ROLLING: A rolling version of an OS and thus with no + * actual releases. For example, Gentoo, Arch Linux, etc. */ typedef enum { OSINFO_RELEASE_STATUS_RELEASED, OSINFO_RELEASE_STATUS_SNAPSHOT, - OSINFO_RELEASE_STATUS_PRERELEASE + OSINFO_RELEASE_STATUS_PRERELEASE, + OSINFO_RELEASE_STATUS_ROLLING } OsinfoReleaseStatus; GType osinfo_os_get_type(void); -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:26 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:26 +0100 Subject: [Libosinfo] [libosinfo PATCH 6/8] archlinux: add Arch Linux test data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-7-ptoscano@redhat.com> Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- .../archlinux-2019.02.01-x86_64.iso.txt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/isodata/archlinux/archlinux/archlinux-2019.02.01-x86_64.iso.txt diff --git a/tests/isodata/archlinux/archlinux/archlinux-2019.02.01-x86_64.iso.txt b/tests/isodata/archlinux/archlinux/archlinux-2019.02.01-x86_64.iso.txt new file mode 100644 index 0000000..d331556 --- /dev/null +++ b/tests/isodata/archlinux/archlinux/archlinux-2019.02.01-x86_64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: ARCH_201902 +Volume set id: +Publisher id: ARCH LINUX <HTTP://WWW.ARCHLINUX.ORG> +Data preparer id: PREPARED BY MKARCHISO +Application id: ARCH LINUX LIVE/RESCUE CD +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: 307200 +El Torito VD version 1 found, boot catalog is in sector 40 +NO Joliet present +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 8029 32809 -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:27 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:27 +0100 Subject: [Libosinfo] [libosinfo PATCH 7/8] gentoo: add Gentoo Linux test data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-8-ptoscano@redhat.com> Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- ...all-amd64-minimal-20190212T214502Z.iso.txt | 29 +++++++++++++++++++ ...stall-x86-minimal-20190214T185527Z.iso.txt | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 tests/isodata/gentoo/gentoo/install-amd64-minimal-20190212T214502Z.iso.txt create mode 100644 tests/isodata/gentoo/gentoo/install-x86-minimal-20190214T185527Z.iso.txt diff --git a/tests/isodata/gentoo/gentoo/install-amd64-minimal-20190212T214502Z.iso.txt b/tests/isodata/gentoo/gentoo/install-amd64-minimal-20190212T214502Z.iso.txt new file mode 100644 index 0000000..09743ac --- /dev/null +++ b/tests/isodata/gentoo/gentoo/install-amd64-minimal-20190212T214502Z.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Gentoo amd64 20190212T214502Z +Volume set id: +Publisher id: +Data preparer id: +Application id: MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING +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: 131578 +El Torito VD version 1 found, boot catalog is in sector 39 +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 CC4 3268 diff --git a/tests/isodata/gentoo/gentoo/install-x86-minimal-20190214T185527Z.iso.txt b/tests/isodata/gentoo/gentoo/install-x86-minimal-20190214T185527Z.iso.txt new file mode 100644 index 0000000..e2ec44a --- /dev/null +++ b/tests/isodata/gentoo/gentoo/install-x86-minimal-20190214T185527Z.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: Gentoo x86 20190214T185527Z +Volume set id: +Publisher id: +Data preparer id: +Application id: MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING +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: 117277 +El Torito VD version 1 found, boot catalog is in sector 39 +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 CC4 3268 -- 2.20.1 From ptoscano at redhat.com Fri Feb 15 11:48:28 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Fri, 15 Feb 2019 12:48:28 +0100 Subject: [Libosinfo] [libosinfo PATCH 8/8] voidlinux: add Void Linux test data In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <20190215114828.4865-9-ptoscano@redhat.com> Signed-off-by: Pino Toscano <ptoscano at redhat.com> --- .../voidlinux/void-live-i686-20181111.iso.txt | 29 +++++++++++++++++++ .../void-live-x86_64-20181111.iso.txt | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 tests/isodata/voidlinux/voidlinux/void-live-i686-20181111.iso.txt create mode 100644 tests/isodata/voidlinux/voidlinux/void-live-x86_64-20181111.iso.txt diff --git a/tests/isodata/voidlinux/voidlinux/void-live-i686-20181111.iso.txt b/tests/isodata/voidlinux/voidlinux/void-live-i686-20181111.iso.txt new file mode 100644 index 0000000..1631f09 --- /dev/null +++ b/tests/isodata/voidlinux/voidlinux/void-live-i686-20181111.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: VOID_LIVE +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.1 2018.09.16.150917, LIBISOBURN-1.5.1, LIBISOFS-1.5.1, LIBBURN-1.5.1 +Application id: +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: 172032 +El Torito VD version 1 found, boot catalog is in sector 38 +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 4027 16423 diff --git a/tests/isodata/voidlinux/voidlinux/void-live-x86_64-20181111.iso.txt b/tests/isodata/voidlinux/voidlinux/void-live-x86_64-20181111.iso.txt new file mode 100644 index 0000000..111648c --- /dev/null +++ b/tests/isodata/voidlinux/voidlinux/void-live-x86_64-20181111.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: VOID_LIVE +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.5.1 2018.09.16.150917, LIBISOBURN-1.5.1, LIBISOFS-1.5.1, LIBBURN-1.5.1 +Application id: +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: 184320 +El Torito VD version 1 found, boot catalog is in sector 38 +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 4027 16423 -- 2.20.1 From fidencio at redhat.com Mon Feb 18 07:58:52 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 08:58:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH 8/9] centos: Add "centos7" as short-id In-Reply-To: <1896dd25-862e-6143-c72d-109c887db9e6@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-10-fidencio@redhat.com> <1896dd25-862e-6143-c72d-109c887db9e6@redhat.com> Message-ID: <CAAY6Xsfngf25YKhgEFmXxzBP3rmFEgvBAh1nGxL_WDP47zb7hA@mail.gmail.com> On Thu, Feb 14, 2019 at 6:28 PM Cole Robinson <crobinso at redhat.com> wrote: > On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > data/os/centos.org/centos-7.0.xml.in | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/ > centos.org/centos-7.0.xml.in > > index 8b3531e..cc583b9 100644 > > --- a/data/os/centos.org/centos-7.0.xml.in > > +++ b/data/os/centos.org/centos-7.0.xml.in > > @@ -3,6 +3,7 @@ > > See http://www.gnu.org/licenses/ for a copy of the license text > --> > > <os id="http://centos.org/centos/7.0"> > > <short-id>centos7.0</short-id> > > + <short-id>centos7</short-id> > > <_name>CentOS 7.0</_name> > > <version>7.0</version> > > <_vendor>CentOS</_vendor> > > > > Huh I didn't know we could do that, but I see we do the same for debian > distros, so it makes sense > > Cole, I will end up dropping this patch. While we can do that (as in our schema allows that), there's no code on libosinfo that would properly deal with a second short-id. So, for now, I'll not go for this patch. > Reviewed-by: Cole Robinson <crobinso at redhat.com> > > - Cole > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190218/b9f1e219/attachment.htm> From fidencio at redhat.com Mon Feb 18 08:00:01 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 09:00:01 +0100 Subject: [Libosinfo] [osinfo-db PATCH 9/9] centos7: Increase the recommended ram size In-Reply-To: <86a1527d-39a0-1236-4884-9d60c90ae3e2@redhat.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-11-fidencio@redhat.com> <86a1527d-39a0-1236-4884-9d60c90ae3e2@redhat.com> Message-ID: <CAAY6XsfgtHQ0dORWO_6yLy-t1q1Ye0sm2_uoXfNnvLXWX0HjJg@mail.gmail.com> On Thu, Feb 14, 2019 at 6:30 PM Cole Robinson <crobinso at redhat.com> wrote: > On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > > When doing installation from "tree" we need at least 2GB of RAM in order > > to decompress the needed files, otherwise the kickstart installation > > will just fail. > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > data/os/centos.org/centos-7.0.xml.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > And also I'll drop this one. This one should be using "network-installer" resources added recently (and already released). When I wrote this down, we didn't the "network-installer" concept around. > > Reviewed-by: Cole Robinson <crobinso at redhat.com> > > - Cole > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190218/533b8990/attachment.htm> From fidencio at redhat.com Mon Feb 18 09:36:17 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 10:36:17 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/2] ubuntu18.04: Update URIs to 18.04.2 release Message-ID: <20190218093618.29315-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- Pushed under "test breakage" rule --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index e58e759..0fa2e29 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -32,7 +32,7 @@ </resources> <media arch="x86_64"> - <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso</url> + <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-amd64.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> </iso> @@ -40,7 +40,7 @@ <initrd>install/initrd.gz</initrd> </media> <media arch="x86_64" live="true"> - <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.1-desktop-amd64.iso</url> + <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url> <iso> <volume-id>Ubuntu 18.04(.\d\+?)? LTS amd64</volume-id> </iso> @@ -48,7 +48,7 @@ <initrd>casper/initrd.lz</initrd> </media> <media arch="aarch64"> - <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-arm64.iso</url> + <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-arm64.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS arm64</volume-id> </iso> @@ -56,7 +56,7 @@ <initrd>install/initrd.gz</initrd> </media> <media arch="ppc64le"> - <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-ppc64el.iso</url> + <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-ppc64el.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS ppc64</volume-id> </iso> @@ -64,7 +64,7 @@ <initrd>install/initrd.gz</initrd> </media> <media arch="s390x"> - <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-s390x.iso</url> + <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-s390x.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS s390x</volume-id> </iso> -- 2.20.1 From fidencio at redhat.com Mon Feb 18 09:36:18 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 10:36:18 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] debian: Update URIs to 9.8.0 release In-Reply-To: <20190218093618.29315-1-fidencio@redhat.com> References: <20190218093618.29315-1-fidencio@redhat.com> Message-ID: <20190218093618.29315-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- Pushed under "test breakage" rule --- data/os/debian.org/debian-9.xml.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in index 2c02a69..f3a0d58 100644 --- a/data/os/debian.org/debian-9.xml.in +++ b/data/os/debian.org/debian-9.xml.in @@ -52,7 +52,7 @@ <!-- Network installer --> <media arch="i686"> <variant id="universal-netinst"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/i386/iso-cd/debian-9.7.0-i386-netinst.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/i386/iso-cd/debian-9.8.0-i386-netinst.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id> </iso> @@ -61,7 +61,7 @@ </media> <media arch="x86_64"> <variant id="universal-netinst"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/amd64/iso-cd/debian-9.7.0-amd64-netinst.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-cd/debian-9.8.0-amd64-netinst.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id> </iso> @@ -70,7 +70,7 @@ </media> <media arch="aarch64"> <variant id="universal-netinst"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/arm64/iso-cd/debian-9.7.0-arm64-netinst.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-cd/debian-9.8.0-arm64-netinst.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id> </iso> @@ -79,7 +79,7 @@ </media> <media arch="armv7l"> <variant id="universal-netinst"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/armhf/iso-cd/debian-9.7.0-armhf-netinst.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-cd/debian-9.8.0-armhf-netinst.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id> </iso> @@ -90,7 +90,7 @@ <!-- DVD --> <media arch="i686"> <variant id="universal"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/i386/iso-dvd/debian-9.7.0-i386-DVD-1.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/i386/iso-dvd/debian-9.8.0-i386-DVD-1.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id> </iso> @@ -99,7 +99,7 @@ </media> <media arch="x86_64"> <variant id="universal"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/amd64/iso-dvd/debian-9.7.0-amd64-DVD-1.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-dvd/debian-9.8.0-amd64-DVD-1.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id> </iso> @@ -108,7 +108,7 @@ </media> <media arch="aarch64"> <variant id="universal"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/arm64/iso-dvd/debian-9.7.0-arm64-DVD-1.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-dvd/debian-9.8.0-arm64-DVD-1.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id> </iso> @@ -117,7 +117,7 @@ </media> <media arch="armv7l"> <variant id="universal"/> - <url>http://cdimage.debian.org/cdimage/release/9.7.0/armhf/iso-dvd/debian-9.7.0-armhf-DVD-1.iso</url> + <url>http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-dvd/debian-9.8.0-armhf-DVD-1.iso</url> <iso> <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id> </iso> -- 2.20.1 From fidencio at redhat.com Mon Feb 18 09:40:25 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 10:40:25 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/2] debian, preseed: Fix typo in config's name Message-ID: <20190218094026.30983-1-fidencio@redhat.com> We've been using "user-fullname" instead "user-realname" in different profiles for quite a long time. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../install-script/debian.org/debian-preseed-desktop.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/install-script/debian.org/debian-preseed-desktop.xml.in b/data/install-script/debian.org/debian-preseed-desktop.xml.in index 42ed421..5e6f701 100644 --- a/data/install-script/debian.org/debian-preseed-desktop.xml.in +++ b/data/install-script/debian.org/debian-preseed-desktop.xml.in @@ -13,7 +13,7 @@ <!-- User options --> <param name="user-login" policy="required"/> - <param name="user-fullname" policy="optional"/> + <param name="user-realname" policy="optional"/> <param name="user-password" policy="optional"/> <param name="admin-password" policy="optional"/> @@ -72,8 +72,8 @@ <xsl:template name="user-fullname"> <xsl:choose> - <xsl:when test="config/user-fullname != ''"> - <xsl:value-of select="config/user-fullname"/> + <xsl:when test="config/user-realname != ''"> + <xsl:value-of select="config/user-realname"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="config/user-login"/> -- 2.20.1 From fidencio at redhat.com Mon Feb 18 09:40:26 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 10:40:26 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] opensuse, autoyast: Fix typo in config's name In-Reply-To: <20190218094026.30983-1-fidencio@redhat.com> References: <20190218094026.30983-1-fidencio@redhat.com> Message-ID: <20190218094026.30983-2-fidencio@redhat.com> We've been using "user-fullname" instead "user-realname" in different profiles for quite a long time. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in index 00fc6af..a4e5b03 100644 --- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in +++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in @@ -18,7 +18,7 @@ <!-- Account options --> <param name="admin-password" policy="optional"/> - <param name="user-fullname" policy="optional"/> + <param name="user-realname" policy="optional"/> <param name="user-login" policy="required"/> <param name="user-password" policy="optional"/> <param name="avatar-location" policy="optional"/> -- 2.20.1 From fidencio at redhat.com Mon Feb 18 09:42:20 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 10:42:20 +0100 Subject: [Libosinfo] [osinfo-db PATCH] pureos: Mark PureOS 8 as pre-release Message-ID: <20190218094220.31459-1-fidencio@redhat.com> It's still in Beta. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/pureos.net/pureos-8.xml.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/os/pureos.net/pureos-8.xml.in b/data/os/pureos.net/pureos-8.xml.in index 13c5ba6..488b9c0 100644 --- a/data/os/pureos.net/pureos-8.xml.in +++ b/data/os/pureos.net/pureos-8.xml.in @@ -9,6 +9,8 @@ <family>linux</family> <distro>pureos</distro> + <release-status>prerelease</release-status> + <resources arch="all"> <minimum> <cpu>1000000000</cpu> -- 2.20.1 From berrange at redhat.com Mon Feb 18 10:14:45 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 18 Feb 2019 10:14:45 +0000 Subject: [Libosinfo] [libosinfo PATCH] tests: Reduce code duplication in URI tests In-Reply-To: <1549294976-30648-1-git-send-email-fabiano@fidencio.org> References: <1549294976-30648-1-git-send-email-fabiano@fidencio.org> Message-ID: <20190218101445.GA32287@redhat.com> On Mon, Feb 04, 2019 at 04:42:56PM +0100, Fabiano Fid?ncio wrote: > From: Fabiano Fid?ncio <fidencio at redhat.com> > > Let's introduce a common file that does the check of the URI for all the > URI related tests. > > By doing this we can avoid code duplication while also avoiding to have > all the tests merged together into a single one, which is not so good as > limits the developer to run and wait for the whole set of tests instead > of having the ability to just run the a specific one. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> Reviewed-by: Daniel P. Berrang? <berrange at redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From berrange at redhat.com Mon Feb 18 10:16:16 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 18 Feb 2019 10:16:16 +0000 Subject: [Libosinfo] [osinfo-db PATCH 1/3] windows, unattend: Fix "arch" template In-Reply-To: <20190205194036.23797-2-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> <20190205194036.23797-2-fidencio@redhat.com> Message-ID: <20190218101616.GB32287@redhat.com> On Tue, Feb 05, 2019 at 08:40:34PM +0100, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../microsoft.com/windows-unattend-jeos.xml.in | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > index 3fd90e5..f738b86 100644 > --- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > +++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in > @@ -40,8 +40,11 @@ > > <xsl:template name="arch"> > <xsl:choose> > - <xsl:when test="count(config/hardware-arch) &gt; 0"> > - <xsl:value-of select="config/hardware-arch"/> > + <xsl:when test="config/hardware-arch = 'x86_64'"> > + <xsl:text>amd64</xsl:text> > + </xsl:when> > + <xsl:when test="config/hardware-arch = 'i386'"> > + <xsl:text>x86</xsl:text> identation looks messed up here as there's a mix of spaces & tabs > </xsl:when> > <xsl:otherwise> > <xsl:text>x86</xsl:text> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From berrange at redhat.com Mon Feb 18 10:16:48 2019 From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=) Date: Mon, 18 Feb 2019 10:16:48 +0000 Subject: [Libosinfo] [osinfo-db PATCH 0/3] Fixes for Windows JeOS installations In-Reply-To: <20190205194036.23797-1-fidencio@redhat.com> References: <20190205194036.23797-1-fidencio@redhat.com> Message-ID: <20190218101648.GC32287@redhat.com> On Tue, Feb 05, 2019 at 08:40:33PM +0100, Fabiano Fid?ncio wrote: > Those fixes are needed in order to perform an JeOS installation of a > Windows ISO. > > Fabiano Fid?ncio (3): > windows,unattend: Fix "arch" template > windows,unattend: Set password as plain text > windows,unattend: Fix group name > > .../microsoft.com/windows-unattend-jeos.xml.in | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) If whitespace in the first patch is fixed Reviewed-by: Daniel P. Berrang? <berrange at redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From fidencio at redhat.com Mon Feb 18 12:52:46 2019 From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=) Date: Mon, 18 Feb 2019 13:52:46 +0100 Subject: [Libosinfo] [PATCH 0/8] Support rolling distributions In-Reply-To: <20190215114828.4865-1-ptoscano@redhat.com> References: <20190215114828.4865-1-ptoscano@redhat.com> Message-ID: <ac06ff7ae51018acdf7ba6e4a7273629efa656e8.camel@redhat.com> On Fri, 2019-02-15 at 12:48 +0100, Pino Toscano wrote: > This series adds a simple bit needed to properly track rolling > distributions: with a "rolling" release status, it is easier for > libosinfo users to handle this kind of distributions properly (e.g. > by > never considering them EOL). > > osinfo-db: > Pino Toscano (4): > schema: add 'rolling' as release status > archlinux: add Arch Linux data > gentoo: add Gentoo Linux data > voidlinux: add Void Linux data > > libosinfo: > Pino Toscano (4): > os: add OSINFO_RELEASE_STATUS_ROLLING > archlinux: add Arch Linux test data > gentoo: add Gentoo Linux test data > voidlinux: add Void Linux test data > Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com> From fidencio at redhat.com Mon Feb 18 13:05:24 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 14:05:24 +0100 Subject: [Libosinfo] [libosinfo PATCH] test-uris-common: remove empty line at EOF Message-ID: <20190218130524.19434-1-fidencio@redhat.com> The empty line caused: tests/test-uris-common.c maint.mk: empty line(s) or no newline at EOF make: *** [maint.mk:926: sc_prohibit_empty_lines_at_EOF] Error 1 Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- Pushed under "build brekage" rule --- tests/test-uris-common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test-uris-common.c b/tests/test-uris-common.c index 0352ce1..8ebe4ea 100644 --- a/tests/test-uris-common.c +++ b/tests/test-uris-common.c @@ -107,4 +107,3 @@ void test_uris(OsinfoOsList *oslist, const gchar *prefix, TestURLFunc test_func) g_list_free(osel); } - -- 2.20.1 From fidencio at redhat.com Mon Feb 18 13:37:23 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 14:37:23 +0100 Subject: [Libosinfo] [libosinfo PATCH] tests: Add test-uris-common.h to the SOURCES Message-ID: <20190218133723.26395-1-fidencio@redhat.com> Otherwise some breakage can be seen when building libosinfo's RPM test-uris-common.c:24:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [Makefile:1296: test_mediauris-test-uris-common.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CCLD test-entity test-mediauris.c:27:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [Makefile:1282: test_mediauris-test-mediauris.o] Error 1 test-treeuris.c:27:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [Makefile:1394: test_treeuris-test-treeuris.o] Error 1 test-uris-common.c:24:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [Makefile:1408: test_treeuris-test-uris-common.o] Error 1 test-imageuris.c:27:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" ^~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [Makefile:1184: test_imageuris-test-imageuris.o] Error 1 test-uris-common.c:24:10: fatal error: test-uris-common.h: No such file or directory #include "test-uris-common.h" Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- Pushed under "build breakage" rule --- tests/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f073b41..a822af2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -113,15 +113,15 @@ test_isodetect_SOURCES = test-isodetect.c if HAVE_CURL test_mediauris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_mediauris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_mediauris_SOURCES = test-mediauris.c test-uris-common.c +test_mediauris_SOURCES = test-mediauris.c test-uris-common.c test-uris-common.h test_treeuris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_treeuris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_treeuris_SOURCES = test-treeuris.c test-uris-common.c +test_treeuris_SOURCES = test-treeuris.c test-uris-common.c test-uris-common.h test_imageuris_LDADD = $(COMMON_LDADD) $(CURL_LIBS) test_imageuris_CFLAGS = $(COMMON_CFLAGS) $(CURL_CFLAGS) -test_imageuris_SOURCES = test-imageuris.c test-uris-common.c +test_imageuris_SOURCES = test-imageuris.c test-uris-common.c test-uris-common.h endif test_install_script_LDADD = $(COMMON_LDADD) -- 2.20.1 From crobinso at redhat.com Mon Feb 18 18:06:18 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 13:06:18 -0500 Subject: [Libosinfo] [osinfo-db PATCH 8/9] centos: Add "centos7" as short-id In-Reply-To: <CAAY6Xsfngf25YKhgEFmXxzBP3rmFEgvBAh1nGxL_WDP47zb7hA@mail.gmail.com> References: <20181221140941.10490-1-fidencio@redhat.com> <20181221140941.10490-10-fidencio@redhat.com> <1896dd25-862e-6143-c72d-109c887db9e6@redhat.com> <CAAY6Xsfngf25YKhgEFmXxzBP3rmFEgvBAh1nGxL_WDP47zb7hA@mail.gmail.com> Message-ID: <550978b7-dd73-3a18-24da-802e70260eaa@redhat.com> On 2/18/19 2:58 AM, Fabiano Fid?ncio wrote: > > > On Thu, Feb 14, 2019 at 6:28 PM Cole Robinson <crobinso at redhat.com > <mailto:crobinso at redhat.com>> wrote: > > On 12/21/18 9:09 AM, Fabiano Fid?ncio wrote: > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com > <mailto:fidencio at redhat.com>> > > --- > >? data/os/centos.org/centos-7.0.xml.in > <http://centos.org/centos-7.0.xml.in> | 1 + > >? 1 file changed, 1 insertion(+) > > > > diff --git a/data/os/centos.org/centos-7.0.xml.in > <http://centos.org/centos-7.0.xml.in> > b/data/os/centos.org/centos-7.0.xml.in > <http://centos.org/centos-7.0.xml.in> > > index 8b3531e..cc583b9 100644 > > --- a/data/os/centos.org/centos-7.0.xml.in > <http://centos.org/centos-7.0.xml.in> > > +++ b/data/os/centos.org/centos-7.0.xml.in > <http://centos.org/centos-7.0.xml.in> > > @@ -3,6 +3,7 @@ > >? ? ? ?See http://www.gnu.org/licenses/ for a copy of the license > text --> > >? ? <os id="http://centos.org/centos/7.0"> > >? ? ? <short-id>centos7.0</short-id> > > +? ? <short-id>centos7</short-id> > >? ? ? <_name>CentOS 7.0</_name> > >? ? ? <version>7.0</version> > >? ? ? <_vendor>CentOS</_vendor> > > > > Huh I didn't know we could do that, but I see we do the same for debian > distros, so it makes sense > > > Cole, I will end up dropping this patch. > While we can do that (as in our schema allows that), there's no code on > libosinfo that would properly deal with a second short-id. > > So, for now, I'll not go for this patch. Hmm indeed, I made a note for myself to look into this and besides being allowed in the XML, and there being some ubuntu/debian data examples, I can't see any way to access the second short-id via the API. Too bad, would be helpful in some cases for sure - Cole From crobinso at redhat.com Mon Feb 18 20:13:30 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 15:13:30 -0500 Subject: [Libosinfo] [osinfo-db PATCH] haiku: Change the family name to "haiku" In-Reply-To: <1550180166-4086-1-git-send-email-fabiano@fidencio.org> References: <1550180166-4086-1-git-send-email-fabiano@fidencio.org> Message-ID: <247ba660-98b6-c9d1-6106-89d32c623c00@redhat.com> On 2/14/19 4:36 PM, Fabiano Fid?ncio wrote: > After a discussion with one of the developers of the Haiku project, it's > been pointed out that "haiku" should *not* used "beos" as family and, > most likely, "haiku" would be a more appropriate family name. > > Signed-off-by: Fabiano Fid?ncio <fabiano at fidencio.org> > --- > data/os/haiku-os.org/haiku-nightly.xml.in | 2 +- > data/os/haiku-os.org/haiku-r1alpha1.xml.in | 2 +- > data/os/haiku-os.org/haiku-r1alpha2.xml.in | 2 +- > data/os/haiku-os.org/haiku-r1alpha3.xml.in | 2 +- > data/os/haiku-os.org/haiku-r1alpha4.1.xml.in | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Mon Feb 18 20:17:30 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 15:17:30 -0500 Subject: [Libosinfo] [osinfo-db PATCH 1/2] debian, preseed: Fix typo in config's name In-Reply-To: <20190218094026.30983-1-fidencio@redhat.com> References: <20190218094026.30983-1-fidencio@redhat.com> Message-ID: <fbb3b1e6-907c-9b7d-022f-ad8224b19f2c@redhat.com> On 2/18/19 4:40 AM, Fabiano Fid?ncio wrote: > We've been using "user-fullname" instead "user-realname" in different > profiles for quite a long time. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../install-script/debian.org/debian-preseed-desktop.xml.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Mon Feb 18 20:20:07 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 15:20:07 -0500 Subject: [Libosinfo] [osinfo-db PATCH 2/2] opensuse, autoyast: Fix typo in config's name In-Reply-To: <20190218094026.30983-2-fidencio@redhat.com> References: <20190218094026.30983-1-fidencio@redhat.com> <20190218094026.30983-2-fidencio@redhat.com> Message-ID: <1bb10d91-93e2-c3dd-f8c2-6655db397ecd@redhat.com> On 2/18/19 4:40 AM, Fabiano Fid?ncio wrote: > We've been using "user-fullname" instead "user-realname" in different > profiles for quite a long time. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > index 00fc6af..a4e5b03 100644 > --- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > +++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > @@ -18,7 +18,7 @@ > > <!-- Account options --> > <param name="admin-password" policy="optional"/> > - <param name="user-fullname" policy="optional"/> > + <param name="user-realname" policy="optional"/> > <param name="user-login" policy="required"/> > <param name="user-password" policy="optional"/> > <param name="avatar-location" policy="optional"/> > Isn't this missing an associated change later in the file? - Cole From crobinso at redhat.com Mon Feb 18 20:21:00 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 15:21:00 -0500 Subject: [Libosinfo] [osinfo-db PATCH] pureos: Mark PureOS 8 as pre-release In-Reply-To: <20190218094220.31459-1-fidencio@redhat.com> References: <20190218094220.31459-1-fidencio@redhat.com> Message-ID: <539a3507-26ff-1da6-1a1a-a60abdd96ad2@redhat.com> On 2/18/19 4:42 AM, Fabiano Fid?ncio wrote: > It's still in Beta. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/pureos.net/pureos-8.xml.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/data/os/pureos.net/pureos-8.xml.in b/data/os/pureos.net/pureos-8.xml.in > index 13c5ba6..488b9c0 100644 > --- a/data/os/pureos.net/pureos-8.xml.in > +++ b/data/os/pureos.net/pureos-8.xml.in > @@ -9,6 +9,8 @@ > <family>linux</family> > <distro>pureos</distro> > > + <release-status>prerelease</release-status> > + > <resources arch="all"> > <minimum> > <cpu>1000000000</cpu> > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From fidencio at redhat.com Mon Feb 18 20:46:16 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 18 Feb 2019 21:46:16 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] opensuse, autoyast: Fix typo in config's name In-Reply-To: <1bb10d91-93e2-c3dd-f8c2-6655db397ecd@redhat.com> References: <20190218094026.30983-1-fidencio@redhat.com> <20190218094026.30983-2-fidencio@redhat.com> <1bb10d91-93e2-c3dd-f8c2-6655db397ecd@redhat.com> Message-ID: <CAAY6XsecgTKybJYybhYzFaoXAbrKKB-Rw7c14YDCHhC6eHHoZA@mail.gmail.com> On Mon, Feb 18, 2019 at 9:20 PM Cole Robinson <crobinso at redhat.com> wrote: > On 2/18/19 4:40 AM, Fabiano Fid?ncio wrote: > > We've been using "user-fullname" instead "user-realname" in different > > profiles for quite a long time. > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > .../opensuse.org/opensuse-autoyast-desktop.xml.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/data/install-script/ > opensuse.org/opensuse-autoyast-desktop.xml.in b/data/install-script/ > opensuse.org/opensuse-autoyast-desktop.xml.in > > index 00fc6af..a4e5b03 100644 > > --- a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > > +++ b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > > @@ -18,7 +18,7 @@ > > > > <!-- Account options --> > > <param name="admin-password" policy="optional"/> > > - <param name="user-fullname" policy="optional"/> > > + <param name="user-realname" policy="optional"/> > > <param name="user-login" policy="required"/> > > <param name="user-password" policy="optional"/> > > <param name="avatar-location" policy="optional"/> > > > > Isn't this missing an associated change later in the file? > Indeed, do you want a v2 or can I do the change before pushing? > > - Cole > -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190218/d84d3fb7/attachment.htm> From crobinso at redhat.com Mon Feb 18 21:54:47 2019 From: crobinso at redhat.com (Cole Robinson) Date: Mon, 18 Feb 2019 16:54:47 -0500 Subject: [Libosinfo] [osinfo-db PATCH 2/2] opensuse, autoyast: Fix typo in config's name In-Reply-To: <CAAY6XsecgTKybJYybhYzFaoXAbrKKB-Rw7c14YDCHhC6eHHoZA@mail.gmail.com> References: <20190218094026.30983-1-fidencio@redhat.com> <20190218094026.30983-2-fidencio@redhat.com> <1bb10d91-93e2-c3dd-f8c2-6655db397ecd@redhat.com> <CAAY6XsecgTKybJYybhYzFaoXAbrKKB-Rw7c14YDCHhC6eHHoZA@mail.gmail.com> Message-ID: <7ee88ea1-2e44-29a2-06e2-f7cbe7f7fbd0@redhat.com> On 2/18/19 3:46 PM, Fabiano Fid?ncio wrote: > > > On Mon, Feb 18, 2019 at 9:20 PM Cole Robinson <crobinso at redhat.com > <mailto:crobinso at redhat.com>> wrote: > > On 2/18/19 4:40 AM, Fabiano Fid?ncio wrote: > > We've been using "user-fullname" instead "user-realname" in different > > profiles for quite a long time. > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com > <mailto:fidencio at redhat.com>> > > --- > >? .../opensuse.org/opensuse-autoyast-desktop.xml.in > <http://opensuse.org/opensuse-autoyast-desktop.xml.in>? ? ? ? ? ? ? > ?| 2 +- > >? 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git > a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > <http://opensuse.org/opensuse-autoyast-desktop.xml.in> > b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > <http://opensuse.org/opensuse-autoyast-desktop.xml.in> > > index 00fc6af..a4e5b03 100644 > > --- > a/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > <http://opensuse.org/opensuse-autoyast-desktop.xml.in> > > +++ > b/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in > <http://opensuse.org/opensuse-autoyast-desktop.xml.in> > > @@ -18,7 +18,7 @@ > >? > >? ? ? ? <!-- Account options --> > >? ? ? ? <param name="admin-password" policy="optional"/> > > -? ? ? <param name="user-fullname" policy="optional"/> > > +? ? ? <param name="user-realname" policy="optional"/> > >? ? ? ? <param name="user-login" policy="required"/> > >? ? ? ? <param name="user-password" policy="optional"/> > >? ? ? ? <param name="avatar-location" policy="optional"/> > > > > Isn't this missing an associated change later in the file? > > > Indeed, do you want a v2 or can I do the change before pushing? > ? Just fixing+pushing is fine by me? Thanks, Cole From fidencio at redhat.com Tue Feb 19 15:29:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:48 +0100 Subject: [Libosinfo] [osinfo-db PATCH 00/29] Improvements/Cleanups on Ubuntu installer scripts Message-ID: <20190219153017.9756-1-fidencio@redhat.com> This patch series aim to have: - "desktop" installer scripts for the supported Ubuntu releases; - "jeos" installer scripts working for the currently releases it's supposed to work; The "desktop" script we're taking as basis was a collaboration of Jean-Baptiste Lallament (from Canonical) and is quite similar to what their use in their testing environment. The changes done in the "jeos" were based on a lot of back-and-forth testing, trying to figure out what exactly worked and we never ever had a consumer for those scripts via libosinfo. Fabiano Fid?ncio (29): ubuntu,preseed: Add "desktop" install-script ubuntu14.04: Add "desktop" install-script ubuntu16.04: Add "desktop" install-script ubuntu18.04: Add "desktop" install-script ubuntu18.10: Add "desktop" install-script ubuntu18.10: Mark live-server medias as not script installable ubuntu19.04: Add "desktop" install-script ubuntu,jeos: Fix the command-line ubuntu,jeos: Fix hostname's template indentation ubuntu,jeos: Fix command-line's template indentation ubuntu,jeos: Fix install-script-config's template indentation ubuntu,jeos: Clean-up install-script ubuntu,jeos: Force the system to boot without splash screen ubuntu,jeos: Tune extra installed softwares ubuntu12.04: Move installer under medias ubuntu12.10: Move installer under medias ubuntu13.04: Remove installer ubuntu13.10: Move installer under medias ubuntu14.04: Move installer under medias ubuntu14.10: Move installer under medias ubuntu15.04: Move installer under medias ubuntu15.10: Move installer under medias ubuntu16.04: Move installer under medias ubuntu16.10: Move installer under medias ubuntu17.04: Move installer under medias ubuntu17.10: Move installer under medias ubuntu18.04: Move installer under medias ubuntu18.10: Move installer under medias ubuntu19.04: Move installer under medias .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 ++++++++++++++++ .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 109 ++++++------------ data/os/ubuntu.com/ubuntu-12.04.xml.in | 10 +- data/os/ubuntu.com/ubuntu-12.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 - data/os/ubuntu.com/ubuntu-13.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 +- data/os/ubuntu.com/ubuntu-14.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-15.04.xml.in | 10 +- data/os/ubuntu.com/ubuntu-15.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-16.04.xml.in | 18 ++- data/os/ubuntu.com/ubuntu-16.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-17.04.xml.in | 10 +- data/os/ubuntu.com/ubuntu-17.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-18.04.xml.in | 11 +- data/os/ubuntu.com/ubuntu-18.10.xml.in | 13 ++- data/os/ubuntu.com/ubuntu-19.04.xml.in | 11 +- 17 files changed, 230 insertions(+), 132 deletions(-) create mode 100644 data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:49 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:49 +0100 Subject: [Libosinfo] [osinfo-db PATCH 01/29] ubuntu, preseed: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-2-fidencio@redhat.com> Let's add ubuntu's preseed file for Desktop profile. The preseed file was contributed by Jean-Baptiste Lallement, from Canonical and is pretty much the same file their use on their testing environment (apart from a few tweaks done here and there to adpat it to our needs). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in new file mode 100644 index 0000000..06f68ff --- /dev/null +++ b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in @@ -0,0 +1,98 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <install-script id='http://ubuntu.com/ubuntu/preseed/desktop'> + <profile>desktop</profile> + <expected-filename>preseed.cfg</expected-filename> + <config> + <!-- Localization options --> + <param name="l10n-keyboard" policy="optional" value-map="http://x.org/x11-keyboard"/> + <param name="l10n-timezone" policy="optional"/> + <param name="l10n-language" policy="optional"/> + + <!-- User options --> + <param name="user-login" policy="required"/> + <param name="user-realname" policy="optional"/> + <param name="user-password" policy="required"/> + + <!-- Misc --> + <param name="target-disk" policy="optional"/> + <param name="hostname" policy="optional"/> + </config> + <injection-method>initrd</injection-method> + <needs-internet>true</needs-internet> + <template> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + <xsl:output method="text"/> + + <xsl:template match="/command-line"> + <xsl:text>file=/</xsl:text> + <xsl:value-of select="script/expected-filename"/> + <xsl:text> locale=</xsl:text> + <xsl:value-of select="config/l10n-language"/> + <xsl:text> keyboard-configuration/layoutcode=</xsl:text> + <xsl:value-of select="config/l10n-keyboard"/> + <xsl:text> hostname=</xsl:text> + <xsl:call-template name="hostname"/> + <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> + <xsl:text> noprompt boot=casper automatic-ubiquity</xsl:text> + </xsl:template> + + <xsl:template name="target-disk"> + <xsl:choose> + <xsl:when test="config/target-disk != ''"> + <xsl:value-of select="config/target-disk"/> + </xsl:when> + <xsl:otherwise> + <!-- IDE --> + <xsl:text>/dev/hda</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="hostname"> + <xsl:choose> + <xsl:when test="config/hostname != ''"> + <xsl:value-of select="config/hostname"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>ubuntu</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="/install-script-config"> +d-i pkgsel/include string ubuntu-desktop +d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> +d-i netcfg/get_hostname string <xsl:call-template name="hostname"/> + +d-i partman-auto/disk string <xsl:call-template name="target-disk"/> +d-i partman-auto/init_automatically_partition select Use the largest continuous free space +d-i partman-auto/method string regular +d-i partman/choose_partition select Finish partitioning and write changes to disk +d-i partman/confirm boolean true + +d-i grub-installer/bootdev string <xsl:call-template name="target-disk"/> +d-i partman/confirm_nooverwrite boolean true + +d-i clock-setup/ntp boolean true +d-i clock-setup/utc boolean true +d-i time/zone select <xsl:value-of select="config/l10n-timezone"/> + +d-i passwd/user-fullname string <xsl:value-of select="config/user-realname"/> +d-i passwd/username string <xsl:value-of select="config/user-login"/> +d-i passwd/user-password password <xsl:value-of select="config/user-password"/> +d-i passwd/user-password-again password <xsl:value-of select="config/user-password"/> +d-i user-setup/allow-password-weak boolean true + +d-i finish-install/reboot_in_progress note +#Temporary workaround for LP:1258245 +d-i preseed/early_command string chmod 666 /dev/ttyS0 +ubiquity ubiquity/summary note +ubiquity ubiquity/reboot boolean true + </xsl:template> + </xsl:stylesheet> + </template> + </install-script> +</libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:50 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:50 +0100 Subject: [Libosinfo] [osinfo-db PATCH 02/29] ubuntu14.04: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 3cf9841..5e095b6 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -64,6 +64,7 @@ </media> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH 03/29] ubuntu16.04: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 867b5ae..6da1d35 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -86,6 +86,7 @@ </media> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:52 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH 04/29] ubuntu18.04: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 0fa2e29..a39fe5f 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -85,6 +85,7 @@ <installer> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH 05/29] ubuntu18.10: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-6-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index fdde0a8..838d4b3 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -94,6 +94,7 @@ </tree> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:54 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:54 +0100 Subject: [Libosinfo] [osinfo-db PATCH 06/29] ubuntu18.10: Mark live-server medias as not script installable In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-7-fidencio@redhat.com> According to a conversation on #ubuntu-release live server medias are not script installable at all. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 838d4b3..2d2aefa 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -40,7 +40,7 @@ <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> </media> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> <iso> <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:55 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:55 +0100 Subject: [Libosinfo] [osinfo-db PATCH 07/29] ubuntu19.04: Add "desktop" install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-8-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 299ec56..09012a6 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -85,6 +85,7 @@ </tree> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:56 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:56 +0100 Subject: [Libosinfo] [osinfo-db PATCH 08/29] ubuntu, jeos: Fix the command-line In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-9-fidencio@redhat.com> The currently command line has never worked as preseed files should be passed to the kernel as file=/path/to/file instead of file=file:/path/to/file. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index c56f859..37f9d7f 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -21,7 +21,7 @@ <xsl:output method="text"/> <xsl:template match="/command-line"> - <xsl:text>file=file:/</xsl:text> + <xsl:text>file=/</xsl:text> <xsl:value-of select="script/expected-filename"/> <xsl:text> locale=</xsl:text> <xsl:value-of select="config/l10n-language"/> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:57 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:57 +0100 Subject: [Libosinfo] [osinfo-db PATCH 09/29] ubuntu, jeos: Fix hostname's template indentation In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-10-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 37f9d7f..4f4bc69 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -44,16 +44,16 @@ </xsl:choose> </xsl:template> - <xsl:template name="hostname"> - <xsl:choose> - <xsl:when test="config/hostname != ''"> + <xsl:template name="hostname"> + <xsl:choose> + <xsl:when test="config/hostname != ''"> <xsl:value-of select="config/hostname"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>ubuntu</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> + </xsl:when> + <xsl:otherwise> + <xsl:text>ubuntu</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template match="/install-script-config">d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> d-i console-setup/ask_detect boolean false -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:58 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:58 +0100 Subject: [Libosinfo] [osinfo-db PATCH 10/29] ubuntu, jeos: Fix command-line's template indentation In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-11-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 4f4bc69..10e7c67 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -21,15 +21,15 @@ <xsl:output method="text"/> <xsl:template match="/command-line"> - <xsl:text>file=/</xsl:text> - <xsl:value-of select="script/expected-filename"/> - <xsl:text> locale=</xsl:text> - <xsl:value-of select="config/l10n-language"/> - <xsl:text> keyboard-configuration/layoutcode=</xsl:text> - <xsl:value-of select="config/l10n-keyboard"/> - <xsl:text> hostname=</xsl:text> - <xsl:call-template name="hostname"/> - <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> + <xsl:text>file=/</xsl:text> + <xsl:value-of select="script/expected-filename"/> + <xsl:text> locale=</xsl:text> + <xsl:value-of select="config/l10n-language"/> + <xsl:text> keyboard-configuration/layoutcode=</xsl:text> + <xsl:value-of select="config/l10n-keyboard"/> + <xsl:text> hostname=</xsl:text> + <xsl:call-template name="hostname"/> + <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> </xsl:template> <xsl:template name="target-disk"> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:29:59 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:29:59 +0100 Subject: [Libosinfo] [osinfo-db PATCH 11/29] ubuntu, jeos: Fix install-script-config's template indentation In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-12-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 10e7c67..b2aa564 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -55,7 +55,8 @@ </xsl:choose> </xsl:template> -<xsl:template match="/install-script-config">d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> + <xsl:template match="/install-script-config"> +d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> d-i console-setup/ask_detect boolean false d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/> @@ -151,7 +152,7 @@ d-i prebaseconfig/reboot_in_progress note <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper </xsl:if> -</xsl:template> + </xsl:template> </xsl:stylesheet> </template> </install-script> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:00 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:00 +0100 Subject: [Libosinfo] [osinfo-db PATCH 12/29] ubuntu, jeos: Clean-up install-script In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-13-fidencio@redhat.com> Unattended installation is only targetting ubuntu 12.04+. Knowing that, doesn't make sense to keep the whole lot of conditions in the installer-script code. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index b2aa564..ad15ad5 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -68,70 +68,21 @@ d-i netcfg/wireless_wep string d-i clock-setup/utc boolean true d-i time/zone string <xsl:value-of select="config/l10n-timezone"/> -<xsl:if test="os/version &lt; 7.04"> -d-i partman-auto/disk string <xsl:call-template name="target-disk"/> -</xsl:if> -<xsl:if test="os/version = 7.04"> -d-i partman-auto/init_automatically_partition select Use the largest continuous free space -</xsl:if> d-i partman-auto/method string regular -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -d-i partman-auto/choose_recipe select Separate /home partition -</xsl:when> - <xsl:otherwise> d-i partman-auto/choose_recipe select home -</xsl:otherwise> -</xsl:choose> d-i partman/confirm_write_new_label boolean true -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -d-i partman/choose_partition select Finish partitioning and write changes to disk -</xsl:when> -<xsl:otherwise> d-i partman/choose_partition select finish -</xsl:otherwise> -</xsl:choose> d-i partman/confirm boolean true -<xsl:if test="os/version &gt; 9.10"> d-i partman/confirm_nooverwrite boolean true -</xsl:if> d-i passwd/root-login boolean true d-i passwd/make-user boolean false d-i passwd/root-password password <xsl:value-of select="config/admin-password"/> d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/> -<xsl:if test="os/version &lt; 6.10"> -d-i pkgsel/install-language-support boolean false -</xsl:if> - -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -tasksel tasksel/first multiselect ubuntu-standard, ubuntu-desktop -</xsl:when> -<xsl:otherwise> tasksel tasksel/first multiselect standard -</xsl:otherwise> -</xsl:choose> -<xsl:choose> -<xsl:when test="os/version &lt; 8.04"> -d-i mirror/http/proxy string -</xsl:when> -<xsl:when test="os/version = 10.04"> -d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string ltsp-server-standalone openssh-server python-software-properties -d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys -</xsl:when> -<xsl:when test="os/version = 11.04"> -d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string openssh-server -</xsl:when> -<xsl:when test="os/version &gt; 11.04"> d-i pkgsel/include/install-recommends boolean true d-i pkgsel/include string openssh-server python-software-properties -</xsl:when> -</xsl:choose> d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true @@ -139,15 +90,10 @@ d-i grub-installer/with_other_os boolean true d-i apt-setup/security_host string base-config apt-setup/security-updates boolean false -<xsl:if test="os/version &gt; 7.04"> ubiquity ubiquity/summary note ubiquity ubiquity/reboot boolean true -</xsl:if> d-i finish-install/reboot_in_progress note -<xsl:if test="os/version &lt; 6.10"> -d-i prebaseconfig/reboot_in_progress note -</xsl:if> <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:01 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:01 +0100 Subject: [Libosinfo] [osinfo-db PATCH 13/29] ubuntu, jeos: Force the system to boot without splash screen In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-14-fidencio@redhat.com> Unfortunately, if we don't manually force the system to boot without splash screen, the splash will load and the user would have to manually switch to VT[0-6]. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index ad15ad5..1e61754 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -95,6 +95,10 @@ ubiquity ubiquity/reboot boolean true d-i finish-install/reboot_in_progress note +d-i preseed/late_command string \ + in-target sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /etc/default/grub ; \ + in-target bash -c 'update-grub2' ; + <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper </xsl:if> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:02 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:02 +0100 Subject: [Libosinfo] [osinfo-db PATCH 14/29] ubuntu, jeos: Tune extra installed softwares In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-15-fidencio@redhat.com> Seems that although openssh-server is present in all ubuntu servers, python-software-properties is not. For newer versions of ubuntu, let's just install python3-software-properties. For 12.04, let's install python-software-properties. For 12.10, let's avoid installing as it'd raise an error during installation. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 1e61754..79cdb8d 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -82,7 +82,17 @@ d-i passwd/root-password-again password <xsl:value-of select="config/admin-passw tasksel tasksel/first multiselect standard d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string openssh-server python-software-properties +d-i pkgsel/include string openssh-server +<xsl:choose> + <xsl:when test="os/version &lt; 13.10"> + <xsl:if test="os/version = 12.04"> +d-i pkgsel/include string python-software-properties + </xsl:if> + </xsl:when> + <xsl:otherwise> +d-i pkgsel/include string python3-software-properties + </xsl:otherwise> +</xsl:choose> d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:03 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:03 +0100 Subject: [Libosinfo] [osinfo-db PATCH 15/29] ubuntu12.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-16-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-12.04.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in index c1609ae..2bb0b29 100644 --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url> @@ -61,9 +67,5 @@ <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:04 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:04 +0100 Subject: [Libosinfo] [osinfo-db PATCH 16/29] ubuntu12.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-17-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-12.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in index 6dd97e5..46ebffb 100644 --- a/data/os/ubuntu.com/ubuntu-12.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url> @@ -61,9 +67,5 @@ <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:05 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:05 +0100 Subject: [Libosinfo] [osinfo-db PATCH 17/29] ubuntu13.04: Remove installer In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-18-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected and that this is a distro that reached its EOF, let's just remove the installer as I didn't get to make it work. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in index e5e7d71..70ca832 100644 --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in @@ -61,9 +61,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:06 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:06 +0100 Subject: [Libosinfo] [osinfo-db PATCH 18/29] ubuntu13.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-19-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in index c5ec9b7..1b29d29 100644 --- a/data/os/ubuntu.com/ubuntu-13.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url> @@ -61,9 +67,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:07 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:07 +0100 Subject: [Libosinfo] [osinfo-db PATCH 19/29] ubuntu14.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-20-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. The reason why the "desktop" profile has been left for the OS is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.04.xml.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 5e095b6..ad8625e 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso</url> @@ -65,7 +71,6 @@ <installer> <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:08 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:08 +0100 Subject: [Libosinfo] [osinfo-db PATCH 20/29] ubuntu14.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-21-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in index 98447c7..b64d9ec 100644 --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url> @@ -62,9 +68,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:09 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:09 +0100 Subject: [Libosinfo] [osinfo-db PATCH 21/29] ubuntu15.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-22-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.04.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in index cd95988..a795ba2 100644 --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url> @@ -62,9 +68,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:10 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:10 +0100 Subject: [Libosinfo] [osinfo-db PATCH 22/29] ubuntu15.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-23-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in index 0ced8ba..cca8e79 100644 --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url> @@ -62,9 +68,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:11 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:11 +0100 Subject: [Libosinfo] [osinfo-db PATCH 23/29] ubuntu16.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-24-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. The reason why the "desktop" profile has also been moved under the "server" medias is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 6da1d35..5d7baef 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -37,6 +37,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url> @@ -45,6 +49,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="i686" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url> @@ -53,6 +61,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url> @@ -61,6 +72,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="ppc"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url> @@ -84,10 +98,5 @@ <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:12 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:12 +0100 Subject: [Libosinfo] [osinfo-db PATCH 24/29] ubuntu16.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-25-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 3c7606c..8373f65 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url> @@ -92,9 +98,5 @@ <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:13 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:13 +0100 Subject: [Libosinfo] [osinfo-db PATCH 25/29] ubuntu17.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-26-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.04.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 907960f..45a2436 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -51,6 +51,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url> @@ -59,6 +62,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url> @@ -100,9 +106,5 @@ <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:14 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:14 +0100 Subject: [Libosinfo] [osinfo-db PATCH 26/29] ubuntu17.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-27-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.10.xml.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 7dee327..602a147 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url> @@ -78,9 +84,5 @@ <kernel>boot/kernel.ubuntu</kernel> <initrd>boot/initrd.ubuntu</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:15 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:15 +0100 Subject: [Libosinfo] [osinfo-db PATCH 27/29] ubuntu18.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-28-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. The reason why the "desktop" profile has also been moved under the "server" medias is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index a39fe5f..b8b94ea 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -38,6 +38,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url> @@ -46,6 +50,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-arm64.iso</url> @@ -82,10 +89,5 @@ <kernel>current/images/netboot/ubuntu-installer/amd64/linux</kernel> <initrd>current/images/netboot/ubuntu-installer/amd64/initrd.gz</initrd> </tree> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:16 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:16 +0100 Subject: [Libosinfo] [osinfo-db PATCH 28/29] ubuntu18.10: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-29-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. The reason why the "desktop" profile has also been moved under the "server" medias is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 2d2aefa..dc57f0b 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -39,6 +39,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true" installer-script="false"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> @@ -56,6 +60,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> @@ -92,10 +99,5 @@ <kernel>current/images/netboot/ubuntu-installer/amd64/linux</kernel> <initrd>current/images/netboot/ubuntu-installer/amd64/initrd.gz</initrd> </tree> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:30:17 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:30:17 +0100 Subject: [Libosinfo] [osinfo-db PATCH 29/29] ubuntu19.04: Move installer under medias In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <20190219153017.9756-30-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected, let's move the installers under the specific medias the installer has been tested against. The reason why the "desktop" profile has also been moved under the "server" medias is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 09012a6..767a213 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -39,6 +39,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://cdimage.ubuntu.com/daily-live/current/disco-desktop-amd64.iso</url> @@ -47,6 +51,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> @@ -83,10 +90,5 @@ <kernel>current/images/netboot/ubuntu-installer/amd64/linux</kernel> <initrd>current/images/netboot/ubuntu-installer/amd64/initrd.gz</initrd> </tree> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 15:52:21 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 16:52:21 +0100 Subject: [Libosinfo] [osinfo-db PATCH 00/29] Improvements/Cleanups on Ubuntu installer scripts In-Reply-To: <20190219153017.9756-1-fidencio@redhat.com> References: <20190219153017.9756-1-fidencio@redhat.com> Message-ID: <CAAY6XsfpZNHsG1QCu-HKa3QC4-KFgVqfJmwahDFtq2cLYWXqZA@mail.gmail.com> On Tue, Feb 19, 2019 at 4:30 PM Fabiano Fid?ncio <fidencio at redhat.com> wrote: > This patch series aim to have: > - "desktop" installer scripts for the supported Ubuntu releases; > - "jeos" installer scripts working for the currently releases it's > supposed to work; > > The "desktop" script we're taking as basis was a collaboration of > Jean-Baptiste Lallament (from Canonical) and is quite similar to what > their use in their testing environment. > > The changes done in the "jeos" were based on a lot of back-and-forth > testing, trying to figure out what exactly worked and we never ever had > a consumer for those scripts via libosinfo. > > Fabiano Fid?ncio (29): > ubuntu,preseed: Add "desktop" install-script > ubuntu14.04: Add "desktop" install-script > ubuntu16.04: Add "desktop" install-script > ubuntu18.04: Add "desktop" install-script > ubuntu18.10: Add "desktop" install-script > ubuntu18.10: Mark live-server medias as not script installable > ubuntu19.04: Add "desktop" install-script > ubuntu,jeos: Fix the command-line > ubuntu,jeos: Fix hostname's template indentation > ubuntu,jeos: Fix command-line's template indentation > ubuntu,jeos: Fix install-script-config's template indentation > ubuntu,jeos: Clean-up install-script > ubuntu,jeos: Force the system to boot without splash screen > ubuntu,jeos: Tune extra installed softwares > I've just realised that for all the patches below we can't actually move the installer from the os to the medias as osinfo-install-script relies on the scripts being under the os. That's fine, that's fine ... the main difference is whatever was moved under the medias would be just copied. I'll submit a v2 soon. > ubuntu12.04: Move installer under medias > ubuntu12.10: Move installer under medias > ubuntu13.04: Remove installer > ubuntu13.10: Move installer under medias > ubuntu14.04: Move installer under medias > ubuntu14.10: Move installer under medias > ubuntu15.04: Move installer under medias > ubuntu15.10: Move installer under medias > ubuntu16.04: Move installer under medias > ubuntu16.10: Move installer under medias > ubuntu17.04: Move installer under medias > ubuntu17.10: Move installer under medias > ubuntu18.04: Move installer under medias > ubuntu18.10: Move installer under medias > ubuntu19.04: Move installer under medias > > .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 ++++++++++++++++ > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 109 ++++++------------ > data/os/ubuntu.com/ubuntu-12.04.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-12.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 - > data/os/ubuntu.com/ubuntu-13.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-14.04.xml.in | 8 +- > data/os/ubuntu.com/ubuntu-14.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-15.04.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-15.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-16.04.xml.in | 18 ++- > data/os/ubuntu.com/ubuntu-16.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-17.04.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-17.10.xml.in | 10 +- > data/os/ubuntu.com/ubuntu-18.04.xml.in | 11 +- > data/os/ubuntu.com/ubuntu-18.10.xml.in | 13 ++- > data/os/ubuntu.com/ubuntu-19.04.xml.in | 11 +- > 17 files changed, 230 insertions(+), 132 deletions(-) > create mode 100644 data/install-script/ > ubuntu.com/ubuntu-preseed-desktop.xml.in > > -- > 2.20.1 > > Best Regards, -- Fabiano Fid?ncio -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190219/e7b2ab03/attachment.htm> From fidencio at redhat.com Tue Feb 19 16:27:26 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:26 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 00/29] Improvements/Cleanups related to Ubuntu installer scripts Message-ID: <20190219162755.15367-1-fidencio@redhat.com> This patch series aim to have: - "desktop" installer scripts for the supported Ubuntu releases; - "jeos" installer scripts working for the currently releases it's supposed to work; The "desktop" script we're taking as basis was a collaboration of Jean-Baptiste Lallament (from Canonical) and is quite similar to what their use in their testing environment. The changes done in the "jeos" were based on a lot of back-and-forth testing, trying to figure out what exactly worked and we never ever had a consumer for those scripts via libosinfo. - Changes since v1: https://www.redhat.com/archives/libosinfo/2019-February/msg00107.html - Copy the scripts under the medias instead of moving them, as osinfo-install-script relies on having the scripts *per* *OS*. Fabiano Fid?ncio (29): ubuntu,preseed: Add "desktop" install-script ubuntu14.04: Add "desktop" install-script ubuntu16.04: Add "desktop" install-script ubuntu18.04: Add "desktop" install-script ubuntu18.10: Add "desktop" install-script ubuntu18.10: Mark live-server medias as not script installable ubuntu19.04: Add "desktop" install-script ubuntu,jeos: Fix the command-line ubuntu,jeos: Fix hostname's template indentation ubuntu,jeos: Fix command-line's template indentation ubuntu,jeos: Fix install-script-config's template indentation ubuntu,jeos: Clean-up install-script ubuntu,jeos: Force the system to boot without splash screen ubuntu,jeos: Tune extra installed softwares ubuntu12.04: Copy installer under medias ubuntu12.10: Copy installer under medias ubuntu13.04: Remove installer ubuntu13.10: Copy installer under medias ubuntu14.04: Copy installer under medias ubuntu14.10: Copy installer under medias ubuntu15.04: Copy installer under medias ubuntu15.10: Copy installer under medias ubuntu16.04: Copy installer under medias ubuntu16.10: Copy installer under medias ubuntu17.04: Copy installer under medias ubuntu17.10: Copy installer under medias ubuntu18.04: Copy installer under medias ubuntu18.10: Copy installer under medias ubuntu19.04: Copy installer under medias .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 ++++++++++++++++ .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 109 ++++++------------ data/os/ubuntu.com/ubuntu-12.04.xml.in | 6 + data/os/ubuntu.com/ubuntu-12.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 - data/os/ubuntu.com/ubuntu-13.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-14.04.xml.in | 7 ++ data/os/ubuntu.com/ubuntu-14.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-15.04.xml.in | 6 + data/os/ubuntu.com/ubuntu-15.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-16.04.xml.in | 15 +++ data/os/ubuntu.com/ubuntu-16.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-17.04.xml.in | 6 + data/os/ubuntu.com/ubuntu-17.10.xml.in | 6 + data/os/ubuntu.com/ubuntu-18.04.xml.in | 8 ++ data/os/ubuntu.com/ubuntu-18.10.xml.in | 10 +- data/os/ubuntu.com/ubuntu-19.04.xml.in | 8 ++ 17 files changed, 234 insertions(+), 79 deletions(-) create mode 100644 data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:27 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:27 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 01/29] ubuntu, preseed: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-2-fidencio@redhat.com> Let's add ubuntu's preseed file for Desktop profile. The preseed file was contributed by Jean-Baptiste Lallement, from Canonical and is pretty much the same file their use on their testing environment (apart from a few tweaks done here and there to adpat it to our needs). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in new file mode 100644 index 0000000..06f68ff --- /dev/null +++ b/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in @@ -0,0 +1,98 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <install-script id='http://ubuntu.com/ubuntu/preseed/desktop'> + <profile>desktop</profile> + <expected-filename>preseed.cfg</expected-filename> + <config> + <!-- Localization options --> + <param name="l10n-keyboard" policy="optional" value-map="http://x.org/x11-keyboard"/> + <param name="l10n-timezone" policy="optional"/> + <param name="l10n-language" policy="optional"/> + + <!-- User options --> + <param name="user-login" policy="required"/> + <param name="user-realname" policy="optional"/> + <param name="user-password" policy="required"/> + + <!-- Misc --> + <param name="target-disk" policy="optional"/> + <param name="hostname" policy="optional"/> + </config> + <injection-method>initrd</injection-method> + <needs-internet>true</needs-internet> + <template> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + <xsl:output method="text"/> + + <xsl:template match="/command-line"> + <xsl:text>file=/</xsl:text> + <xsl:value-of select="script/expected-filename"/> + <xsl:text> locale=</xsl:text> + <xsl:value-of select="config/l10n-language"/> + <xsl:text> keyboard-configuration/layoutcode=</xsl:text> + <xsl:value-of select="config/l10n-keyboard"/> + <xsl:text> hostname=</xsl:text> + <xsl:call-template name="hostname"/> + <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> + <xsl:text> noprompt boot=casper automatic-ubiquity</xsl:text> + </xsl:template> + + <xsl:template name="target-disk"> + <xsl:choose> + <xsl:when test="config/target-disk != ''"> + <xsl:value-of select="config/target-disk"/> + </xsl:when> + <xsl:otherwise> + <!-- IDE --> + <xsl:text>/dev/hda</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="hostname"> + <xsl:choose> + <xsl:when test="config/hostname != ''"> + <xsl:value-of select="config/hostname"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>ubuntu</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="/install-script-config"> +d-i pkgsel/include string ubuntu-desktop +d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> +d-i netcfg/get_hostname string <xsl:call-template name="hostname"/> + +d-i partman-auto/disk string <xsl:call-template name="target-disk"/> +d-i partman-auto/init_automatically_partition select Use the largest continuous free space +d-i partman-auto/method string regular +d-i partman/choose_partition select Finish partitioning and write changes to disk +d-i partman/confirm boolean true + +d-i grub-installer/bootdev string <xsl:call-template name="target-disk"/> +d-i partman/confirm_nooverwrite boolean true + +d-i clock-setup/ntp boolean true +d-i clock-setup/utc boolean true +d-i time/zone select <xsl:value-of select="config/l10n-timezone"/> + +d-i passwd/user-fullname string <xsl:value-of select="config/user-realname"/> +d-i passwd/username string <xsl:value-of select="config/user-login"/> +d-i passwd/user-password password <xsl:value-of select="config/user-password"/> +d-i passwd/user-password-again password <xsl:value-of select="config/user-password"/> +d-i user-setup/allow-password-weak boolean true + +d-i finish-install/reboot_in_progress note +#Temporary workaround for LP:1258245 +d-i preseed/early_command string chmod 666 /dev/ttyS0 +ubiquity ubiquity/summary note +ubiquity ubiquity/reboot boolean true + </xsl:template> + </xsl:stylesheet> + </template> + </install-script> +</libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:28 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:28 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 02/29] ubuntu14.04: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 3cf9841..5e095b6 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -64,6 +64,7 @@ </media> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:29 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:29 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 03/29] ubuntu16.04: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 867b5ae..6da1d35 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -86,6 +86,7 @@ </media> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:30 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:30 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 04/29] ubuntu18.04: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 0fa2e29..296fd7a 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -84,6 +84,7 @@ </tree> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:31 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:31 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 05/29] ubuntu18.10: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-6-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index fdde0a8..838d4b3 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -94,6 +94,7 @@ </tree> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:32 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:32 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 06/29] ubuntu18.10: Mark live-server medias as not script installable In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-7-fidencio@redhat.com> According to a conversation on #ubuntu-release live server medias are not script installable at all. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 838d4b3..2d2aefa 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -40,7 +40,7 @@ <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> </media> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> <iso> <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:33 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:33 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 07/29] ubuntu19.04: Add "desktop" install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-8-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 299ec56..09012a6 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -85,6 +85,7 @@ </tree> <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> </installer> </os> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:34 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:34 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 08/29] ubuntu, jeos: Fix the command-line In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-9-fidencio@redhat.com> The currently command line has never worked as preseed files should be passed to the kernel as file=/path/to/file instead of file=file:/path/to/file. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index c56f859..37f9d7f 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -21,7 +21,7 @@ <xsl:output method="text"/> <xsl:template match="/command-line"> - <xsl:text>file=file:/</xsl:text> + <xsl:text>file=/</xsl:text> <xsl:value-of select="script/expected-filename"/> <xsl:text> locale=</xsl:text> <xsl:value-of select="config/l10n-language"/> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:35 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:35 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 09/29] ubuntu, jeos: Fix hostname's template indentation In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-10-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 37f9d7f..4f4bc69 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -44,16 +44,16 @@ </xsl:choose> </xsl:template> - <xsl:template name="hostname"> - <xsl:choose> - <xsl:when test="config/hostname != ''"> + <xsl:template name="hostname"> + <xsl:choose> + <xsl:when test="config/hostname != ''"> <xsl:value-of select="config/hostname"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>ubuntu</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> + </xsl:when> + <xsl:otherwise> + <xsl:text>ubuntu</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> <xsl:template match="/install-script-config">d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> d-i console-setup/ask_detect boolean false -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:36 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:36 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 10/29] ubuntu, jeos: Fix command-line's template indentation In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-11-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 4f4bc69..10e7c67 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -21,15 +21,15 @@ <xsl:output method="text"/> <xsl:template match="/command-line"> - <xsl:text>file=/</xsl:text> - <xsl:value-of select="script/expected-filename"/> - <xsl:text> locale=</xsl:text> - <xsl:value-of select="config/l10n-language"/> - <xsl:text> keyboard-configuration/layoutcode=</xsl:text> - <xsl:value-of select="config/l10n-keyboard"/> - <xsl:text> hostname=</xsl:text> - <xsl:call-template name="hostname"/> - <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> + <xsl:text>file=/</xsl:text> + <xsl:value-of select="script/expected-filename"/> + <xsl:text> locale=</xsl:text> + <xsl:value-of select="config/l10n-language"/> + <xsl:text> keyboard-configuration/layoutcode=</xsl:text> + <xsl:value-of select="config/l10n-keyboard"/> + <xsl:text> hostname=</xsl:text> + <xsl:call-template name="hostname"/> + <xsl:text> priority=critical console-setup/ask_detect=false domain=unassigned-domain interface=auto</xsl:text> </xsl:template> <xsl:template name="target-disk"> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:37 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:37 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 11/29] ubuntu, jeos: Fix install-script-config's template indentation In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-12-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 10e7c67..b2aa564 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -55,7 +55,8 @@ </xsl:choose> </xsl:template> -<xsl:template match="/install-script-config">d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> + <xsl:template match="/install-script-config"> +d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> d-i console-setup/ask_detect boolean false d-i console-setup/layoutcode string <xsl:value-of select="config/l10n-keyboard"/> @@ -151,7 +152,7 @@ d-i prebaseconfig/reboot_in_progress note <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper </xsl:if> -</xsl:template> + </xsl:template> </xsl:stylesheet> </template> </install-script> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:38 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:38 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 12/29] ubuntu, jeos: Clean-up install-script In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-13-fidencio@redhat.com> Unattended installation is only targetting ubuntu 12.04+. Knowing that, doesn't make sense to keep the whole lot of conditions in the installer-script code. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index b2aa564..ad15ad5 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -68,70 +68,21 @@ d-i netcfg/wireless_wep string d-i clock-setup/utc boolean true d-i time/zone string <xsl:value-of select="config/l10n-timezone"/> -<xsl:if test="os/version &lt; 7.04"> -d-i partman-auto/disk string <xsl:call-template name="target-disk"/> -</xsl:if> -<xsl:if test="os/version = 7.04"> -d-i partman-auto/init_automatically_partition select Use the largest continuous free space -</xsl:if> d-i partman-auto/method string regular -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -d-i partman-auto/choose_recipe select Separate /home partition -</xsl:when> - <xsl:otherwise> d-i partman-auto/choose_recipe select home -</xsl:otherwise> -</xsl:choose> d-i partman/confirm_write_new_label boolean true -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -d-i partman/choose_partition select Finish partitioning and write changes to disk -</xsl:when> -<xsl:otherwise> d-i partman/choose_partition select finish -</xsl:otherwise> -</xsl:choose> d-i partman/confirm boolean true -<xsl:if test="os/version &gt; 9.10"> d-i partman/confirm_nooverwrite boolean true -</xsl:if> d-i passwd/root-login boolean true d-i passwd/make-user boolean false d-i passwd/root-password password <xsl:value-of select="config/admin-password"/> d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/> -<xsl:if test="os/version &lt; 6.10"> -d-i pkgsel/install-language-support boolean false -</xsl:if> - -<xsl:choose> -<xsl:when test="os/version &lt; 7.10"> -tasksel tasksel/first multiselect ubuntu-standard, ubuntu-desktop -</xsl:when> -<xsl:otherwise> tasksel tasksel/first multiselect standard -</xsl:otherwise> -</xsl:choose> -<xsl:choose> -<xsl:when test="os/version &lt; 8.04"> -d-i mirror/http/proxy string -</xsl:when> -<xsl:when test="os/version = 10.04"> -d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string ltsp-server-standalone openssh-server python-software-properties -d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys -</xsl:when> -<xsl:when test="os/version = 11.04"> -d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string openssh-server -</xsl:when> -<xsl:when test="os/version &gt; 11.04"> d-i pkgsel/include/install-recommends boolean true d-i pkgsel/include string openssh-server python-software-properties -</xsl:when> -</xsl:choose> d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true @@ -139,15 +90,10 @@ d-i grub-installer/with_other_os boolean true d-i apt-setup/security_host string base-config apt-setup/security-updates boolean false -<xsl:if test="os/version &gt; 7.04"> ubiquity ubiquity/summary note ubiquity ubiquity/reboot boolean true -</xsl:if> d-i finish-install/reboot_in_progress note -<xsl:if test="os/version &lt; 6.10"> -d-i prebaseconfig/reboot_in_progress note -</xsl:if> <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:39 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:39 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 13/29] ubuntu, jeos: Force the system to boot without splash screen In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-14-fidencio@redhat.com> Unfortunately, if we don't manually force the system to boot without splash screen, the splash will load and the user would have to manually switch to VT[0-6]. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index ad15ad5..1e61754 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -95,6 +95,10 @@ ubiquity ubiquity/reboot boolean true d-i finish-install/reboot_in_progress note +d-i preseed/late_command string \ + in-target sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /etc/default/grub ; \ + in-target bash -c 'update-grub2' ; + <xsl:if test="os/version = 13.04"> ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper </xsl:if> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:40 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:40 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 14/29] ubuntu, jeos: Tune extra installed softwares In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-15-fidencio@redhat.com> Seems that although openssh-server is present in all ubuntu servers, python-software-properties is not. For newer versions of ubuntu, let's just install python3-software-properties. For 12.04, let's install python-software-properties. For 12.10, let's avoid installing as it'd raise an error during installation. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 1e61754..79cdb8d 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -82,7 +82,17 @@ d-i passwd/root-password-again password <xsl:value-of select="config/admin-passw tasksel tasksel/first multiselect standard d-i pkgsel/include/install-recommends boolean true -d-i pkgsel/include string openssh-server python-software-properties +d-i pkgsel/include string openssh-server +<xsl:choose> + <xsl:when test="os/version &lt; 13.10"> + <xsl:if test="os/version = 12.04"> +d-i pkgsel/include string python-software-properties + </xsl:if> + </xsl:when> + <xsl:otherwise> +d-i pkgsel/include string python3-software-properties + </xsl:otherwise> +</xsl:choose> d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean true -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:41 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:41 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 15/29] ubuntu12.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-16-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-12.04.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in index c1609ae..533c093 100644 --- a/data/os/ubuntu.com/ubuntu-12.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:42 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:42 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 16/29] ubuntu12.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-17-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-12.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-12.10.xml.in b/data/os/ubuntu.com/ubuntu-12.10.xml.in index 6dd97e5..49ac61e 100644 --- a/data/os/ubuntu.com/ubuntu-12.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-12.10.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:43 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:43 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 17/29] ubuntu13.04: Remove installer In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-18-fidencio@redhat.com> JeOS installations have never been tested as libosinfo never had an app consuming those scripts. Knowing that there's no consumers affected and that this is a distro that reached its EOF, let's just remove the installer as I didn't get to make it work. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in index e5e7d71..70ca832 100644 --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in @@ -61,9 +61,5 @@ <kernel>casper/vmlinuz.efi</kernel> <initrd>casper/initrd.lz</initrd> </media> - - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - </installer> </os> </libosinfo> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:44 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:44 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 18/29] ubuntu13.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-19-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-13.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-13.10.xml.in b/data/os/ubuntu.com/ubuntu-13.10.xml.in index c5ec9b7..b994185 100644 --- a/data/os/ubuntu.com/ubuntu-13.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.10.xml.in @@ -36,6 +36,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url> @@ -44,6 +47,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:45 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:45 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 19/29] ubuntu14.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-20-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. The reason why the "desktop" profile has been left only in the OS is because we can safely use the "desktop" script with the "server" medias and have the very same result as when using the "desktop" medias. Unfortunately, the opposite is not true (performing a "JeOS" installation in a "desktop" media and having the same result). Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.04.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in index 5e095b6..b7500cd 100644 --- a/data/os/ubuntu.com/ubuntu-14.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:46 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:46 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 20/29] ubuntu14.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-21-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-14.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in index 98447c7..6557417 100644 --- a/data/os/ubuntu.com/ubuntu-14.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:47 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:47 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 21/29] ubuntu15.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-22-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.04.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in index cd95988..91ad4c4 100644 --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:48 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 22/29] ubuntu15.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-23-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-15.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in index 0ced8ba..83ac997 100644 --- a/data/os/ubuntu.com/ubuntu-15.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:49 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:49 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 23/29] ubuntu16.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-24-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in index 6da1d35..fbccc35 100644 --- a/data/os/ubuntu.com/ubuntu-16.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in @@ -37,6 +37,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url> @@ -45,6 +49,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="i686" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url> @@ -53,6 +61,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url> @@ -61,6 +72,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="ppc"> <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:50 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:50 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 24/29] ubuntu16.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-25-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-16.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in index 3c7606c..261065b 100644 --- a/data/os/ubuntu.com/ubuntu-16.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 25/29] ubuntu17.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-26-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.04.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in index 907960f..938594c 100644 --- a/data/os/ubuntu.com/ubuntu-17.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in @@ -51,6 +51,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url> @@ -59,6 +62,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="i686" live="true"> <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:52 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 26/29] ubuntu17.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-27-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-17.10.xml.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in index 7dee327..d09adf0 100644 --- a/data/os/ubuntu.com/ubuntu-17.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in @@ -37,6 +37,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url> @@ -45,6 +48,9 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 27/29] ubuntu18.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-28-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 296fd7a..e5833a6 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -38,6 +38,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url> @@ -46,6 +50,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd.lz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-arm64.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:54 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:54 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 28/29] ubuntu18.10: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-29-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.10.xml.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in index 2d2aefa..e8d22c0 100644 --- a/data/os/ubuntu.com/ubuntu-18.10.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in @@ -39,6 +39,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true" installer-script="false"> <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url> @@ -56,6 +60,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url> -- 2.20.1 From fidencio at redhat.com Tue Feb 19 16:27:55 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 19 Feb 2019 17:27:55 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 29/29] ubuntu19.04: Copy installer under medias In-Reply-To: <20190219162755.15367-1-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> Message-ID: <20190219162755.15367-30-fidencio@redhat.com> Let's copy the installer under the medias as we've provided new APIs on libosinfo for relying on the media content instead of relying on the OS. The reasoning behind of that is because not all medias support installers for both profiles. Let's also leave the installer-script under the OSes as osinfo-install-script relies on that. Last but not least, we're just copying the installer under the medias which the installer has been tested against. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-19.04.xml.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in index 09012a6..71efc17 100644 --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in @@ -39,6 +39,10 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> + </installer> </media> <media arch="x86_64" live="true"> <url>http://cdimage.ubuntu.com/daily-live/current/disco-desktop-amd64.iso</url> @@ -47,6 +51,9 @@ </iso> <kernel>casper/vmlinuz</kernel> <initrd>casper/initrd</initrd> + <installer> + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> + </installer> </media> <media arch="aarch64"> <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 12:51:00 2019 From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=) Date: Wed, 20 Feb 2019 13:51:00 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 27/29] ubuntu18.04: Copy installer under medias In-Reply-To: <20190219162755.15367-28-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-28-fidencio@redhat.com> Message-ID: <7f435fce3f91cfa73b9211f6057ecfc352cfe434.camel@redhat.com> On Tue, 2019-02-19 at 17:27 +0100, Fabiano Fid?ncio wrote: > Let's copy the installer under the medias as we've provided new APIs > on > libosinfo for relying on the media content instead of relying on the > OS. > > The reasoning behind of that is because not all medias support > installers for both profiles. > > Let's also leave the installer-script under the OSes as > osinfo-install-script relies on that. > > Last but not least, we're just copying the installer under the medias > which the installer has been tested against. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/ubuntu.com/ubuntu-18.04.xml.in | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in > b/data/os/ubuntu.com/ubuntu-18.04.xml.in > index 296fd7a..e5833a6 100644 > --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in > @@ -38,6 +38,10 @@ > </iso> > <kernel>install/vmlinuz</kernel> > <initrd>install/initrd.gz</initrd> > + <installer> > + <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> > + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> > + </installer> > </media> > <media arch="x86_64" live="true"> > <url> > http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url > > > @@ -46,6 +50,9 @@ > </iso> > <kernel>casper/vmlinuz</kernel> > <initrd>casper/initrd.lz</initrd> > + <installer> > + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> > + </installer> > </media> > <media arch="aarch64"> > <url> > http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-arm64.iso</url > > This patch will need the follow fixup: Refs: v20190218-34-g6bc4c07 Author: Fabiano Fid?ncio <fidencio at redhat.com> AuthorDate: Wed Feb 20 11:48:33 2019 +0100 Commit: Fabiano Fid?ncio <fidencio at redhat.com> CommitDate: Wed Feb 20 13:49:25 2019 +0100 fixup! ubuntu18.04: Copy installer under medias --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index e5833a6..e1cd6b2 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -38,10 +38,6 @@ </iso> <kernel>install/vmlinuz</kernel> <initrd>install/initrd.gz</initrd> - <installer> - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> - <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> - </installer> </media> <media arch="x86_64" live="true"> <url> http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url > From fidencio at redhat.com Wed Feb 20 12:54:02 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 13:54:02 +0100 Subject: [Libosinfo] [osinfo-db PATCH 0/3] ubuntu18.04 amd64 server media fixes Message-ID: <20190220125405.26540-1-fidencio@redhat.com> This series should be considered as a follow-up of the work recently posted as: https://www.redhat.com/archives/libosinfo/2019-February/msg00138.html Fabiano Fid?ncio (3): ubuntu18.04: Fix kernel/initrd path for amd64 server media ubuntu18.04: Mark the amd64 server media as live ubuntu18.04: Mark live-server medias as not script installable data/os/ubuntu.com/ubuntu-18.04.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 From fidencio at redhat.com Wed Feb 20 12:54:03 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 13:54:03 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/3] ubuntu18.04: Fix kernel/initrd path for amd64 server media In-Reply-To: <20190220125405.26540-1-fidencio@redhat.com> References: <20190220125405.26540-1-fidencio@redhat.com> Message-ID: <20190220125405.26540-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index e1cd6b2..3db4a9d 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -36,8 +36,8 @@ <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> </iso> - <kernel>install/vmlinuz</kernel> - <initrd>install/initrd.gz</initrd> + <kernel>casper/vmlinuz</kernel> + <initrd>casper/initrd</initrd> </media> <media arch="x86_64" live="true"> <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.2-desktop-amd64.iso</url> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 12:54:04 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 13:54:04 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/3] ubuntu18.04: Mark the amd64 server media as live In-Reply-To: <20190220125405.26540-1-fidencio@redhat.com> References: <20190220125405.26540-1-fidencio@redhat.com> Message-ID: <20190220125405.26540-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 3db4a9d..257c0b0 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -31,7 +31,7 @@ </recommended> </resources> - <media arch="x86_64"> + <media arch="x86_64" live="true"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-amd64.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 12:54:05 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 13:54:05 +0100 Subject: [Libosinfo] [osinfo-db PATCH 3/3] ubuntu18.04: Mark live-server medias as not script installable In-Reply-To: <20190220125405.26540-1-fidencio@redhat.com> References: <20190220125405.26540-1-fidencio@redhat.com> Message-ID: <20190220125405.26540-4-fidencio@redhat.com> According to a conversation on #ubuntu-release live server medias are not script installable at all. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/ubuntu.com/ubuntu-18.04.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in index 257c0b0..0e2c428 100644 --- a/data/os/ubuntu.com/ubuntu-18.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in @@ -31,7 +31,7 @@ </recommended> </resources> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.2-server-amd64.iso</url> <iso> <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 16:21:44 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 17:21:44 +0100 Subject: [Libosinfo] [osinfo-db 0/4] Fix password requirements for a few installer scripts Message-ID: <20190220162148.9685-1-fidencio@redhat.com> Basically, "desktop" installations can be done passwordless for those distros while "jeos" installations do require a password. Fabiano Fid?ncio (4): centos,kickstart: Fix password requirements fedora,kickstart: Fix password requirements silverblue,kickstart: Fix password requirements rhel,kickstart: Fix password requirements .../install-script/centos.org/centos-kickstart-desktop.xml.in | 4 ++-- data/install-script/centos.org/centos-kickstart-jeos.xml.in | 2 +- .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 4 ++-- .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 2 +- .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 2 +- data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 4 ++-- data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) -- 2.20.1 From fidencio at redhat.com Wed Feb 20 16:21:45 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 17:21:45 +0100 Subject: [Libosinfo] [osinfo-db 1/4] centos, kickstart: Fix password requirements In-Reply-To: <20190220162148.9685-1-fidencio@redhat.com> References: <20190220162148.9685-1-fidencio@redhat.com> Message-ID: <20190220162148.9685-2-fidencio@redhat.com> "desktop" installations can be done passwordless; "jeos" installations require a password to be set. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../install-script/centos.org/centos-kickstart-desktop.xml.in | 4 ++-- data/install-script/centos.org/centos-kickstart-jeos.xml.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in index 60a4952..8702720 100644 --- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in +++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in @@ -10,8 +10,8 @@ <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> <param name="user-login" policy="required"/> - <param name="user-password" policy="required"/> - <param name="admin-password" policy="required"/> + <param name="user-password" policy="optional"/> + <param name="admin-password" policy="optional"/> <param name="avatar-location" policy="optional"/> <param name="avatar-disk" policy="optional"/> <param name="target-disk" policy="optional"/> diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in index 3feafec..0caf4f6 100644 --- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in +++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in @@ -5,7 +5,7 @@ <profile>jeos</profile> <expected-filename>centos.ks</expected-filename> <config> - <param name="admin-password" policy="optional"/> + <param name="admin-password" policy="required"/> <param name="l10n-keyboard" policy="optional"/> <param name="l10n-language" policy="optional"/> <param name="l10n-timezone" policy="optional"/> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 16:21:46 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 17:21:46 +0100 Subject: [Libosinfo] [osinfo-db 2/4] fedora, kickstart: Fix password requirements In-Reply-To: <20190220162148.9685-1-fidencio@redhat.com> References: <20190220162148.9685-1-fidencio@redhat.com> Message-ID: <20190220162148.9685-3-fidencio@redhat.com> "desktop" installations can be done passwordless; "jeos" installations require a password to be set. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 4 ++-- .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in index b16ec57..0b1d77a 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in @@ -10,8 +10,8 @@ <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> <param name="user-login" policy="required"/> - <param name="user-password" policy="required"/> - <param name="admin-password" policy="required"/> + <param name="user-password" policy="optional"/> + <param name="admin-password" policy="optional"/> <param name="avatar-location" policy="optional"/> <param name="avatar-disk" policy="optional"/> <param name="target-disk" policy="optional"/> diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in index 778295d..d172392 100644 --- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in +++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in @@ -5,7 +5,7 @@ <profile>jeos</profile> <expected-filename>fedora.ks</expected-filename> <config> - <param name="admin-password" policy="optional"/> + <param name="admin-password" policy="required"/> <param name="l10n-keyboard" policy="optional" value-map="http://x.org/x11-keyboard"/> <param name="l10n-language" policy="optional"/> <param name="l10n-timezone" policy="optional"/> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 16:21:47 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 17:21:47 +0100 Subject: [Libosinfo] [osinfo-db 3/4] silverblue, kickstart: Fix password requirements In-Reply-To: <20190220162148.9685-1-fidencio@redhat.com> References: <20190220162148.9685-1-fidencio@redhat.com> Message-ID: <20190220162148.9685-4-fidencio@redhat.com> "desktop" installation can be done passwordless. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in index fc6c1d7..f4fc953 100644 --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in @@ -9,7 +9,7 @@ <param name="l10n-language" policy="optional"/> <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> - <param name="user-login" policy="required"/> + <param name="user-login" policy="optional"/> <param name="user-password" policy="required"/> <param name="admin-password" policy="required"/> <param name="script-disk" policy="required"/> -- 2.20.1 From fidencio at redhat.com Wed Feb 20 16:21:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Wed, 20 Feb 2019 17:21:48 +0100 Subject: [Libosinfo] [osinfo-db 4/4] rhel, kickstart: Fix password requirements In-Reply-To: <20190220162148.9685-1-fidencio@redhat.com> References: <20190220162148.9685-1-fidencio@redhat.com> Message-ID: <20190220162148.9685-5-fidencio@redhat.com> "desktop" installations can be done passwordless; "jeos" installations require a password to be set. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 4 ++-- data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index 388d6d7..dfed40d 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -10,8 +10,8 @@ <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> <param name="user-login" policy="required"/> - <param name="user-password" policy="required"/> - <param name="admin-password" policy="required"/> + <param name="user-password" policy="optional"/> + <param name="admin-password" policy="optional"/> <param name="avatar-location" policy="optional"/> <param name="avatar-disk" policy="optional"/> <param name="target-disk" policy="optional"/> diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in index db7ec7f..006e362 100644 --- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in @@ -5,7 +5,7 @@ <profile>jeos</profile> <expected-filename>rhel.ks</expected-filename> <config> - <param name="admin-password" policy="optional"/> + <param name="admin-password" policy="required"/> <param name="l10n-keyboard" policy="optional"/> <param name="l10n-language" policy="optional"/> <param name="l10n-timezone" policy="optional"/> -- 2.20.1 From fidencio at redhat.com Mon Feb 25 08:37:48 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Mon, 25 Feb 2019 09:37:48 +0100 Subject: [Libosinfo] Moving some tests from libosinfo to osinfo-db Message-ID: <CAAY6Xsc4r0pcf8yQ2WAXcop9=pMa3CEDZ_p_-MUmKjkscLDA0g@mail.gmail.com> People, Recently we had this discussion on #virt channel about moving some tests out of libosinfo to osinfo-db. The reasoning behind that is that those tests are not actually testing libosinfo APIs, but whether the content present in osinfo-db is valid or not. The tests that should move are: - test-isodetect; - test-imageuris; - test-mediauris; - test-treeuris; The idea is to, from the next libosinfo release*, have those tests as part of osinfo-db. The new tests can: - be written in python using or not using some framework for that; - parse the XML directly without using libosinfo APIs to check the data; There's at least one new test should be written: - test-iso-kernel-and-initrd-paths; - This test will consist in: - Have the output of `isoinfo -J -i /path/to/media -f` stored in the same manner we already store the output of `isoinfo -d -i /path/to/media` - Check whether the kernel/initrd listed as part of the media actually matches what's in the media Whether we'll start the work by migrating the current tests and then add later the new test(s) or doing it vice-versa is something still to be decided. Regarding libosinfo, some new tests will have to be written in order to cover some issues there were found (and already fixed) by test-isodetect**. So, expect more work on libosinfo tests as well. *: next libosinfo release as 1.5.0, as I'm rolling out a 1.4.0 by the beginning of March. **: as having volume-id with exactly 32 characters. Best Regards, -- Fabiano Fid?ncio -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190225/0aec4a6b/attachment.htm> From fidencio at redhat.com Tue Feb 26 15:42:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 16:42:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH] fedora27: Add eol date Message-ID: <20190226154251.13171-1-fidencio@redhat.com> Fedora 27 reached its EOL status on November 30, 2018. https://fedoramagazine.org/fedora-27-end-of-life/ Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-27.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in index ba657d0..869fa6b 100644 --- a/data/os/fedoraproject.org/fedora-27.xml.in +++ b/data/os/fedoraproject.org/fedora-27.xml.in @@ -12,6 +12,7 @@ <derives-from id="http://fedoraproject.org/fedora/26"/> <release-date>2017-11-14</release-date> + <eol-date>2019-11-30</eol-date> <variant id="workstation"> <_name>Fedora 27 Workstation</_name> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 15:53:54 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 16:53:54 +0100 Subject: [Libosinfo] [osinfo-db PATCH] fedora27: Update URLs for medias and trees Message-ID: <20190226155354.15559-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- Pushed under "tests breaker fix" rule. --- data/os/fedoraproject.org/fedora-27.xml.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in index ba657d0..985dd41 100644 --- a/data/os/fedoraproject.org/fedora-27.xml.in +++ b/data/os/fedoraproject.org/fedora-27.xml.in @@ -34,7 +34,7 @@ <!-- Live --> <media arch="x86_64" live="true"> <variant id="workstation"/> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-27-1.6.iso</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-27-1.6.iso</url> <iso> <volume-id>Fedora-WS-Live-27.*</volume-id> <system-id>LINUX</system-id> @@ -46,7 +46,7 @@ <!-- Atomic --> <media arch="x86_64"> <variant id="workstation-atomic"/> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/WorkstationOstree/x86_64/iso/Fedora-WorkstationOstree-ostree-x86_64-27-1.6.iso</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/WorkstationOstree/x86_64/iso/Fedora-WorkstationOstree-ostree-x86_64-27-1.6.iso</url> <iso> <volume-id>Fedora-WSOstree-ostree-x86_64-27</volume-id> <system-id>LINUX</system-id> @@ -58,7 +58,7 @@ <!-- Network Installer !--> <media arch="x86_64"> <variant id="workstation-netinst"/> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-27-1.6.iso</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-27-1.6.iso</url> <iso> <volume-id>Fedora-WS-dvd-x86_64-27</volume-id> <system-id>LINUX</system-id> @@ -72,7 +72,7 @@ <!-- DVD --> <media arch="x86_64"> <variant id="server"/> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-dvd-x86_64-27-1.6.iso</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-dvd-x86_64-27-1.6.iso</url> <iso> <volume-id>Fedora-S-dvd-x86_64-27</volume-id> <system-id>LINUX</system-id> @@ -85,7 +85,7 @@ <!-- Network Installer !--> <media arch="x86_64"> <variant id="server-netinst"/> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-netinst-x86_64-27-1.6.iso</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/iso/Fedora-Server-netinst-x86_64-27-1.6.iso</url> <iso> <volume-id>Fedora-S-dvd-x86_64-27</volume-id> <system-id>LINUX</system-id> @@ -96,7 +96,7 @@ </media> <tree arch="x86_64"> - <url>https://download.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/os/</url> + <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Server/x86_64/os/</url> <variant id="server"/> <treeinfo> <family>Fedora</family> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:47 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:47 +0100 Subject: [Libosinfo] [osinfo-db PATCH 00/23] Add tree information for RHEL Message-ID: <20190226160610.23683-1-fidencio@redhat.com> This patch series adds tree information for all RHEL releases from 6.0, including some fixes in rhel-8 and rhel-8 regex for treeinfo's version or media's volume-id. Fabiano Fid?ncio (23): rhel-6.0: Add tree information rhel-6.1: Add tree information rhel-6.2: Add tree information rhel-6.3: Add tree information rhel-6.4: Add tree information rhel-6.5: Add tree information rhel-6.6: Add tree information rhel-6.7: Add tree information rhel-6.8: Add tree information rhel-6.9: Add tree information rhel-6.10: Add tree information rhel-7.0: Add tree information rhel-7.1: Add tree information rhel-7.2: Add tree information rhel-7.3: Add tree information rhel-7.4: Add tree information rhel-7.5: Add tree information rhel-7.6: Add tree information rhel-7-unknown: Add tree information rhel-8: Adjust version regex for x86_64 treeinfo rhel-8.0: Add tree information rhel-8-unknown: Adjust the regex for the volume id rhel-8-unknown: Add tree information data/os/redhat.com/rhel-6.0.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.1.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.10.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.2.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.3.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.4.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.5.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.6.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.7.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.8.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-6.9.xml.in | 65 ++++++++++++++++ data/os/redhat.com/rhel-7-unknown.xml.in | 57 ++++++++++++++ data/os/redhat.com/rhel-7.0.xml.in | 47 ++++++++++++ data/os/redhat.com/rhel-7.1.xml.in | 47 ++++++++++++ data/os/redhat.com/rhel-7.2.xml.in | 57 ++++++++++++++ data/os/redhat.com/rhel-7.3.xml.in | 57 ++++++++++++++ data/os/redhat.com/rhel-7.4.xml.in | 57 ++++++++++++++ data/os/redhat.com/rhel-7.5.xml.in | 49 ++++++++++++ data/os/redhat.com/rhel-7.6.xml.in | 49 ++++++++++++ data/os/redhat.com/rhel-8-unknown.xml.in | 95 +++++++++++++++++++++++- data/os/redhat.com/rhel-8.0.xml.in | 81 +++++++++++++++++++- 21 files changed, 1306 insertions(+), 5 deletions(-) -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:48 +0100 Subject: [Libosinfo] [osinfo-db PATCH 01/23] rhel-6.0: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.0.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in index 3029712..d37966f 100644 --- a/data/os/redhat.com/rhel-6.0.xml.in +++ b/data/os/redhat.com/rhel-6.0.xml.in @@ -27,6 +27,13 @@ <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> </devices> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.0 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.0 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -44,6 +51,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.0</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:49 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:49 +0100 Subject: [Libosinfo] [osinfo-db PATCH 02/23] rhel-6.1: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.1.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.1.xml.in b/data/os/redhat.com/rhel-6.1.xml.in index dda363e..53b7943 100644 --- a/data/os/redhat.com/rhel-6.1.xml.in +++ b/data/os/redhat.com/rhel-6.1.xml.in @@ -15,6 +15,13 @@ <release-date>2011-05-19</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.1 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.1 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.1</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:50 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:50 +0100 Subject: [Libosinfo] [osinfo-db PATCH 03/23] rhel-6.2: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.2.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.2.xml.in b/data/os/redhat.com/rhel-6.2.xml.in index dec3549..be0b0c7 100644 --- a/data/os/redhat.com/rhel-6.2.xml.in +++ b/data/os/redhat.com/rhel-6.2.xml.in @@ -15,6 +15,13 @@ <release-date>2011-12-06</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.2 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.2 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.2</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH 04/23] rhel-6.3: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.3.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.3.xml.in b/data/os/redhat.com/rhel-6.3.xml.in index 374daf1..c12c955 100644 --- a/data/os/redhat.com/rhel-6.3.xml.in +++ b/data/os/redhat.com/rhel-6.3.xml.in @@ -15,6 +15,13 @@ <release-date>2012-06-21</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.3 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.3 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.3</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:52 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH 05/23] rhel-6.4: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-6-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.4.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.4.xml.in b/data/os/redhat.com/rhel-6.4.xml.in index 4d827c5..29ecc77 100644 --- a/data/os/redhat.com/rhel-6.4.xml.in +++ b/data/os/redhat.com/rhel-6.4.xml.in @@ -15,6 +15,13 @@ <release-date>2013-02-21</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.4 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.4 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.4</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH 06/23] rhel-6.5: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-7-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.5.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.5.xml.in b/data/os/redhat.com/rhel-6.5.xml.in index c736dad..975c5b0 100644 --- a/data/os/redhat.com/rhel-6.5.xml.in +++ b/data/os/redhat.com/rhel-6.5.xml.in @@ -15,6 +15,13 @@ <release-date>2013-11-21</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.5 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.5 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.5</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:54 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:54 +0100 Subject: [Libosinfo] [osinfo-db PATCH 07/23] rhel-6.6: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-8-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.6.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.6.xml.in b/data/os/redhat.com/rhel-6.6.xml.in index f281aaf..624ee75 100644 --- a/data/os/redhat.com/rhel-6.6.xml.in +++ b/data/os/redhat.com/rhel-6.6.xml.in @@ -15,6 +15,13 @@ <release-date>2014-10-14</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.6 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.6 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.6</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:55 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:55 +0100 Subject: [Libosinfo] [osinfo-db PATCH 08/23] rhel-6.7: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-9-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.7.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.7.xml.in b/data/os/redhat.com/rhel-6.7.xml.in index a3b2e38..78be6e1 100644 --- a/data/os/redhat.com/rhel-6.7.xml.in +++ b/data/os/redhat.com/rhel-6.7.xml.in @@ -15,6 +15,13 @@ <release-date>2015-07-22</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.7 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.7 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.7</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:56 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:56 +0100 Subject: [Libosinfo] [osinfo-db PATCH 09/23] rhel-6.8: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-10-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.8.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.8.xml.in b/data/os/redhat.com/rhel-6.8.xml.in index b3bc6fa..b513dee 100644 --- a/data/os/redhat.com/rhel-6.8.xml.in +++ b/data/os/redhat.com/rhel-6.8.xml.in @@ -15,6 +15,13 @@ <release-date>2016-05-10</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.8 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.8 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.8</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:57 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:57 +0100 Subject: [Libosinfo] [osinfo-db PATCH 10/23] rhel-6.9: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-11-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.9.xml.in | 65 ++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.9.xml.in b/data/os/redhat.com/rhel-6.9.xml.in index ef769f9..631497a 100644 --- a/data/os/redhat.com/rhel-6.9.xml.in +++ b/data/os/redhat.com/rhel-6.9.xml.in @@ -15,6 +15,13 @@ <release-date>2017-03-21</release-date> <eol-date>2023-11-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.9 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.9 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.9</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:58 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:58 +0100 Subject: [Libosinfo] [osinfo-db PATCH 11/23] rhel-6.10: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-12-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-6.10.xml.in | 65 +++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/data/os/redhat.com/rhel-6.10.xml.in b/data/os/redhat.com/rhel-6.10.xml.in index b46b7b9..d7857b6 100644 --- a/data/os/redhat.com/rhel-6.10.xml.in +++ b/data/os/redhat.com/rhel-6.10.xml.in @@ -15,6 +15,13 @@ <release-date>2018-05-25</release-date> <eol-date>2024-06-30</eol-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 6.10 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 6.10 (Workstation)</name> + </variant> + <media arch="i686"> <iso> <system-id>LINUX</system-id> @@ -48,6 +55,64 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="i386"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>i386</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="i386"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>i386</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>6.10</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="all"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:05:59 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:05:59 +0100 Subject: [Libosinfo] [osinfo-db PATCH 12/23] rhel-7.0: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-13-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.0.xml.in | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/data/os/redhat.com/rhel-7.0.xml.in b/data/os/redhat.com/rhel-7.0.xml.in index 1c79e35..db45d19 100644 --- a/data/os/redhat.com/rhel-7.0.xml.in +++ b/data/os/redhat.com/rhel-7.0.xml.in @@ -13,6 +13,13 @@ <release-date>2014-06-10</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.0 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.0 (Workstation)</name> + </variant> + <devices> <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl --> <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 --> @@ -44,6 +51,46 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.0</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.0</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.0</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.0</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:00 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:00 +0100 Subject: [Libosinfo] [osinfo-db PATCH 13/23] rhel-7.1: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-14-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.1.xml.in | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/data/os/redhat.com/rhel-7.1.xml.in b/data/os/redhat.com/rhel-7.1.xml.in index 8a43acf..dc1ff4f 100644 --- a/data/os/redhat.com/rhel-7.1.xml.in +++ b/data/os/redhat.com/rhel-7.1.xml.in @@ -14,6 +14,13 @@ <release-date>2015-03-05</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.1 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.1 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -32,6 +39,46 @@ <initrd>isolinux/initrd.img</initrd> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.1</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.1</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.1</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.1</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:01 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:01 +0100 Subject: [Libosinfo] [osinfo-db PATCH 14/23] rhel-7.2: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-15-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.2.xml.in | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in index 7cdae3b..60dbf95 100644 --- a/data/os/redhat.com/rhel-7.2.xml.in +++ b/data/os/redhat.com/rhel-7.2.xml.in @@ -28,6 +28,13 @@ <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> </devices> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.2 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.2 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -65,6 +72,56 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.2</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.2</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.2</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.2</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.2</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:02 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:02 +0100 Subject: [Libosinfo] [osinfo-db PATCH 15/23] rhel-7.3: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-16-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.3.xml.in | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/os/redhat.com/rhel-7.3.xml.in b/data/os/redhat.com/rhel-7.3.xml.in index 4418af7..1454c15 100644 --- a/data/os/redhat.com/rhel-7.3.xml.in +++ b/data/os/redhat.com/rhel-7.3.xml.in @@ -14,6 +14,13 @@ <release-date>2016-11-03</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.3 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.3 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -51,6 +58,56 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.3</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.3</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.3</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.3</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.3</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:03 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:03 +0100 Subject: [Libosinfo] [osinfo-db PATCH 16/23] rhel-7.4: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-17-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.4.xml.in | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/os/redhat.com/rhel-7.4.xml.in b/data/os/redhat.com/rhel-7.4.xml.in index 72bb357..78afe58 100644 --- a/data/os/redhat.com/rhel-7.4.xml.in +++ b/data/os/redhat.com/rhel-7.4.xml.in @@ -14,6 +14,13 @@ <release-date>2017-08-01</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.4 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.4 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -51,6 +58,56 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.4</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.4</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.4</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.4</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.4</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:04 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:04 +0100 Subject: [Libosinfo] [osinfo-db PATCH 17/23] rhel-7.5: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-18-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.5.xml.in | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/data/os/redhat.com/rhel-7.5.xml.in b/data/os/redhat.com/rhel-7.5.xml.in index 6dea055..bc5821e 100644 --- a/data/os/redhat.com/rhel-7.5.xml.in +++ b/data/os/redhat.com/rhel-7.5.xml.in @@ -14,6 +14,13 @@ <release-date>2018-04-10</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.5 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.5 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -51,11 +58,53 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.5</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.5</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.5</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.5</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> <treeinfo> <family>Red Hat Enterprise Linux</family> <version>7.5</version> <arch>x86_64</arch> + <variant>Workstation</variant> </treeinfo> </tree> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:05 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:05 +0100 Subject: [Libosinfo] [osinfo-db PATCH 18/23] rhel-7.6: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-19-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7.6.xml.in | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in index 1098c77..c67a3c8 100644 --- a/data/os/redhat.com/rhel-7.6.xml.in +++ b/data/os/redhat.com/rhel-7.6.xml.in @@ -14,6 +14,13 @@ <release-date>2018-10-30</release-date> + <variant id="server"> + <name>Red Hat Enterprise Linux 7.6 (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7.6 (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -51,11 +58,53 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.6</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.6</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.6</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.6</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="workstation"/> <treeinfo> <family>Red Hat Enterprise Linux</family> <version>7.6</version> <arch>x86_64</arch> + <variant>Workstation</variant> </treeinfo> </tree> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:06 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:06 +0100 Subject: [Libosinfo] [osinfo-db PATCH 19/23] rhel-7-unknown: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-20-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-7-unknown.xml.in | 57 ++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/data/os/redhat.com/rhel-7-unknown.xml.in b/data/os/redhat.com/rhel-7-unknown.xml.in index c436887..4708e10 100644 --- a/data/os/redhat.com/rhel-7-unknown.xml.in +++ b/data/os/redhat.com/rhel-7-unknown.xml.in @@ -12,6 +12,13 @@ <upgrades id="http://redhat.com/rhel/7.6"/> <derives-from id="http://redhat.com/rhel/7.6"/> + <variant id="server"> + <name>Red Hat Enterprise Linux 7 Unknown (Server)</name> + </variant> + <variant id="workstation"> + <name>Red Hat Enterprise Linux 7 Unknown (Workstation)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -49,6 +56,56 @@ </iso> </media> + <tree arch="ppc64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.([7-9]|[1-9][0-9])</version> + <arch>ppc64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.([7-9]|[1-9][0-9])</version> + <arch>ppc64le</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.([7-9]|[1-9][0-9])</version> + <arch>s390x</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="server"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.([7-9]|[1-9][0-9])</version> + <arch>x86_64</arch> + <variant>Server</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="workstation"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>7.([7-9]|[1-9][0-9])</version> + <arch>x86_64</arch> + <variant>Workstation</variant> + </treeinfo> + </tree> + <resources arch="ppc64"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:07 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:07 +0100 Subject: [Libosinfo] [osinfo-db PATCH 20/23] rhel-8: Adjust version regex for x86_64 treeinfo In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-21-fidencio@redhat.com> Let's make it match *only* with 8.0, avoiding it to match with 8.0.0 (for instance). Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-8.0.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in index 119c146..16a4dd8 100644 --- a/data/os/redhat.com/rhel-8.0.xml.in +++ b/data/os/redhat.com/rhel-8.0.xml.in @@ -71,7 +71,7 @@ <tree arch="x86_64"> <treeinfo> <family>Red Hat Enterprise Linux</family> - <version>8.0</version> + <version>8.0$</version> <arch>x86_64</arch> </treeinfo> </tree> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:08 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:08 +0100 Subject: [Libosinfo] [osinfo-db PATCH 21/23] rhel-8.0: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-22-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-8.0.xml.in | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/data/os/redhat.com/rhel-8.0.xml.in b/data/os/redhat.com/rhel-8.0.xml.in index 16a4dd8..4f768ba 100644 --- a/data/os/redhat.com/rhel-8.0.xml.in +++ b/data/os/redhat.com/rhel-8.0.xml.in @@ -36,6 +36,13 @@ <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> </devices> + <variant id="baseos"> + <name>Red Hat Enterprise Linux 8.0 (BaseOS)</name> + </variant> + <variant id="appstream"> + <name>Red Hat Enterprise Linux 8.0 (AppStream)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -68,11 +75,83 @@ </iso> </media> + <tree arch="aarch64"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>aarch64</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>ppc64le</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>s390x</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>x86_64</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="aarch64"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>aarch64</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>ppc64le</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.0$</version> + <arch>s390x</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + <tree arch="x86_64"> + <variant id="baseos"/> <treeinfo> <family>Red Hat Enterprise Linux</family> <version>8.0$</version> <arch>x86_64</arch> + <variant>BaseOS</variant> </treeinfo> </tree> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:09 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:09 +0100 Subject: [Libosinfo] [osinfo-db PATCH 22/23] rhel-8-unknown: Adjust the regex for the volume id In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-23-fidencio@redhat.com> Currently our regex consider cases as 8-x with x > 0. Although the case shown above has still to be considered, we also have to consider: 8-x-y, with x >= 0 and y >= 0. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-8-unknown.xml.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in index 7367038..8882940 100644 --- a/data/os/redhat.com/rhel-8-unknown.xml.in +++ b/data/os/redhat.com/rhel-8-unknown.xml.in @@ -15,7 +15,7 @@ <media arch="x86_64"> <iso> <system-id>LINUX</system-id> - <volume-id>.*RHEL-8-([1-9]|[1-9][0-9]).*x86_64.*</volume-id> + <volume-id>.*RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*x86_64.*</volume-id> </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> @@ -24,21 +24,21 @@ <media arch="aarch64"> <iso> <system-id>LINUX</system-id> - <volume-id>RHEL-8-([1-9]|[1-9][0-9]).*aarch64$</volume-id> + <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*aarch64$</volume-id> </iso> </media> <media arch="ppc64le"> <iso> <system-id>PPC</system-id> - <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9]).*ppc64le$</volume-id> + <volume-id>RHEL[_-]8[_-](([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])[_-]([0-9]|[1-9][0-9]))).*ppc64le$</volume-id> </iso> </media> <media arch="s390x"> <iso> <system-id>LINUX</system-id> - <volume-id>RHEL-8-([1-9]|[1-9][0-9]).*s390x$</volume-id> + <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*s390x$</volume-id> </iso> </media> -- 2.20.1 From fidencio at redhat.com Tue Feb 26 16:06:10 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Tue, 26 Feb 2019 17:06:10 +0100 Subject: [Libosinfo] [osinfo-db PATCH 23/23] rhel-8-unknown: Add tree information In-Reply-To: <20190226160610.23683-1-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> Message-ID: <20190226160610.23683-24-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/redhat.com/rhel-8-unknown.xml.in | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in index 8882940..19e2f27 100644 --- a/data/os/redhat.com/rhel-8-unknown.xml.in +++ b/data/os/redhat.com/rhel-8-unknown.xml.in @@ -12,6 +12,13 @@ <upgrades id="http://redhat.com/rhel/8.0"/> <derives-from id="http://redhat.com/rhel/8.0"/> + <variant id="baseos"> + <name>Red Hat Enterprise Linux 8 Unknown (BaseOS)</name> + </variant> + <variant id="appstream"> + <name>Red Hat Enterprise Linux 8 Unknown (AppStream)</name> + </variant> + <media arch="x86_64"> <iso> <system-id>LINUX</system-id> @@ -42,6 +49,86 @@ </iso> </media> + <tree arch="aarch64"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>aarch64</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>ppc64le</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>s390x</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="appstream"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>x86_64</arch> + <variant>AppStream</variant> + </treeinfo> + </tree> + + <tree arch="aarch64"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>aarch64</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + + <tree arch="ppc64le"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>ppc64le</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + + <tree arch="s390x"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>s390x</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + + <tree arch="x86_64"> + <variant id="baseos"/> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))</version> + <arch>x86_64</arch> + <variant>BaseOS</variant> + </treeinfo> + </tree> + <resources arch="ppc64le"> <minimum> <n-cpus>1</n-cpus> -- 2.20.1 From ptoscano at redhat.com Wed Feb 27 14:29:30 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 15:29:30 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/2] win: add Windows Server 2019 data Message-ID: <20190227142931.30763-1-ptoscano@redhat.com> https://docs.microsoft.com/en-us/windows-server/get-started-19/whats-new-19 --- data/os/microsoft.com/win-2k19.xml.in | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 data/os/microsoft.com/win-2k19.xml.in diff --git a/data/os/microsoft.com/win-2k19.xml.in b/data/os/microsoft.com/win-2k19.xml.in new file mode 100644 index 0000000..0f291b6 --- /dev/null +++ b/data/os/microsoft.com/win-2k19.xml.in @@ -0,0 +1,32 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://microsoft.com/win/2k19"> + <short-id>win2k19</short-id> + <_name>Microsoft Windows Server 2019</_name> + <version>10.0</version> + <_vendor>Microsoft Corporation</_vendor> + <family>winnt</family> + <distro>win</distro> + <derives-from id="http://microsoft.com/win/2k16"/> + <upgrades id="http://microsoft.com/win/2k16"/> + + <release-date>2018-10-02</release-date> + + <resources arch="x86_64"> + <minimum> + <cpu>1400000000</cpu> + <n-cpus>1</n-cpus> + <ram>536870912</ram> + <storage>34359738368</storage> + </minimum> + + <recommended> + <cpu>2000000000</cpu> + <ram>2147483648</ram> + <storage>42949672960</storage> + </recommended> + </resources> + + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Wed Feb 27 14:29:31 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 15:29:31 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] win2k16: fix minimum storage size In-Reply-To: <20190227142931.30763-1-ptoscano@redhat.com> References: <20190227142931.30763-1-ptoscano@redhat.com> Message-ID: <20190227142931.30763-2-ptoscano@redhat.com> The official documentation [1] specifies that 32 GB is the absolute minimum requirement. [1] https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements --- data/os/microsoft.com/win-2k16.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in index f3db328..a13c628 100644 --- a/data/os/microsoft.com/win-2k16.xml.in +++ b/data/os/microsoft.com/win-2k16.xml.in @@ -46,7 +46,7 @@ <cpu>1400000000</cpu> <n-cpus>1</n-cpus> <ram>536870912</ram> - <storage>10737418240</storage> + <storage>34359738368</storage> </minimum> <recommended> -- 2.20.1 From fidencio at redhat.com Wed Feb 27 14:52:20 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Wed, 27 Feb 2019 15:52:20 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/2] win: add Windows Server 2019 data In-Reply-To: <20190227142931.30763-1-ptoscano@redhat.com> References: <20190227142931.30763-1-ptoscano@redhat.com> Message-ID: <CAAY6Xsc-9O2qokpQiVYJtnahAsgeg_qgGEJSKPwuo0j3MWRCUA@mail.gmail.com> On Wed, Feb 27, 2019 at 3:29 PM Pino Toscano <ptoscano at redhat.com> wrote: > https://docs.microsoft.com/en-us/windows-server/get-started-19/whats-new-19 > --- > data/os/microsoft.com/win-2k19.xml.in | 32 +++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 data/os/microsoft.com/win-2k19.xml.in > > diff --git a/data/os/microsoft.com/win-2k19.xml.in b/data/os/ > microsoft.com/win-2k19.xml.in > new file mode 100644 > index 0000000..0f291b6 > --- /dev/null > +++ b/data/os/microsoft.com/win-2k19.xml.in > @@ -0,0 +1,32 @@ > +<libosinfo version="0.0.1"> > +<!-- Licensed under the GNU General Public License version 2 or later. > + See http://www.gnu.org/licenses/ for a copy of the license text --> > + <os id="http://microsoft.com/win/2k19"> > + <short-id>win2k19</short-id> > + <_name>Microsoft Windows Server 2019</_name> > + <version>10.0</version> > + <_vendor>Microsoft Corporation</_vendor> > + <family>winnt</family> > + <distro>win</distro> > + <derives-from id="http://microsoft.com/win/2k16"/> > + <upgrades id="http://microsoft.com/win/2k16"/> > + > + <release-date>2018-10-02</release-date> > + > + <resources arch="x86_64"> > + <minimum> > + <cpu>1400000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>536870912</ram> > + <storage>34359738368</storage> > + </minimum> > + > + <recommended> > + <cpu>2000000000</cpu> > + <ram>2147483648</ram> > + <storage>42949672960</storage> > + </recommended> > + </resources> > + > + </os> > +</libosinfo> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com> Please, before pushing, add to the commit message the reason why no media has been added to this new OS entry. :-) -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190227/c8a32dad/attachment.htm> From fidencio at redhat.com Wed Feb 27 14:52:33 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Wed, 27 Feb 2019 15:52:33 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] win2k16: fix minimum storage size In-Reply-To: <20190227142931.30763-2-ptoscano@redhat.com> References: <20190227142931.30763-1-ptoscano@redhat.com> <20190227142931.30763-2-ptoscano@redhat.com> Message-ID: <CAAY6Xsf=D7qQ89JG8E5iEvA0QR8HFtMysb1J=f7X2-zu6M8WRQ@mail.gmail.com> On Wed, Feb 27, 2019 at 3:29 PM Pino Toscano <ptoscano at redhat.com> wrote: > The official documentation [1] specifies that 32 GB is the absolute > minimum requirement. > > [1] > https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements > --- > data/os/microsoft.com/win-2k16.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/ > microsoft.com/win-2k16.xml.in > index f3db328..a13c628 100644 > --- a/data/os/microsoft.com/win-2k16.xml.in > +++ b/data/os/microsoft.com/win-2k16.xml.in > @@ -46,7 +46,7 @@ > <cpu>1400000000</cpu> > <n-cpus>1</n-cpus> > <ram>536870912</ram> > - <storage>10737418240</storage> > + <storage>34359738368</storage> > </minimum> > > <recommended> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190227/97981812/attachment.htm> From ptoscano at redhat.com Wed Feb 27 15:14:32 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 16:14:32 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 1/2] win: add Windows Server 2019 data Message-ID: <20190227151433.9071-1-ptoscano@redhat.com> https://docs.microsoft.com/en-us/windows-server/get-started-19/whats-new-19 This new OS does not include any <media>, and this is done on purpose: sadly, the ISOs have the same metadata (like Volume ID, etc) as win2k16 (Windows Server 2016), and thus it is not possible to distinguish them. Regardless, having this OS is still useful for users to match an OS with an osinfo ID. --- data/os/microsoft.com/win-2k19.xml.in | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 data/os/microsoft.com/win-2k19.xml.in diff --git a/data/os/microsoft.com/win-2k19.xml.in b/data/os/microsoft.com/win-2k19.xml.in new file mode 100644 index 0000000..0f291b6 --- /dev/null +++ b/data/os/microsoft.com/win-2k19.xml.in @@ -0,0 +1,32 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://microsoft.com/win/2k19"> + <short-id>win2k19</short-id> + <_name>Microsoft Windows Server 2019</_name> + <version>10.0</version> + <_vendor>Microsoft Corporation</_vendor> + <family>winnt</family> + <distro>win</distro> + <derives-from id="http://microsoft.com/win/2k16"/> + <upgrades id="http://microsoft.com/win/2k16"/> + + <release-date>2018-10-02</release-date> + + <resources arch="x86_64"> + <minimum> + <cpu>1400000000</cpu> + <n-cpus>1</n-cpus> + <ram>536870912</ram> + <storage>34359738368</storage> + </minimum> + + <recommended> + <cpu>2000000000</cpu> + <ram>2147483648</ram> + <storage>42949672960</storage> + </recommended> + </resources> + + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Wed Feb 27 15:14:33 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 16:14:33 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 2/2] win2k16: fix minimum storage size In-Reply-To: <20190227151433.9071-1-ptoscano@redhat.com> References: <20190227151433.9071-1-ptoscano@redhat.com> Message-ID: <20190227151433.9071-2-ptoscano@redhat.com> The official documentation [1] specifies that 32 GB is the absolute minimum requirement. [1] https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements --- data/os/microsoft.com/win-2k16.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in index f3db328..a13c628 100644 --- a/data/os/microsoft.com/win-2k16.xml.in +++ b/data/os/microsoft.com/win-2k16.xml.in @@ -46,7 +46,7 @@ <cpu>1400000000</cpu> <n-cpus>1</n-cpus> <ram>536870912</ram> - <storage>10737418240</storage> + <storage>34359738368</storage> </minimum> <recommended> -- 2.20.1 From fidencio at redhat.com Wed Feb 27 15:31:00 2019 From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=) Date: Wed, 27 Feb 2019 16:31:00 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 1/2] win: add Windows Server 2019 data In-Reply-To: <20190227151433.9071-1-ptoscano@redhat.com> References: <20190227151433.9071-1-ptoscano@redhat.com> Message-ID: <CAAY6XsdqBdZDVFmfXrXfHmuTzk6EFWV=_-ETy+vJZZNfp5mEug@mail.gmail.com> On Wed, Feb 27, 2019 at 4:14 PM Pino Toscano <ptoscano at redhat.com> wrote: > https://docs.microsoft.com/en-us/windows-server/get-started-19/whats-new-19 > > This new OS does not include any <media>, and this is done on purpose: > sadly, the ISOs have the same metadata (like Volume ID, etc) as win2k16 > (Windows Server 2016), and thus it is not possible to distinguish them. > Although there are workarounds for detecting medias with the same volume-id, as setting the media's volume-size, it doesn't look like the way to go for the Windows(es) medias, as we'd have to add the volume-size for each one of the supported languages (and also do the same for the 2k16 ones). Would be nice to have that^ mentioned in the commit log as well. Do you reword/add that before pushing or shall I do that before I push? :-) > Regardless, having this OS is still useful for users to match an OS with > an osinfo ID. > --- > data/os/microsoft.com/win-2k19.xml.in | 32 +++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 data/os/microsoft.com/win-2k19.xml.in > > diff --git a/data/os/microsoft.com/win-2k19.xml.in b/data/os/ > microsoft.com/win-2k19.xml.in > new file mode 100644 > index 0000000..0f291b6 > --- /dev/null > +++ b/data/os/microsoft.com/win-2k19.xml.in > @@ -0,0 +1,32 @@ > +<libosinfo version="0.0.1"> > +<!-- Licensed under the GNU General Public License version 2 or later. > + See http://www.gnu.org/licenses/ for a copy of the license text --> > + <os id="http://microsoft.com/win/2k19"> > + <short-id>win2k19</short-id> > + <_name>Microsoft Windows Server 2019</_name> > + <version>10.0</version> > + <_vendor>Microsoft Corporation</_vendor> > + <family>winnt</family> > + <distro>win</distro> > + <derives-from id="http://microsoft.com/win/2k16"/> > + <upgrades id="http://microsoft.com/win/2k16"/> > + > + <release-date>2018-10-02</release-date> > + > + <resources arch="x86_64"> > + <minimum> > + <cpu>1400000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>536870912</ram> > + <storage>34359738368</storage> > + </minimum> > + > + <recommended> > + <cpu>2000000000</cpu> > + <ram>2147483648</ram> > + <storage>42949672960</storage> > + </recommended> > + </resources> > + > + </os> > +</libosinfo> > -- > 2.20.1 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo > Reviewed-by: Fabiano Fid?ncio <fidencio at redhat.com> ... for both patches. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://listman.redhat.com/archives/libosinfo/attachments/20190227/d867d236/attachment.htm> From ptoscano at redhat.com Wed Feb 27 16:30:13 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 17:30:13 +0100 Subject: [Libosinfo] [osinfo-db PATCH v3 1/2] win: add Windows Server 2019 data Message-ID: <20190227163014.13363-1-ptoscano@redhat.com> https://docs.microsoft.com/en-us/windows-server/get-started-19/whats-new-19 This new OS does not include any <media>, and this is done on purpose: sadly, the ISOs have the same metadata (like Volume ID, etc) as win2k16 (Windows Server 2016), and thus it is not possible to distinguish them. Theoretically, using the volume size can help with the detection; however, the Windows ISOs have different supported languages, and there is no way to specify the volume size for each language. Regardless, having this OS is still useful for users to match an OS with an osinfo ID. --- data/os/microsoft.com/win-2k19.xml.in | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 data/os/microsoft.com/win-2k19.xml.in diff --git a/data/os/microsoft.com/win-2k19.xml.in b/data/os/microsoft.com/win-2k19.xml.in new file mode 100644 index 0000000..0f291b6 --- /dev/null +++ b/data/os/microsoft.com/win-2k19.xml.in @@ -0,0 +1,32 @@ +<libosinfo version="0.0.1"> +<!-- Licensed under the GNU General Public License version 2 or later. + See http://www.gnu.org/licenses/ for a copy of the license text --> + <os id="http://microsoft.com/win/2k19"> + <short-id>win2k19</short-id> + <_name>Microsoft Windows Server 2019</_name> + <version>10.0</version> + <_vendor>Microsoft Corporation</_vendor> + <family>winnt</family> + <distro>win</distro> + <derives-from id="http://microsoft.com/win/2k16"/> + <upgrades id="http://microsoft.com/win/2k16"/> + + <release-date>2018-10-02</release-date> + + <resources arch="x86_64"> + <minimum> + <cpu>1400000000</cpu> + <n-cpus>1</n-cpus> + <ram>536870912</ram> + <storage>34359738368</storage> + </minimum> + + <recommended> + <cpu>2000000000</cpu> + <ram>2147483648</ram> + <storage>42949672960</storage> + </recommended> + </resources> + + </os> +</libosinfo> -- 2.20.1 From ptoscano at redhat.com Wed Feb 27 16:30:14 2019 From: ptoscano at redhat.com (Pino Toscano) Date: Wed, 27 Feb 2019 17:30:14 +0100 Subject: [Libosinfo] [osinfo-db PATCH v3 2/2] win2k16: fix minimum storage size In-Reply-To: <20190227163014.13363-1-ptoscano@redhat.com> References: <20190227163014.13363-1-ptoscano@redhat.com> Message-ID: <20190227163014.13363-2-ptoscano@redhat.com> The official documentation [1] specifies that 32 GB is the absolute minimum requirement. [1] https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements --- data/os/microsoft.com/win-2k16.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/microsoft.com/win-2k16.xml.in b/data/os/microsoft.com/win-2k16.xml.in index f3db328..a13c628 100644 --- a/data/os/microsoft.com/win-2k16.xml.in +++ b/data/os/microsoft.com/win-2k16.xml.in @@ -46,7 +46,7 @@ <cpu>1400000000</cpu> <n-cpus>1</n-cpus> <ram>536870912</ram> - <storage>10737418240</storage> + <storage>34359738368</storage> </minimum> <recommended> -- 2.20.1 From crobinso at redhat.com Wed Feb 27 18:45:26 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:45:26 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 01/29] ubuntu, preseed: Add "desktop" install-script In-Reply-To: <20190219162755.15367-2-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-2-fidencio@redhat.com> Message-ID: <127f8826-79e6-99d1-3173-b85049e46ec5@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Let's add ubuntu's preseed file for Desktop profile. The preseed file > was contributed by Jean-Baptiste Lallement, from Canonical and is pretty > much the same file their use on their testing environment (apart from a > few tweaks done here and there to adpat it to our needs). > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu.com/ubuntu-preseed-desktop.xml.in | 98 +++++++++++++++++++ > 1 file changed, 98 insertions(+) > create mode 100644 data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in > I don't know much about debian/ubuntu install scripts, but I verified the param names match other installer scripts and that things appear sane Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:48:16 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:48:16 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 07/29] ubuntu19.04: Add "desktop" install-script In-Reply-To: <20190219162755.15367-8-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-8-fidencio@redhat.com> Message-ID: <381f61c4-cb1b-c5ee-255b-939e2c4ce275@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/ubuntu.com/ubuntu-19.04.xml.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in > index 299ec56..09012a6 100644 > --- a/data/os/ubuntu.com/ubuntu-19.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in > @@ -85,6 +85,7 @@ > </tree> > > <installer> > + <script id='http://ubuntu.com/ubuntu/preseed/desktop'/> > <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> > </installer> > </os> > For 2-7 Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:49:56 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:49:56 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 08/29] ubuntu, jeos: Fix the command-line In-Reply-To: <20190219162755.15367-9-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-9-fidencio@redhat.com> Message-ID: <3966271c-82d7-2b64-1efd-7ded968e4fb4@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > The currently command line has never worked as preseed files should be > passed to the kernel as file=/path/to/file instead of > file=file:/path/to/file. > s/currently/current/ I guess > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > index c56f859..37f9d7f 100644 > --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > @@ -21,7 +21,7 @@ > <xsl:output method="text"/> > > <xsl:template match="/command-line"> > - <xsl:text>file=file:/</xsl:text> > + <xsl:text>file=/</xsl:text> > <xsl:value-of select="script/expected-filename"/> > <xsl:text> locale=</xsl:text> > <xsl:value-of select="config/l10n-language"/> > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:55:04 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:55:04 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 09/29] ubuntu, jeos: Fix hostname's template indentation In-Reply-To: <20190219162755.15367-10-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-10-fidencio@redhat.com> Message-ID: <b5d7e6b4-748f-89f3-95fd-6016ba331252@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > index 37f9d7f..4f4bc69 100644 > --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > @@ -44,16 +44,16 @@ > </xsl:choose> > </xsl:template> > > - <xsl:template name="hostname"> > - <xsl:choose> > - <xsl:when test="config/hostname != ''"> > + <xsl:template name="hostname"> > + <xsl:choose> > + <xsl:when test="config/hostname != ''"> > <xsl:value-of select="config/hostname"/> > - </xsl:when> > - <xsl:otherwise> > - <xsl:text>ubuntu</xsl:text> > - </xsl:otherwise> > - </xsl:choose> > - </xsl:template> > + </xsl:when> > + <xsl:otherwise> > + <xsl:text>ubuntu</xsl:text> > + </xsl:otherwise> > + </xsl:choose> > + </xsl:template> > > <xsl:template match="/install-script-config">d-i debian-installer/locale string <xsl:value-of select="config/l10n-language"/> > d-i console-setup/ask_detect boolean false > There's still hard tabs here afterwards though, so please fix it if it doesn't cause too much conflict later in the series. We should remove all hardtabs from the code base IMO but it doesn't need to block this series. Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:56:39 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:56:39 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 11/29] ubuntu, jeos: Fix install-script-config's template indentation In-Reply-To: <20190219162755.15367-12-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-12-fidencio@redhat.com> Message-ID: <362dbb54-6319-a436-d9a1-d719d5ef9e3f@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:56:27 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:56:27 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 10/29] ubuntu, jeos: Fix command-line's template indentation In-Reply-To: <20190219162755.15367-11-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-11-fidencio@redhat.com> Message-ID: <ff2624b9-1e93-1744-9664-461754ae8f39@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 18:58:16 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 13:58:16 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 12/29] ubuntu, jeos: Clean-up install-script In-Reply-To: <20190219162755.15367-13-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-13-fidencio@redhat.com> Message-ID: <92b9ac91-96d0-1163-c34e-763bd42c0fd8@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Unattended installation is only targetting ubuntu 12.04+. Knowing that, > doesn't make sense to keep the whole lot of conditions in the > installer-script code. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 54 ------------------- > 1 file changed, 54 deletions(-) Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 19:02:05 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:02:05 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 13/29] ubuntu, jeos: Force the system to boot without splash screen In-Reply-To: <20190219162755.15367-14-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-14-fidencio@redhat.com> Message-ID: <9a5ddc04-d562-4506-25d5-ba9db996a977@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Unfortunately, if we don't manually force the system to boot without > splash screen, the splash will load and the user would have to manually > switch to VT[0-6]. > Is this an ubuntu bug or expected behavior? Either way seems like it warrants a brief comment at the code site. Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > index ad15ad5..1e61754 100644 > --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > @@ -95,6 +95,10 @@ ubiquity ubiquity/reboot boolean true > > d-i finish-install/reboot_in_progress note > > +d-i preseed/late_command string \ > + in-target sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /etc/default/grub ; \ > + in-target bash -c 'update-grub2' ; > + > <xsl:if test="os/version = 13.04"> > ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$prompt" ] || return 0/' /etc/init.d/casper > </xsl:if> > From crobinso at redhat.com Wed Feb 27 19:09:53 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:09:53 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 14/29] ubuntu, jeos: Tune extra installed softwares In-Reply-To: <20190219162755.15367-15-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-15-fidencio@redhat.com> Message-ID: <3376e2b9-ec9e-b926-a396-dcfbb5382f3d@redhat.com> On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > Seems that although openssh-server is present in all ubuntu servers, > python-software-properties is not. > > For newer versions of ubuntu, let's just install > python3-software-properties. > > For 12.04, let's install python-software-properties. > > For 12.10, let's avoid installing as it'd raise an error during > installation. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > I think the deliberate omission of 12.10 could use a comment in the XML Reviewed-by: Cole Robinson <crobinso at redhat.com> > diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > index 1e61754..79cdb8d 100644 > --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in > @@ -82,7 +82,17 @@ d-i passwd/root-password-again password <xsl:value-of select="config/admin-passw > > tasksel tasksel/first multiselect standard > d-i pkgsel/include/install-recommends boolean true > -d-i pkgsel/include string openssh-server python-software-properties > +d-i pkgsel/include string openssh-server > +<xsl:choose> > + <xsl:when test="os/version &lt; 13.10"> > + <xsl:if test="os/version = 12.04"> > +d-i pkgsel/include string python-software-properties > + </xsl:if> > + </xsl:when> > + <xsl:otherwise> > +d-i pkgsel/include string python3-software-properties > + </xsl:otherwise> > +</xsl:choose> > > d-i grub-installer/only_debian boolean true > d-i grub-installer/with_other_os boolean true > - Cole From crobinso at redhat.com Wed Feb 27 19:18:06 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:18:06 -0500 Subject: [Libosinfo] [osinfo-db PATCH v2 27/29] ubuntu18.04: Copy installer under medias In-Reply-To: <7f435fce3f91cfa73b9211f6057ecfc352cfe434.camel@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-28-fidencio@redhat.com> <7f435fce3f91cfa73b9211f6057ecfc352cfe434.camel@redhat.com> Message-ID: <39138eef-8817-54f2-cc75-1d995629cabd@redhat.com> On 2/20/19 7:51 AM, Fabiano Fid?ncio wrote: > On Tue, 2019-02-19 at 17:27 +0100, Fabiano Fid?ncio wrote: >> Let's copy the installer under the medias as we've provided new APIs >> on >> libosinfo for relying on the media content instead of relying on the >> OS. >> >> The reasoning behind of that is because not all medias support >> installers for both profiles. >> >> Let's also leave the installer-script under the OSes as >> osinfo-install-script relies on that. >> >> Last but not least, we're just copying the installer under the medias >> which the installer has been tested against. >> >> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> >> --- >> data/os/ubuntu.com/ubuntu-18.04.xml.in | 7 +++++++ >> 1 file changed, 7 insertions(+) >> For 15-29 + this fixup: Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 19:29:10 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:29:10 -0500 Subject: [Libosinfo] [osinfo-db PATCH 0/3] ubuntu18.04 amd64 server media fixes In-Reply-To: <20190220125405.26540-1-fidencio@redhat.com> References: <20190220125405.26540-1-fidencio@redhat.com> Message-ID: <6d5f056a-6f87-55df-42d2-a5a073c04b07@redhat.com> On 2/20/19 7:54 AM, Fabiano Fid?ncio wrote: > This series should be considered as a follow-up of the work recently > posted as: > https://www.redhat.com/archives/libosinfo/2019-February/msg00138.html > > Fabiano Fid?ncio (3): > ubuntu18.04: Fix kernel/initrd path for amd64 server media > ubuntu18.04: Mark the amd64 server media as live > ubuntu18.04: Mark live-server medias as not script installable > > data/os/ubuntu.com/ubuntu-18.04.xml.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 19:32:35 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:32:35 -0500 Subject: [Libosinfo] [osinfo-db 0/4] Fix password requirements for a few installer scripts In-Reply-To: <20190220162148.9685-1-fidencio@redhat.com> References: <20190220162148.9685-1-fidencio@redhat.com> Message-ID: <a17ae847-85b7-8a5a-fe12-fb0cef482dec@redhat.com> On 2/20/19 11:21 AM, Fabiano Fid?ncio wrote: > Basically, "desktop" installations can be done passwordless for those > distros while "jeos" installations do require a password. > > Fabiano Fid?ncio (4): > centos,kickstart: Fix password requirements > fedora,kickstart: Fix password requirements > silverblue,kickstart: Fix password requirements > rhel,kickstart: Fix password requirements > > .../install-script/centos.org/centos-kickstart-desktop.xml.in | 4 ++-- > data/install-script/centos.org/centos-kickstart-jeos.xml.in | 2 +- > .../fedoraproject.org/fedora-kickstart-desktop.xml.in | 4 ++-- > .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 2 +- > .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 2 +- > data/install-script/redhat.com/rhel-kickstart-desktop.xml.in | 4 ++-- > data/install-script/redhat.com/rhel-kickstart-jeos.xml.in | 2 +- > 7 files changed, 10 insertions(+), 10 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Wed Feb 27 19:59:44 2019 From: crobinso at redhat.com (Cole Robinson) Date: Wed, 27 Feb 2019 14:59:44 -0500 Subject: [Libosinfo] [osinfo-db PATCH] fedora27: Add eol date In-Reply-To: <20190226154251.13171-1-fidencio@redhat.com> References: <20190226154251.13171-1-fidencio@redhat.com> Message-ID: <21946dac-f93f-de89-d151-f41431105503@redhat.com> On 2/26/19 10:42 AM, Fabiano Fid?ncio wrote: > Fedora 27 reached its EOL status on November 30, 2018. > https://fedoramagazine.org/fedora-27-end-of-life/ > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/fedoraproject.org/fedora-27.xml.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in > index ba657d0..869fa6b 100644 > --- a/data/os/fedoraproject.org/fedora-27.xml.in > +++ b/data/os/fedoraproject.org/fedora-27.xml.in > @@ -12,6 +12,7 @@ > <derives-from id="http://fedoraproject.org/fedora/26"/> > > <release-date>2017-11-14</release-date> > + <eol-date>2019-11-30</eol-date> > > <variant id="workstation"> > <_name>Fedora 27 Workstation</_name> > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From fidencio at redhat.com Thu Feb 28 07:31:20 2019 From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=) Date: Thu, 28 Feb 2019 08:31:20 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 13/29] ubuntu, jeos: Force the system to boot without splash screen In-Reply-To: <9a5ddc04-d562-4506-25d5-ba9db996a977@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-14-fidencio@redhat.com> <9a5ddc04-d562-4506-25d5-ba9db996a977@redhat.com> Message-ID: <4f7b429f4da75acde52e2e864d770e28d4032df3.camel@redhat.com> On Wed, 2019-02-27 at 14:02 -0500, Cole Robinson wrote: > On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > > Unfortunately, if we don't manually force the system to boot > > without > > splash screen, the splash will load and the user would have to > > manually > > switch to VT[0-6]. > > > > Is this an ubuntu bug or expected behavior? Either way seems like it > warrants a brief comment at the code site. IIRC, I didn't find any ubuntu bug about this. Although it's not the expected behaviour, at all. I'm squashing the following diff to this patch: diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 0cdb046..6e30b4f 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -95,6 +95,9 @@ ubiquity ubiquity/reboot boolean true d-i finish-install/reboot_in_progress note +# Unfortunately we have to manually force the system to boot without splash screen as, +# otherwise, the splash would be loaded and the user would have to manually switch to +# VT[0-6] d-i preseed/late_command string \ in-target sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /etc/default/grub ; \ in-target bash -c 'update-grub2' ; [snip] From fidencio at redhat.com Thu Feb 28 07:58:38 2019 From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=) Date: Thu, 28 Feb 2019 08:58:38 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 14/29] ubuntu, jeos: Tune extra installed softwares In-Reply-To: <3376e2b9-ec9e-b926-a396-dcfbb5382f3d@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-15-fidencio@redhat.com> <3376e2b9-ec9e-b926-a396-dcfbb5382f3d@redhat.com> Message-ID: <77897dd2119dbc422387f4d05b4268cdf7d7f8bf.camel@redhat.com> On Wed, 2019-02-27 at 14:09 -0500, Cole Robinson wrote: > On 2/19/19 11:27 AM, Fabiano Fid?ncio wrote: > > Seems that although openssh-server is present in all ubuntu > > servers, > > python-software-properties is not. > > > > For newer versions of ubuntu, let's just install > > python3-software-properties. > > > > For 12.04, let's install python-software-properties. > > > > For 12.10, let's avoid installing as it'd raise an error during > > installation. > > > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > > --- > > .../ubuntu.com/ubuntu-preseed-jeos.xml.in | 12 > > +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > I think the deliberate omission of 12.10 could use a comment in the > XML The following fixup will be squashed to the original one: diff --git a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in index 7031a14..1a9ed95 100644 --- a/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in +++ b/data/install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in @@ -88,6 +88,8 @@ d-i pkgsel/include string openssh-server <xsl:if test="os/version = 12.04"> d-i pkgsel/include string python-software-properties </xsl:if> + <!-- Let's avoid installating python-software-properties + for 12.10 as it'd raise an error during installation. --> </xsl:when> <xsl:otherwise> d-i pkgsel/include string python3-software-properties [snip] From fidencio at redhat.com Thu Feb 28 08:12:34 2019 From: fidencio at redhat.com (Fabiano =?ISO-8859-1?Q?Fid=EAncio?=) Date: Thu, 28 Feb 2019 09:12:34 +0100 Subject: [Libosinfo] [osinfo-db PATCH v2 17/29] ubuntu13.04: Remove installer In-Reply-To: <20190219162755.15367-18-fidencio@redhat.com> References: <20190219162755.15367-1-fidencio@redhat.com> <20190219162755.15367-18-fidencio@redhat.com> Message-ID: <5761a36b8d407701cb5d9d7bf741c24a6a76995a.camel@redhat.com> On Tue, 2019-02-19 at 17:27 +0100, Fabiano Fid?ncio wrote: > JeOS installations have never been tested as libosinfo never had an > app > consuming those scripts. > > Knowing that there's no consumers affected and that this is a distro > that reached its EOF, let's just remove the installer as I didn't get > to > make it work. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/ubuntu.com/ubuntu-13.04.xml.in | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in > b/data/os/ubuntu.com/ubuntu-13.04.xml.in > index e5e7d71..70ca832 100644 > --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in > +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in > @@ -61,9 +61,5 @@ > <kernel>casper/vmlinuz.efi</kernel> > <initrd>casper/initrd.lz</initrd> > </media> > - > - <installer> > - <script id='http://ubuntu.com/ubuntu/preseed/jeos'/> > - </installer> > </os> > </libosinfo> The following fixup will be squashed to this patch: diff --git a/data/os/ubuntu.com/ubuntu-13.04.xml.in b/data/os/ubuntu.com/ubuntu-13.04.xml.in index 70ca832..00c0197 100644 --- a/data/os/ubuntu.com/ubuntu-13.04.xml.in +++ b/data/os/ubuntu.com/ubuntu-13.04.xml.in @@ -62,4 +62,7 @@ <initrd>casper/initrd.lz</initrd> </media> </os> + + <!-- The reason there's no installer-script for 13.04 is because the one used for all other + ububuntu releases does not work for 13.04. Neither the "jeos" nor the "desktop one. --> </libosinfo> At least we make clear that we didn't forget to add it here. :-) From crobinso at redhat.com Thu Feb 28 17:54:10 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 12:54:10 -0500 Subject: [Libosinfo] [osinfo-db PATCH 18/23] rhel-7.6: Add tree information In-Reply-To: <20190226160610.23683-19-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> <20190226160610.23683-19-fidencio@redhat.com> Message-ID: <84b6d53d-eccb-654f-5304-a682e869884f@redhat.com> On 2/26/19 11:06 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/redhat.com/rhel-7.6.xml.in | 49 ++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/data/os/redhat.com/rhel-7.6.xml.in b/data/os/redhat.com/rhel-7.6.xml.in > index 1098c77..c67a3c8 100644 > --- a/data/os/redhat.com/rhel-7.6.xml.in > +++ b/data/os/redhat.com/rhel-7.6.xml.in > @@ -14,6 +14,13 @@ > > <release-date>2018-10-30</release-date> > > + <variant id="server"> > + <name>Red Hat Enterprise Linux 7.6 (Server)</name> > + </variant> > + <variant id="workstation"> > + <name>Red Hat Enterprise Linux 7.6 (Workstation)</name> > + </variant> > + > <media arch="x86_64"> > <iso> > <system-id>LINUX</system-id> > @@ -51,11 +58,53 @@ > </iso> > </media> > > + <tree arch="ppc64"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>7.6</version> > + <arch>ppc64</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > + <tree arch="ppc64le"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>7.6</version> > + <arch>ppc64le</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > + <tree arch="s390x"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>7.6</version> > + <arch>s390x</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > + <tree arch="x86_64"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>7.6</version> > + <arch>x86_64</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > <tree arch="x86_64"> > + <variant id="workstation"/> > <treeinfo> > <family>Red Hat Enterprise Linux</family> > <version>7.6</version> > <arch>x86_64</arch> > + <variant>Workstation</variant> > </treeinfo> > </tree> > > This last addition is problematic. Internally I see other rhel7 variant trees, at least Client and ComputeNode. Previously we would match against those, but now detection will fail because we are explicitly only looking for variant=Workstation|Server. This patch series is still an improvement so it could go in if we drop this bit. But I think we need a bit of a larger rethink. We shouldn't need to whitelist every single variant and architecture just for tree detection to work. For example in Fedora there are unofficial work in progress distro trees for archs like risc-v, and aarch64 before it. They aren't official Fedora archs yet but they have expected treeinfo fields, they just don't match against any official Fedora arch. If we were more flexible we could automatically accept them. One solution would be to have a top level fallback <treeinfo> block, not tied to any <tree>, that only lists <family> and <version>. If detection doesn't match any explicit <tree>, but matches the fallback <treeinfo>, we can generate a tree object and return it to the user, filling in <arch> for example. - Cole From crobinso at redhat.com Thu Feb 28 17:59:43 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 12:59:43 -0500 Subject: [Libosinfo] [osinfo-db PATCH 01/23] rhel-6.0: Add tree information In-Reply-To: <20190226160610.23683-2-fidencio@redhat.com> References: <20190226160610.23683-1-fidencio@redhat.com> <20190226160610.23683-2-fidencio@redhat.com> Message-ID: <31990f74-4dc4-a3ab-9270-aabcba52e8b3@redhat.com> On 2/26/19 11:05 AM, Fabiano Fid?ncio wrote: > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > data/os/redhat.com/rhel-6.0.xml.in | 65 ++++++++++++++++++++++++++++++ > 1 file changed, 65 insertions(+) > > diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in > index 3029712..d37966f 100644 > --- a/data/os/redhat.com/rhel-6.0.xml.in > +++ b/data/os/redhat.com/rhel-6.0.xml.in > @@ -27,6 +27,13 @@ > <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda --> > </devices> > > + <variant id="server"> > + <name>Red Hat Enterprise Linux 6.0 (Server)</name> > + </variant> > + <variant id="workstation"> > + <name>Red Hat Enterprise Linux 6.0 (Workstation)</name> > + </variant> > + > <media arch="i686"> > <iso> > <system-id>LINUX</system-id> > @@ -44,6 +51,64 @@ > <initrd>isolinux/initrd.img</initrd> > </media> > > + <tree arch="ppc64"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>6.0</version> > + <arch>ppc64</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > + <tree arch="s390x"> > + <variant id="server"/> > + <treeinfo> > + <family>Red Hat Enterprise Linux</family> > + <version>6.0</version> > + <arch>s390x</arch> > + <variant>Server</variant> > + </treeinfo> > + </tree> > + > + <tree arch="i386"> The arch name from our RNG is i686, 'make check' would have caught this Thanks, Cole From fidencio at redhat.com Thu Feb 28 21:17:31 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:17:31 +0100 Subject: [Libosinfo] [libosinfo PATCH] db: Add missing attributes to fill_media() Message-ID: <20190228211731.32455-1-fidencio@redhat.com> Some new attributes have been added to OsinfoMedia, as: - the install-script list (during this cycle); - installer-script (1.3.0); However, none of those attributes have been filled in in the media accordingly to matched media. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- osinfo/osinfo_db.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c index 5696279..f59c804 100644 --- a/osinfo/osinfo_db.c +++ b/osinfo/osinfo_db.c @@ -642,6 +642,9 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media, const gchar *initrd_path; const gchar *arch; const gchar *url; + gint i; + gboolean installer_script; + OsinfoInstallScriptList *install_script_list; GList *variants, *node; set_languages_for_media(db, media, matched_media); @@ -685,6 +688,23 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media, "eject-after-install", eject_after_install, NULL); } + installer_script = osinfo_entity_get_param_value_boolean_with_default(OSINFO_ENTITY(matched_media), + OSINFO_MEDIA_PROP_INSTALLER_SCRIPT, + TRUE); + g_object_set(G_OBJECT(media), + "installer-script", installer_script, + NULL); + install_script_list = osinfo_media_get_install_script_list(matched_media); + if (install_script_list != NULL && + osinfo_list_get_length(OSINFO_LIST(install_script_list)) > 0) { + for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(install_script_list)); i++) { + OsinfoInstallScript *script; + + script = OSINFO_INSTALL_SCRIPT(osinfo_list_get_nth(OSINFO_LIST(install_script_list), i)); + osinfo_media_add_install_script(media, script); + } + } + if (os != NULL) osinfo_media_set_os(media, os); } -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:39:08 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:39:08 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/2] Revert "silverblue, kickstart: Fix password requirements" Message-ID: <20190228213909.6267-1-fidencio@redhat.com> This reverts commit 78615b54fcbf55ff89d1f9d135453830de53b63d. --- .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in index f4fc953..fc6c1d7 100644 --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in @@ -9,7 +9,7 @@ <param name="l10n-language" policy="optional"/> <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> - <param name="user-login" policy="optional"/> + <param name="user-login" policy="required"/> <param name="user-password" policy="required"/> <param name="admin-password" policy="required"/> <param name="script-disk" policy="required"/> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:39:09 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:39:09 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/2] silverblue, kickstart: Fix password requirements (2nd try) In-Reply-To: <20190228213909.6267-1-fidencio@redhat.com> References: <20190228213909.6267-1-fidencio@redhat.com> Message-ID: <20190228213909.6267-2-fidencio@redhat.com> The very same idea as 78615b54f but, this time, changing the right parameters. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in index fc6c1d7..d044f74 100644 --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in @@ -10,8 +10,8 @@ <param name="l10n-timezone" policy="optional"/> <param name="hostname" policy="optional"/> <param name="user-login" policy="required"/> - <param name="user-password" policy="required"/> - <param name="admin-password" policy="required"/> + <param name="user-password" policy="optional"/> + <param name="admin-password" policy="optional"/> <param name="script-disk" policy="required"/> </config> <injection-method>cdrom</injection-method> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:46 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:46 +0100 Subject: [Libosinfo] [osinfo-db PATCH 0/7] f27+: Fixes related to media suggestion for unattended installation Message-ID: <20190228214653.7608-1-fidencio@redhat.com> This small series does: - Mark live medias as *not* being a target for unattended installations; - It happens because anaconda is not even started on live medias; - Add installer to the medias; - With that management apps can get from the media what's the exact type of unattended installation they support; This series should be done for the whole set of Fedoras, including extensive testing and so on. But, for now, let's just focus on supported medias (plus f27 ... as there still may be some user out there). Fabiano Fid?ncio (7): fedora29: Mark live media as not script installable fedora29: Add installer to the medias fedora28: Mark live medias as not script installable fedora28: Add installer to the medias fedora27: Mark live media as not script installable fedora27: Use silverblue installer for atomic media fedora27: Add installer to the medias data/os/fedoraproject.org/fedora-27.xml.in | 14 +++++++++++++- data/os/fedoraproject.org/fedora-28.xml.in | 11 ++++++++++- data/os/fedoraproject.org/fedora-29.xml.in | 15 ++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:47 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:47 +0100 Subject: [Libosinfo] [osinfo-db PATCH 1/7] fedora29: Mark live media as not script installable In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-2-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-29.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/fedoraproject.org/fedora-29.xml.in b/data/os/fedoraproject.org/fedora-29.xml.in index 49cef8f..dd0a9fc 100644 --- a/data/os/fedoraproject.org/fedora-29.xml.in +++ b/data/os/fedoraproject.org/fedora-29.xml.in @@ -32,7 +32,7 @@ <!-- Workstation --> <!-- Live --> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <variant id="workstation"/> <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-29-1.2.iso</url> <iso> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:48 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:48 +0100 Subject: [Libosinfo] [osinfo-db PATCH 2/7] fedora29: Add installer to the medias In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-3-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-29.xml.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/os/fedoraproject.org/fedora-29.xml.in b/data/os/fedoraproject.org/fedora-29.xml.in index dd0a9fc..fa209b9 100644 --- a/data/os/fedoraproject.org/fedora-29.xml.in +++ b/data/os/fedoraproject.org/fedora-29.xml.in @@ -53,6 +53,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/desktop'/> + </installer> </media> <!-- Server --> @@ -68,6 +71,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <!-- Network Installer !--> @@ -81,6 +87,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <!-- Everything --> @@ -93,6 +102,10 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + <script id='http://fedoraproject.org/fedora/kickstart/desktop'/> + </installer> </media> <tree arch="x86_64"> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:49 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:49 +0100 Subject: [Libosinfo] [osinfo-db PATCH 3/7] fedora28: Mark live medias as not script installable In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-4-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-28.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in index 7774a80..66d789f 100644 --- a/data/os/fedoraproject.org/fedora-28.xml.in +++ b/data/os/fedoraproject.org/fedora-28.xml.in @@ -29,7 +29,7 @@ <!-- Workstation --> <!-- Live --> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <variant id="workstation"/> <url>https://download.fedoraproject.org/pub/fedora/linux/releases/28/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-28-1.1.iso</url> <iso> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:50 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:50 +0100 Subject: [Libosinfo] [osinfo-db PATCH 4/7] fedora28: Add installer to the medias In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-5-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-28.xml.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/os/fedoraproject.org/fedora-28.xml.in b/data/os/fedoraproject.org/fedora-28.xml.in index 66d789f..27ac142 100644 --- a/data/os/fedoraproject.org/fedora-28.xml.in +++ b/data/os/fedoraproject.org/fedora-28.xml.in @@ -50,6 +50,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/desktop'/> + </installer> </media> <!-- Server --> @@ -65,6 +68,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <!-- Network Installer !--> @@ -78,6 +84,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <tree arch="x86_64"> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:51 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:51 +0100 Subject: [Libosinfo] [osinfo-db PATCH 5/7] fedora27: Mark live media as not script installable In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-6-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-27.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in index 513a4ab..8fff3e0 100644 --- a/data/os/fedoraproject.org/fedora-27.xml.in +++ b/data/os/fedoraproject.org/fedora-27.xml.in @@ -33,7 +33,7 @@ <!-- Workstation --> <!-- Live --> - <media arch="x86_64" live="true"> + <media arch="x86_64" live="true" installer-script="false"> <variant id="workstation"/> <url>https://archive.fedoraproject.org/pub/fedora/linux/releases/27/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-27-1.6.iso</url> <iso> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:52 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:52 +0100 Subject: [Libosinfo] [osinfo-db PATCH 6/7] fedora27: Use silverblue installer for atomic media In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-7-fidencio@redhat.com> Fedora 27 Atomic was the first prototype of what would become Fedora Silverblue. Knowing that, let's use Fedora Silverblue installer instead of the normal Fedora one as the normal one is not suppose to work in this case. Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-27.xml.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in index 8fff3e0..5d95b37 100644 --- a/data/os/fedoraproject.org/fedora-27.xml.in +++ b/data/os/fedoraproject.org/fedora-27.xml.in @@ -54,6 +54,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/silverblue/kickstart/desktop'/> + </installer> </media> <!-- Network Installer !--> -- 2.20.1 From fidencio at redhat.com Thu Feb 28 21:46:53 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Thu, 28 Feb 2019 22:46:53 +0100 Subject: [Libosinfo] [osinfo-db PATCH 7/7] fedora27: Add installer to the medias In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <20190228214653.7608-8-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- data/os/fedoraproject.org/fedora-27.xml.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/os/fedoraproject.org/fedora-27.xml.in b/data/os/fedoraproject.org/fedora-27.xml.in index 5d95b37..3d7acb1 100644 --- a/data/os/fedoraproject.org/fedora-27.xml.in +++ b/data/os/fedoraproject.org/fedora-27.xml.in @@ -69,6 +69,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/desktop'/> + </installer> </media> <!-- Server --> @@ -84,6 +87,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <!-- Network Installer !--> @@ -97,6 +103,9 @@ </iso> <kernel>isolinux/vmlinuz</kernel> <initrd>isolinux/initrd.img</initrd> + <installer> + <script id='http://fedoraproject.org/fedora/kickstart/jeos'/> + </installer> </media> <tree arch="x86_64"> -- 2.20.1 From crobinso at redhat.com Thu Feb 28 22:02:56 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 17:02:56 -0500 Subject: [Libosinfo] [osinfo-db PATCH 0/7] f27+: Fixes related to media suggestion for unattended installation In-Reply-To: <20190228214653.7608-1-fidencio@redhat.com> References: <20190228214653.7608-1-fidencio@redhat.com> Message-ID: <b9a18df9-125c-0208-2e7f-6ba1d2414911@redhat.com> On 2/28/19 4:46 PM, Fabiano Fid?ncio wrote: > This small series does: > - Mark live medias as *not* being a target for unattended installations; > - It happens because anaconda is not even started on live medias; > - Add installer to the medias; > - With that management apps can get from the media what's the exact > type of unattended installation they support; > > This series should be done for the whole set of Fedoras, including > extensive testing and so on. But, for now, let's just focus on supported > medias (plus f27 ... as there still may be some user out there). > > Fabiano Fid?ncio (7): > fedora29: Mark live media as not script installable > fedora29: Add installer to the medias > fedora28: Mark live medias as not script installable > fedora28: Add installer to the medias > fedora27: Mark live media as not script installable > fedora27: Use silverblue installer for atomic media > fedora27: Add installer to the medias > > data/os/fedoraproject.org/fedora-27.xml.in | 14 +++++++++++++- > data/os/fedoraproject.org/fedora-28.xml.in | 11 ++++++++++- > data/os/fedoraproject.org/fedora-29.xml.in | 15 ++++++++++++++- > 3 files changed, 37 insertions(+), 3 deletions(-) > Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 28 22:06:50 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 17:06:50 -0500 Subject: [Libosinfo] [osinfo-db PATCH 2/2] silverblue, kickstart: Fix password requirements (2nd try) In-Reply-To: <20190228213909.6267-2-fidencio@redhat.com> References: <20190228213909.6267-1-fidencio@redhat.com> <20190228213909.6267-2-fidencio@redhat.com> Message-ID: <bf5531a6-d1f2-fa34-d52e-5312a2644518@redhat.com> On 2/28/19 4:39 PM, Fabiano Fid?ncio wrote: > The very same idea as 78615b54f but, this time, changing the right > parameters. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > .../fedoraproject.org/silverblue-kickstart-desktop.xml.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in > index fc6c1d7..d044f74 100644 > --- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in > +++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in > @@ -10,8 +10,8 @@ > <param name="l10n-timezone" policy="optional"/> > <param name="hostname" policy="optional"/> > <param name="user-login" policy="required"/> > - <param name="user-password" policy="required"/> > - <param name="admin-password" policy="required"/> > + <param name="user-password" policy="optional"/> > + <param name="admin-password" policy="optional"/> > <param name="script-disk" policy="required"/> > </config> > <injection-method>cdrom</injection-method> > For 1 and 2: Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From crobinso at redhat.com Thu Feb 28 22:18:27 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 17:18:27 -0500 Subject: [Libosinfo] [libosinfo PATCH] db: Add missing attributes to fill_media() In-Reply-To: <20190228211731.32455-1-fidencio@redhat.com> References: <20190228211731.32455-1-fidencio@redhat.com> Message-ID: <c363bf8f-53a8-c81e-285e-d8dce0191789@redhat.com> On 2/28/19 4:17 PM, Fabiano Fid?ncio wrote: > Some new attributes have been added to OsinfoMedia, as: > - the install-script list (during this cycle); > - installer-script (1.3.0); > > However, none of those attributes have been filled in in the media > accordingly to matched media. > > Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> > --- > osinfo/osinfo_db.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c > index 5696279..f59c804 100644 > --- a/osinfo/osinfo_db.c > +++ b/osinfo/osinfo_db.c > @@ -642,6 +642,9 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media, > const gchar *initrd_path; > const gchar *arch; > const gchar *url; > + gint i; > + gboolean installer_script; > + OsinfoInstallScriptList *install_script_list; > GList *variants, *node; > > set_languages_for_media(db, media, matched_media); > @@ -685,6 +688,23 @@ static void fill_media(OsinfoDb *db, OsinfoMedia *media, > "eject-after-install", eject_after_install, > NULL); > } > + installer_script = osinfo_entity_get_param_value_boolean_with_default(OSINFO_ENTITY(matched_media), > + OSINFO_MEDIA_PROP_INSTALLER_SCRIPT, > + TRUE); > + g_object_set(G_OBJECT(media), > + "installer-script", installer_script, > + NULL); > + install_script_list = osinfo_media_get_install_script_list(matched_media); > + if (install_script_list != NULL && > + osinfo_list_get_length(OSINFO_LIST(install_script_list)) > 0) { > + for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(install_script_list)); i++) { > + OsinfoInstallScript *script; > + > + script = OSINFO_INSTALL_SCRIPT(osinfo_list_get_nth(OSINFO_LIST(install_script_list), i)); > + osinfo_media_add_install_script(media, script); > + } > + } > + > if (os != NULL) > osinfo_media_set_os(media, os); > } > I'm not really familiar with this code but AFAICT it looks okay Reviewed-by: Cole Robinson <crobinso at redhat.com> - Cole From fidencio at redhat.com Thu Feb 28 23:30:01 2019 From: fidencio at redhat.com (=?UTF-8?q?Fabiano=20Fid=C3=AAncio?=) Date: Fri, 1 Mar 2019 00:30:01 +0100 Subject: [Libosinfo] [libosinfo PATCH] tests: Add identify_media() tests Message-ID: <20190228233001.19338-1-fidencio@redhat.com> Signed-off-by: Fabiano Fid?ncio <fidencio at redhat.com> --- .../dbdata/os/libosinfo.org/test-db-media.xml | 32 ++++++++++ tests/test-db.c | 58 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 tests/dbdata/os/libosinfo.org/test-db-media.xml diff --git a/tests/dbdata/os/libosinfo.org/test-db-media.xml b/tests/dbdata/os/libosinfo.org/test-db-media.xml new file mode 100644 index 0000000..04badfd --- /dev/null +++ b/tests/dbdata/os/libosinfo.org/test-db-media.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<libosinfo version="0.0.1"> + <os id="http://libosinfo.org/test/db/media"> + <short-id>db-media</short-id> + <name>DB Media</name> + <version>unknown</version> + <vendor>libosinfo.org</vendor> + <family>test</family> + + <variant id="foo"> + <name>DB Media Foo</name> + </variant> + + <media arch="ppc64le" live="true" installer="true" installer-script="false" installer-reboots="6" eject-after-install="false"> + <variant id="foo"/> + <url>http://libosinfo.org/db/media.iso</url> + <iso> + <volume-id>DB Media</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>isolinux/vmlinuz</kernel> + <initrd>isolinux/initrd.img</initrd> + <installer> + <script id="http://example.com/libosinfo/test-install-script"/> + </installer> + </media> + + <installer> + <script id="http://example.com/libosinfo/test-install-script"/> + </installer> + </os> +</libosinfo> diff --git a/tests/test-db.c b/tests/test-db.c index 16c3edf..02874e3 100644 --- a/tests/test-db.c +++ b/tests/test-db.c @@ -395,6 +395,61 @@ test_rel_os(void) +static void +test_identify_media(void) +{ + OsinfoLoader *loader = osinfo_loader_new(); + OsinfoDb *db; + OsinfoMedia *media; + OsinfoInstallScriptList *scripts; + OsinfoOs *os; + GError *error = NULL; + + osinfo_loader_process_path(loader, SRCDIR "/tests/dbdata", &error); + g_assert_no_error(error); + db = osinfo_loader_get_db(loader); + + media = osinfo_media_new("foo", "ppc64le"); + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_VOLUME_ID, + "DB Media"); + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_SYSTEM_ID, + "LINUX"); + + g_assert_true(osinfo_db_identify_media(db, media)); + g_assert_cmpstr(osinfo_media_get_architecture(media), ==, "ppc64le"); + g_assert_true(osinfo_media_get_live(media)); + g_assert_true(osinfo_media_get_installer(media)); + g_assert_false(osinfo_media_supports_installer_script(media)); + g_assert_cmpint(osinfo_media_get_installer_reboots(media), ==, 6); + g_assert_false(osinfo_media_get_eject_after_install(media)); + g_assert_cmpstr(osinfo_media_get_kernel_path(media), ==, "isolinux/vmlinuz"); + g_assert_cmpstr(osinfo_media_get_initrd_path(media), ==, "isolinux/initrd.img"); + scripts = osinfo_media_get_install_script_list(media); + g_assert_nonnull(scripts); + g_assert_cmpint(osinfo_list_get_length(OSINFO_LIST(scripts)), ==, 1); + os = osinfo_media_get_os(media); + g_assert_nonnull(os); + g_assert_cmpstr(osinfo_entity_get_id(OSINFO_ENTITY(os)), ==, "http://libosinfo.org/test/db/media"); + g_object_unref(scripts); + g_object_unref(media); + + media = osinfo_media_new("foo", "ppc64le"); + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_VOLUME_ID, + "Media DB"); + osinfo_entity_set_param(OSINFO_ENTITY(media), + OSINFO_MEDIA_PROP_SYSTEM_ID, + "LINUX"); + + g_assert_false(osinfo_db_identify_media(db, media)); + g_object_unref(media); + + g_object_unref(loader); +} + + int main(int argc, char *argv[]) @@ -409,6 +464,7 @@ main(int argc, char *argv[]) g_test_add_func("/db/prop_platform", test_prop_platform); g_test_add_func("/db/prop_os", test_prop_os); g_test_add_func("/db/rel_os", test_rel_os); + g_test_add_func("/db/identify_media", test_identify_media); /* Upfront so we don't confuse valgrind */ osinfo_entity_get_type(); @@ -421,6 +477,8 @@ main(int argc, char *argv[]) osinfo_platformlist_get_type(); osinfo_oslist_get_type(); osinfo_filter_get_type(); + osinfo_loader_get_type(); + osinfo_install_script_get_type(); return g_test_run(); } -- 2.20.1 From crobinso at redhat.com Thu Feb 28 23:48:30 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 18:48:30 -0500 Subject: [Libosinfo] [PATCH osinfo-db 0/2] <tree arch="unknown"> fallback Message-ID: <cover.1551397601.git.crobinso@redhat.com> <tree> elements in the OS DB serve two broad purposes: 1) track public URLs, so apps can easily look up an install URL and associated metadata like relative initrd/kernel paths 2) track <treeinfo> matching data, so users can use guess_os_by_tree with their own URL, and get an OS object back Every <tree> needs an explicit @arch value associated. This makes thoroughly covering case #2 difficult, because it requires enumerating ever supported OS arch in a <tree> block. This is useful to do for OS that have public URLs, because we want to enumerate those anyways. But for distros without public URLs (RHEL), getting coverage for #2 requires adding a bunch of <tree> stubs for each supported @arch for not much gain. Additionally consider Fedora, which has primary architectures (aarch64, armv7hl, x86_64) and secondary architectures like ppc64le. The latter aren't necessarily considered official releases, so it's debatable whether to enumerate their install URLs in the fedora OS entries. However it's still useful to detect the URL as 'fedora', so virt-install attempts with a manually passed URL get proper defaults etc. This series makes it easier to add a catchall <tree> entry that is arch independent by specifying arch="unknown", and demonstrates using it to get treeinfo detection coverage for rhel5. One point: I don't think this arch=unknown will cause problems for API users. For case #1, users won't be interacting with this <tree> because it doesn't have any URL listed. For case #2, the user will already have to call osinfo_tree_create_from_location which will give a tree with relevant arch/kernel/initrd data parsed out of the treeinfo, and they should use that OsinfoTree object and not the OsinfoTree returned by guess_os_by_tree Cole Robinson (2): schema: Allow arch=unknown rhel5: add tree information data/os/redhat.com/rhel-5.10.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.11.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.4.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.5.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.6.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.7.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.8.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.9.xml.in | 7 +++++++ data/schema/osinfo.rng.in | 1 + 9 files changed, 57 insertions(+) -- 2.20.1 From crobinso at redhat.com Thu Feb 28 23:48:31 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 18:48:31 -0500 Subject: [Libosinfo] [PATCH osinfo-db 1/2] schema: Allow arch=unknown In-Reply-To: <cover.1551397601.git.crobinso@redhat.com> References: <cover.1551397601.git.crobinso@redhat.com> Message-ID: <4702b2a7521095b0a4d43b842e850a122da3c2af.1551397601.git.crobinso@redhat.com> This will be used for <tree arch="unknown"> which is useful as a catchall for <treeinfo> detection Signed-off-by: Cole Robinson <crobinso at redhat.com> --- data/schema/osinfo.rng.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/schema/osinfo.rng.in b/data/schema/osinfo.rng.in index d778239..0a28efd 100644 --- a/data/schema/osinfo.rng.in +++ b/data/schema/osinfo.rng.in @@ -810,6 +810,7 @@ <value>sparc</value> <value>sparc64</value> <value>unicore32</value> + <value>unknown</value> <value>x86_64</value> <value>xtensa</value> <value>xtensaeb</value> -- 2.20.1 From crobinso at redhat.com Thu Feb 28 23:48:32 2019 From: crobinso at redhat.com (Cole Robinson) Date: Thu, 28 Feb 2019 18:48:32 -0500 Subject: [Libosinfo] [PATCH osinfo-db 2/2] rhel5: add tree information In-Reply-To: <cover.1551397601.git.crobinso@redhat.com> References: <cover.1551397601.git.crobinso@redhat.com> Message-ID: <5a87f9f81b1e9b8a0988189df6d8b9434147b536.1551397601.git.crobinso@redhat.com> Only rhel5.4+ has .treeinfo Family here will match both rhel5 client and server trees Signed-off-by: Cole Robinson <crobinso at redhat.com> --- data/os/redhat.com/rhel-5.10.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.11.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.4.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.5.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.6.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.7.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.8.xml.in | 7 +++++++ data/os/redhat.com/rhel-5.9.xml.in | 7 +++++++ 8 files changed, 56 insertions(+) diff --git a/data/os/redhat.com/rhel-5.10.xml.in b/data/os/redhat.com/rhel-5.10.xml.in index 8bdf653..82b242d 100644 --- a/data/os/redhat.com/rhel-5.10.xml.in +++ b/data/os/redhat.com/rhel-5.10.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.10 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.10</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.11.xml.in b/data/os/redhat.com/rhel-5.11.xml.in index a8a295c..120ebe4 100644 --- a/data/os/redhat.com/rhel-5.11.xml.in +++ b/data/os/redhat.com/rhel-5.11.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.11 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.11</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.4.xml.in b/data/os/redhat.com/rhel-5.4.xml.in index 2806fa5..3671e16 100644 --- a/data/os/redhat.com/rhel-5.4.xml.in +++ b/data/os/redhat.com/rhel-5.4.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.4 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.4</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.5.xml.in b/data/os/redhat.com/rhel-5.5.xml.in index 3fa31be..f90bacd 100644 --- a/data/os/redhat.com/rhel-5.5.xml.in +++ b/data/os/redhat.com/rhel-5.5.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.5 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.5</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.6.xml.in b/data/os/redhat.com/rhel-5.6.xml.in index d132a77..e2f39e1 100644 --- a/data/os/redhat.com/rhel-5.6.xml.in +++ b/data/os/redhat.com/rhel-5.6.xml.in @@ -33,5 +33,12 @@ <volume-id>.*RHEL/5.6 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.6</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.7.xml.in b/data/os/redhat.com/rhel-5.7.xml.in index f949ef1..fda0cc8 100644 --- a/data/os/redhat.com/rhel-5.7.xml.in +++ b/data/os/redhat.com/rhel-5.7.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.7 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.7</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.8.xml.in b/data/os/redhat.com/rhel-5.8.xml.in index 6ef0621..f42cc4b 100644 --- a/data/os/redhat.com/rhel-5.8.xml.in +++ b/data/os/redhat.com/rhel-5.8.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.8 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.8</version> + </treeinfo> + </tree> </os> </libosinfo> diff --git a/data/os/redhat.com/rhel-5.9.xml.in b/data/os/redhat.com/rhel-5.9.xml.in index 16f6e36..80888bf 100644 --- a/data/os/redhat.com/rhel-5.9.xml.in +++ b/data/os/redhat.com/rhel-5.9.xml.in @@ -27,5 +27,12 @@ <volume-id>.*RHEL/5.9 x86_64.*</volume-id> </iso> </media> + + <tree arch="unknown"> + <treeinfo> + <family>Red Hat Enterprise Linux</family> + <version>5.9</version> + </treeinfo> + </tree> </os> </libosinfo> -- 2.20.1