diff --git a/0009-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ-962113.patch b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch similarity index 95% rename from 0009-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ-962113.patch rename to 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch index 637d80c..fca79ff 100644 --- a/0009-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ-962113.patch +++ b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch @@ -1,4 +1,4 @@ -From cb18280888d6ab9e840b79ec93eeecf11127b6e6 Mon Sep 17 00:00:00 2001 +From b3327cf9bfc7757cfd75c11aa1d63cc8aae522e6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jul 2013 14:47:56 +0100 Subject: [PATCH] RHEL: Disable unsupported remote drive protocols @@ -62,7 +62,7 @@ index f558964bf..8f264ed17 100644 Run L on guests or disk images: diff --git a/fish/guestfish.pod b/fish/guestfish.pod -index 9f086f110..bb4167b06 100644 +index ae2445571..46cba64ff 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -131,9 +131,9 @@ To list what is available do: @@ -77,7 +77,7 @@ index 9f086f110..bb4167b06 100644 =head2 Remote control -@@ -1134,12 +1134,12 @@ L>. +@@ -1129,12 +1129,12 @@ L>. On the command line, you can use the I<-a> option to add network block devices using a URI-style format, for example: @@ -92,7 +92,7 @@ index 9f086f110..bb4167b06 100644 The possible I<-a URI> formats are described below. -@@ -1149,40 +1149,6 @@ The possible I<-a URI> formats are described below. +@@ -1144,40 +1144,6 @@ The possible I<-a URI> formats are described below. Add the local disk image (or device) called F. @@ -133,7 +133,7 @@ index 9f086f110..bb4167b06 100644 =head2 B<-a nbd://example.com[:port]> =head2 B<-a nbd://example.com[:port]/exportname> -@@ -1217,35 +1183,13 @@ The equivalent API command would be: +@@ -1212,35 +1178,13 @@ The equivalent API command would be: > add pool/disk protocol:rbd server:tcp:example.com:port @@ -220,10 +220,10 @@ index 21d424984..ddabeb639 100755 rm test-add-uri.out rm test-add-uri.img diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index 05320fcd3..155d739fe 100644 +index e757140aa..e3d098deb 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml -@@ -297,29 +297,6 @@ F is interpreted as a local file or device. +@@ -291,29 +291,6 @@ F is interpreted as a local file or device. This is the default if the optional protocol parameter is omitted. @@ -253,7 +253,7 @@ index 05320fcd3..155d739fe 100644 =item C Connect to the Network Block Device server. -@@ -336,22 +313,6 @@ The C parameter may be supplied. See below. +@@ -330,22 +307,6 @@ The C parameter may be supplied. See below. See also: L. @@ -276,7 +276,7 @@ index 05320fcd3..155d739fe 100644 =back =item C -@@ -362,13 +323,8 @@ is a list of server(s). +@@ -356,13 +317,8 @@ is a list of server(s). Protocol Number of servers required -------- -------------------------- file List must be empty or param not used at all @@ -290,7 +290,7 @@ index 05320fcd3..155d739fe 100644 Each list element is a string specifying a server. The string must be in one of the following formats: -@@ -384,10 +340,10 @@ for the protocol is used (see F). +@@ -378,10 +334,10 @@ for the protocol is used (see F). =item C @@ -305,7 +305,7 @@ index 05320fcd3..155d739fe 100644 example if using the libvirt backend and if the libvirt backend is configured to start the qemu appliance as a special user such as C. If in doubt, diff --git a/lib/drives.c b/lib/drives.c -index 46af66db4..c81ded5d7 100644 +index fd95308d2..dfea88af4 100644 --- a/lib/drives.c +++ b/lib/drives.c @@ -168,6 +168,7 @@ create_drive_non_file (guestfs_h *g, @@ -340,7 +340,7 @@ index 46af66db4..c81ded5d7 100644 /** * Create the special F drive. -@@ -856,6 +860,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -855,6 +859,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, drv = create_drive_file (g, &data); } } @@ -348,7 +348,7 @@ index 46af66db4..c81ded5d7 100644 else if (STREQ (protocol, "ftp")) { data.protocol = drive_protocol_ftp; drv = create_drive_curl (g, &data); -@@ -880,6 +885,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -879,6 +884,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, data.protocol = drive_protocol_iscsi; drv = create_drive_iscsi (g, &data); } @@ -356,7 +356,7 @@ index 46af66db4..c81ded5d7 100644 else if (STREQ (protocol, "nbd")) { data.protocol = drive_protocol_nbd; drv = create_drive_nbd (g, &data); -@@ -888,6 +894,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -887,6 +893,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, data.protocol = drive_protocol_rbd; drv = create_drive_rbd (g, &data); } @@ -364,7 +364,7 @@ index 46af66db4..c81ded5d7 100644 else if (STREQ (protocol, "sheepdog")) { data.protocol = drive_protocol_sheepdog; drv = create_drive_sheepdog (g, &data); -@@ -900,6 +907,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, +@@ -899,6 +906,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename, data.protocol = drive_protocol_tftp; drv = create_drive_curl (g, &data); } @@ -373,10 +373,10 @@ index 46af66db4..c81ded5d7 100644 error (g, _("unknown protocol ‘%s’"), protocol); drv = NULL; /*FALLTHROUGH*/ diff --git a/lib/guestfs.pod b/lib/guestfs.pod -index ff58aa0bb..1af00f1bb 100644 +index b04c28d62..a334a4b65 100644 --- a/lib/guestfs.pod +++ b/lib/guestfs.pod -@@ -715,70 +715,6 @@ servers. The server string is documented in +@@ -679,70 +679,6 @@ servers. The server string is documented in L. The C and C parameters are also optional, and if not given, then no authentication will be used. @@ -447,7 +447,7 @@ index ff58aa0bb..1af00f1bb 100644 =head3 NETWORK BLOCK DEVICE Libguestfs can access Network Block Device (NBD) disks remotely. -@@ -841,42 +777,6 @@ L +@@ -805,42 +741,6 @@ L =back @@ -605,5 +605,5 @@ index 12937fb30..b3e4f9903 100755 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -rm "$DEBUG_QEMU_FILE" -- -2.19.1.3.g30247aa5d201 +2.31.1 diff --git a/0001-daemon-inspect_fs_unix-recognize-modern-Pardus-GNU-Linux-releases.patch b/0001-daemon-inspect_fs_unix-recognize-modern-Pardus-GNU-Linux-releases.patch deleted file mode 100644 index bce4ddb..0000000 --- a/0001-daemon-inspect_fs_unix-recognize-modern-Pardus-GNU-Linux-releases.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 336ecfab3bb1e14deea9ade891fb772e0698f8d8 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Fri, 1 Oct 2021 14:53:38 +0200 -Subject: [PATCH] daemon/inspect_fs_unix: recognize modern Pardus GNU/Linux - releases - -Recent Pardus releases seem to have abandoned the original -"/etc/pardus-release" file, which the current Pardus detection, from -commit 233530d3541d ("inspect: Add detection of Pardus.", 2010-10-29), is -based upon. - -Instead, Pardus apparently adopted the "/etc/os-release" specification -, with -"ID=pardus". Extend the "distro_of_os_release_id" function accordingly. -Keep the original method for recognizing earlier releases. - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1993842 -Signed-off-by: Laszlo Ersek -Message-Id: <20211001125338.8956-1-lersek@redhat.com> -Acked-by: Richard W.M. Jones ---- - daemon/inspect_fs_unix.ml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index 557f32833..652bacc0f 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -151,6 +151,7 @@ and distro_of_os_release_id = function - | "openmandriva" -> Some DISTRO_OPENMANDRIVA - | "opensuse" -> Some DISTRO_OPENSUSE - | s when String.is_prefix s "opensuse-" -> Some DISTRO_OPENSUSE -+ | "pardus" -> Some DISTRO_PARDUS - | "pld" -> Some DISTRO_PLD_LINUX - | "rhel" -> Some DISTRO_RHEL - | "sles" | "sled" -> Some DISTRO_SLES --- -2.19.1.3.g30247aa5d201 - diff --git a/0011-RHEL-Reject-use-of-libguestfs-winsupport-features-except-for-virt-tools-RHBZ-1240276.patch b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch similarity index 96% rename from 0011-RHEL-Reject-use-of-libguestfs-winsupport-features-except-for-virt-tools-RHBZ-1240276.patch rename to 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index 9cb32f6..933f1d3 100644 --- a/0011-RHEL-Reject-use-of-libguestfs-winsupport-features-except-for-virt-tools-RHBZ-1240276.patch +++ b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,4 +1,4 @@ -From 6372b9cd8bb2d8a183fc6d2ca4688047a0474c2f Mon Sep 17 00:00:00 2001 +From 84814ce67cd4b0d5a844423223498d60a7766388 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jul 2015 09:28:03 -0400 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for @@ -65,5 +65,5 @@ index 105291dc3..5ca4f3b6d 100644 exit (EXIT_FAILURE); -- -2.19.1.3.g30247aa5d201 +2.31.1 diff --git a/0002-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch b/0002-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch deleted file mode 100644 index 1c38b40..0000000 --- a/0002-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 3db4dd1804b72575789a67f22a86d6085a141310 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Wed, 13 Oct 2021 18:30:23 +0200 -Subject: [PATCH] daemon: inspection: Add support for Kylin (RHBZ#1995391). - -Similar-to: cd08039d2427b584237265237c713d8cf46536a0 -Signed-off-by: Laszlo Ersek -Message-Id: <20211013163023.21786-1-lersek@redhat.com> -Acked-by: Richard W.M. Jones -(cherry picked from commit 305b02e7e74afc3777b2291783cd7634fb76ecaf) ---- - daemon/inspect_fs.ml | 2 ++ - daemon/inspect_fs_unix.ml | 1 + - daemon/inspect_types.ml | 2 ++ - daemon/inspect_types.mli | 1 + - generator/actions_inspection.ml | 4 ++++ - 5 files changed, 10 insertions(+) - -diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml -index 02b5a0470..77f0f6aea 100644 ---- a/daemon/inspect_fs.ml -+++ b/daemon/inspect_fs.ml -@@ -275,6 +275,7 @@ and check_package_format { distro } = - Some PACKAGE_FORMAT_RPM - | Some DISTRO_DEBIAN - | Some DISTRO_KALI_LINUX -+ | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *) - | Some DISTRO_LINUX_MINT - | Some DISTRO_UBUNTU -> - Some PACKAGE_FORMAT_DEB -@@ -345,6 +346,7 @@ and check_package_management { distro; version } = - | Some DISTRO_ALTLINUX - | Some DISTRO_DEBIAN - | Some DISTRO_KALI_LINUX -+ | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *) - | Some DISTRO_LINUX_MINT - | Some DISTRO_UBUNTU -> - Some PACKAGE_MANAGEMENT_APT -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index 652bacc0f..7f6eb92e9 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -146,6 +146,7 @@ and distro_of_os_release_id = function - | "frugalware" -> Some DISTRO_FRUGALWARE - | "gentoo" -> Some DISTRO_GENTOO - | "kali" -> Some DISTRO_KALI_LINUX -+ | "kylin" -> Some DISTRO_KYLIN - | "mageia" -> Some DISTRO_MAGEIA - | "neokylin" -> Some DISTRO_NEOKYLIN - | "openmandriva" -> Some DISTRO_OPENMANDRIVA -diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml -index 18e410ce0..e2bc7165c 100644 ---- a/daemon/inspect_types.ml -+++ b/daemon/inspect_types.ml -@@ -79,6 +79,7 @@ and distro = - | DISTRO_FRUGALWARE - | DISTRO_GENTOO - | DISTRO_KALI_LINUX -+ | DISTRO_KYLIN - | DISTRO_LINUX_MINT - | DISTRO_MAGEIA - | DISTRO_MANDRIVA -@@ -211,6 +212,7 @@ and string_of_distro = function - | DISTRO_FRUGALWARE -> "frugalware" - | DISTRO_GENTOO -> "gentoo" - | DISTRO_KALI_LINUX -> "kalilinux" -+ | DISTRO_KYLIN -> "kylin" - | DISTRO_LINUX_MINT -> "linuxmint" - | DISTRO_MAGEIA -> "mageia" - | DISTRO_MANDRIVA -> "mandriva" -diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli -index d12f7a61a..43c79818f 100644 ---- a/daemon/inspect_types.mli -+++ b/daemon/inspect_types.mli -@@ -86,6 +86,7 @@ and distro = - | DISTRO_FRUGALWARE - | DISTRO_GENTOO - | DISTRO_KALI_LINUX -+ | DISTRO_KYLIN - | DISTRO_LINUX_MINT - | DISTRO_MAGEIA - | DISTRO_MANDRIVA -diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml -index 690afd460..0c6d39b43 100644 ---- a/generator/actions_inspection.ml -+++ b/generator/actions_inspection.ml -@@ -214,6 +214,10 @@ Gentoo. - - Kali Linux. - -+=item \"kylin\" -+ -+Kylin. -+ - =item \"linuxmint\" - - Linux Mint. --- -2.19.1.3.g30247aa5d201 - diff --git a/0003-Add-detection-support-for-Rocky-Linux-CentOS-RHEL-like.patch b/0003-Add-detection-support-for-Rocky-Linux-CentOS-RHEL-like.patch deleted file mode 100644 index 1915b38..0000000 --- a/0003-Add-detection-support-for-Rocky-Linux-CentOS-RHEL-like.patch +++ /dev/null @@ -1,209 +0,0 @@ -From a98532ac7d6c79889703603d9f4ab008f0febd53 Mon Sep 17 00:00:00 2001 -From: Neil Hanlon -Date: Fri, 10 Dec 2021 08:50:48 +0000 -Subject: [PATCH] Add detection support for Rocky Linux (CentOS/RHEL-like) - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2030709 -Thanks: label@rockylinux.org - ---- - -RWMJ notes: I fixed the original patch so it compiled. This patch -sets osinfo to "rocky8", which doesn't exist in the osinfo db yet. -Arguably we might want to set this to "centos8", but we can see what -libosinfo decides to do. Here is partial virt-inspector output on a -Rocky Linux disk image: - -$ ./run virt-inspector -a disk.img - - - - /dev/rl/root - linux - x86_64 - rocky - Rocky Linux 8.5 (Green Obsidian) - 8 - 5 - rpm - dnf - localhost.localdomain - rocky8 - - / - /boot - - - - xfs - fed8331f-9f25-40cd-883e-090cd640559d - - - swap - 6da2c121-ea7d-49ce-98a3-14a37fceaadd - - - xfs - 4efafe61-2d20-4d93-8055-537e09bfd033 - - -(cherry picked from commit 631962c0e88a321646846be91d0fbea1ba14e263) ---- - daemon/inspect_fs.ml | 2 ++ - daemon/inspect_fs_unix.ml | 13 ++++++++++++- - daemon/inspect_types.ml | 2 ++ - daemon/inspect_types.mli | 1 + - generator/actions_inspection.ml | 4 ++++ - lib/inspect-icon.c | 1 + - lib/inspect-osinfo.c | 4 ++++ - 7 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml -index 77f0f6aea..9c73d97ef 100644 ---- a/daemon/inspect_fs.ml -+++ b/daemon/inspect_fs.ml -@@ -259,6 +259,7 @@ and check_package_format { distro } = - | None -> None - | Some DISTRO_ALTLINUX - | Some DISTRO_CENTOS -+ | Some DISTRO_ROCKY - | Some DISTRO_FEDORA - | Some DISTRO_MAGEIA - | Some DISTRO_MANDRIVA -@@ -329,6 +330,7 @@ and check_package_management { distro; version } = - Some PACKAGE_MANAGEMENT_DNF - - | Some DISTRO_CENTOS -+ | Some DISTRO_ROCKY - | Some DISTRO_ORACLE_LINUX - | Some DISTRO_REDHAT_BASED - | Some DISTRO_RHEL -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index 7f6eb92e9..63cb279d0 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -32,6 +32,8 @@ let re_rhel_no_minor = PCRE.compile "Red Hat.*release (\\d+)" - let re_centos_old = PCRE.compile "CentOS.*release (\\d+).*Update (\\d+)" - let re_centos = PCRE.compile "CentOS.*release (\\d+)\\.(\\d+)" - let re_centos_no_minor = PCRE.compile "CentOS.*release (\\d+)" -+let re_rocky = PCRE.compile "Rocky Linux.*release (\\d+)\\.(\\d+)" -+let re_rocky_no_minor = PCRE.compile "Rocky Linux.*release (\\d+)" - let re_scientific_linux_old = - PCRE.compile "Scientific Linux.*release (\\d+).*Update (\\d+)" - let re_scientific_linux = -@@ -106,7 +108,7 @@ let rec parse_os_release release_file data = - * we detect that situation then bail out and use the release - * files instead. - *) -- | { distro = Some (DISTRO_DEBIAN|DISTRO_CENTOS); -+ | { distro = Some (DISTRO_DEBIAN|DISTRO_CENTOS|DISTRO_ROCKY); - version = Some (_, 0) } -> - false - -@@ -155,6 +157,7 @@ and distro_of_os_release_id = function - | "pardus" -> Some DISTRO_PARDUS - | "pld" -> Some DISTRO_PLD_LINUX - | "rhel" -> Some DISTRO_RHEL -+ | "rocky" -> Some DISTRO_ROCKY - | "sles" | "sled" -> Some DISTRO_SLES - | "ubuntu" -> Some DISTRO_UBUNTU - | "void" -> Some DISTRO_VOID_LINUX -@@ -405,6 +408,10 @@ let linux_root_tests : tests = [ - DISTRO_CENTOS; - "/etc/centos-release", parse_generic ~rex:re_centos_no_minor - DISTRO_CENTOS; -+ "/etc/rocky-release", parse_generic ~rex:re_rocky -+ DISTRO_ROCKY; -+ "/etc/rocky-release", parse_generic ~rex:re_rocky_no_minor -+ DISTRO_ROCKY; - "/etc/altlinux-release", parse_generic DISTRO_ALTLINUX; - "/etc/redhat-release", parse_generic ~rex:re_fedora - DISTRO_FEDORA; -@@ -420,6 +427,10 @@ let linux_root_tests : tests = [ - DISTRO_CENTOS; - "/etc/redhat-release", parse_generic ~rex:re_centos_no_minor - DISTRO_CENTOS; -+ "/etc/redhat-release", parse_generic ~rex:re_rocky -+ DISTRO_ROCKY; -+ "/etc/redhat-release", parse_generic ~rex:re_rocky_no_minor -+ DISTRO_ROCKY; - "/etc/redhat-release", parse_generic ~rex:re_scientific_linux_old - DISTRO_SCIENTIFIC_LINUX; - "/etc/redhat-release", parse_generic ~rex:re_scientific_linux -diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml -index e2bc7165c..9395c51f9 100644 ---- a/daemon/inspect_types.ml -+++ b/daemon/inspect_types.ml -@@ -95,6 +95,7 @@ and distro = - | DISTRO_PLD_LINUX - | DISTRO_REDHAT_BASED - | DISTRO_RHEL -+ | DISTRO_ROCKY - | DISTRO_SCIENTIFIC_LINUX - | DISTRO_SLACKWARE - | DISTRO_SLES -@@ -228,6 +229,7 @@ and string_of_distro = function - | DISTRO_PLD_LINUX -> "pldlinux" - | DISTRO_REDHAT_BASED -> "redhat-based" - | DISTRO_RHEL -> "rhel" -+ | DISTRO_ROCKY -> "rocky" - | DISTRO_SCIENTIFIC_LINUX -> "scientificlinux" - | DISTRO_SLACKWARE -> "slackware" - | DISTRO_SLES -> "sles" -diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli -index 43c79818f..29c76e8ab 100644 ---- a/daemon/inspect_types.mli -+++ b/daemon/inspect_types.mli -@@ -102,6 +102,7 @@ and distro = - | DISTRO_PLD_LINUX - | DISTRO_REDHAT_BASED - | DISTRO_RHEL -+ | DISTRO_ROCKY - | DISTRO_SCIENTIFIC_LINUX - | DISTRO_SLACKWARE - | DISTRO_SLES -diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml -index 0c6d39b43..f8b744993 100644 ---- a/generator/actions_inspection.ml -+++ b/generator/actions_inspection.ml -@@ -278,6 +278,10 @@ Some Red Hat-derived distro. - - Red Hat Enterprise Linux. - -+=item \"rocky\" -+ -+Rocky Linux. -+ - =item \"scientificlinux\" - - Scientific Linux. -diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c -index 725af574b..3bffa4f80 100644 ---- a/lib/inspect-icon.c -+++ b/lib/inspect-icon.c -@@ -138,6 +138,7 @@ guestfs_impl_inspect_get_icon (guestfs_h *g, const char *root, size_t *size_r, - else if (STREQ (distro, "rhel") || - STREQ (distro, "redhat-based") || - STREQ (distro, "centos") || -+ STREQ (distro, "rocky") || - STREQ (distro, "scientificlinux") || - STREQ (distro, "oraclelinux")) { - r = icon_rhel (g, guestfs_inspect_get_major_version (g, root), &size); -diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c -index db38d87f7..90e57e6df 100644 ---- a/lib/inspect-osinfo.c -+++ b/lib/inspect-osinfo.c -@@ -47,6 +47,10 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) - else if (major == 6) - return safe_asprintf (g, "%s%d.%d", distro, major, minor); - } -+ else if (STREQ (distro, "rocky")) { -+ if (major >= 8) -+ return safe_asprintf (g, "%s%d", distro, major); -+ } - else if (STREQ (distro, "debian")) { - if (major >= 4) - return safe_asprintf (g, "%s%d", distro, major); --- -2.19.1.3.g30247aa5d201 - diff --git a/0012-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.config.patch b/0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch similarity index 92% rename from 0012-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.config.patch rename to 0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch index 8cef009..becb22c 100644 --- a/0012-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.config.patch +++ b/0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch @@ -1,4 +1,4 @@ -From c50bb81e40b36a74c15f9bc515a2f04a1eb00673 Mon Sep 17 00:00:00 2001 +From e73652429cd6f438a1a772f394c69a1cf3ecd2a5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 29 Jun 2021 15:29:11 +0100 Subject: [PATCH] RHEL: Create /etc/crypto-policies/back-ends/opensslcnf.config @@ -28,5 +28,5 @@ index 7076821d2..fe6497b4d 100755 # Set up kmod static-nodes (RHBZ#1011907). -- -2.19.1.3.g30247aa5d201 +2.31.1 diff --git a/0004-launch-libvirt-place-our-virtio-net-pci-device-in-slot-0x1e.patch b/0004-launch-libvirt-place-our-virtio-net-pci-device-in-slot-0x1e.patch deleted file mode 100644 index c223681..0000000 --- a/0004-launch-libvirt-place-our-virtio-net-pci-device-in-slot-0x1e.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 43e0fdd6cb94370e74b1214c7550aa98b8307409 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 23 Dec 2021 11:36:59 +0100 -Subject: [PATCH] launch-libvirt: place our virtio-net-pci device in slot 0x1e - -The trick we use for adding our virtio-net-pci device -in the libvirt backend can conflict with libvirtd's and QEMU's PCI address -assignment. Try to mitigate that by placing our device in slot 0x1e on the -root bus. In practice this could only conflict with a "dmi-to-pci-bridge" -device model, which libvirtd itself places in slot 0x1e. However, given -the XMLs we generate, and modern QEMU versions, libvirtd has no reason to -auto-add "dmi-to-pci-bridge". Refer to -. - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160 -Signed-off-by: Laszlo Ersek -Message-Id: <20211223103701.12702-2-lersek@redhat.com> -Reviewed-by: Richard W.M. Jones -Tested-by: Richard W.M. Jones -(cherry picked from commit 5ce5ef6a97a58c5e906083ad4e944545712b3f3f) ---- - lib/guestfs-internal.h | 11 +++++++++++ - lib/launch-libvirt.c | 4 +++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h -index 4097b33fd..8eb2dd3ad 100644 ---- a/lib/guestfs-internal.h -+++ b/lib/guestfs-internal.h -@@ -172,6 +172,17 @@ cleanup_mutex_unlock (pthread_mutex_t **ptr) - #define VIRTIO_DEVICE_NAME(type) type "-pci" - #endif - -+/* Place the virtio-net controller in slot 0x1e on the root bus, on normal -+ * hardware with PCI. Refer to RHBZ#2034160. -+ */ -+#ifdef HAVE_LIBVIRT_BACKEND -+#if defined(__arm__) || defined(__s390x__) -+#define VIRTIO_NET_PCI_ADDR "" -+#else -+#define VIRTIO_NET_PCI_ADDR ",addr=1e.0" -+#endif -+#endif -+ - /* Guestfs handle and associated structures. */ - - /* State. */ -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 194530c49..9e8336938 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -1851,7 +1851,9 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g, - } end_element (); - - start_element ("qemu:arg") { -- attribute ("value", VIRTIO_DEVICE_NAME ("virtio-net") ",netdev=usernet"); -+ attribute ("value", (VIRTIO_DEVICE_NAME ("virtio-net") -+ ",netdev=usernet" -+ VIRTIO_NET_PCI_ADDR)); - } end_element (); - } - --- -2.19.1.3.g30247aa5d201 - diff --git a/0005-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-macros.patch b/0005-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-macros.patch deleted file mode 100644 index a6c1dd1..0000000 --- a/0005-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-macros.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 80899629519139a7eb86842942a9471d05eb4112 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 23 Dec 2021 11:37:00 +0100 -Subject: [PATCH] lib: extract NETWORK_ADDRESS and NETWORK_PREFIX as macros - -The 169.254.0.0/16 network specification (for the appliance) is currently -duplicated between the direct backend and the libvirt backend. In a -subsequent patch, we're going to need the network specification in yet -another spot; extract it now to the NETWORK_ADDRESS and NETWORK_PREFIX -macros (simply as strings). - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160 -Signed-off-by: Laszlo Ersek -Message-Id: <20211223103701.12702-3-lersek@redhat.com> -Reviewed-by: Richard W.M. Jones -Tested-by: Richard W.M. Jones -(cherry picked from commit 216de164e091a5c36403f24901698044a43ae0d9) ---- - lib/guestfs-internal.h | 6 ++++++ - lib/launch-direct.c | 2 +- - lib/launch-libvirt.c | 3 ++- - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h -index 8eb2dd3ad..e24d570f5 100644 ---- a/lib/guestfs-internal.h -+++ b/lib/guestfs-internal.h -@@ -183,6 +183,12 @@ cleanup_mutex_unlock (pthread_mutex_t **ptr) - #endif - #endif - -+/* Network address and network mask (expressed as address prefix) that the -+ * appliance will see (if networking is enabled). -+ */ -+#define NETWORK_ADDRESS "169.254.0.0" -+#define NETWORK_PREFIX "16" -+ - /* Guestfs handle and associated structures. */ - - /* State. */ -diff --git a/lib/launch-direct.c b/lib/launch-direct.c -index e5b9a5611..4f038f4f0 100644 ---- a/lib/launch-direct.c -+++ b/lib/launch-direct.c -@@ -689,7 +689,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg) - start_list ("-netdev") { - append_list ("user"); - append_list ("id=usernet"); -- append_list ("net=169.254.0.0/16"); -+ append_list ("net=" NETWORK_ADDRESS "/" NETWORK_PREFIX); - } end_list (); - start_list ("-device") { - append_list (VIRTIO_DEVICE_NAME ("virtio-net")); -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 9e8336938..266d88824 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -1843,7 +1843,8 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g, - } end_element (); - - start_element ("qemu:arg") { -- attribute ("value", "user,id=usernet,net=169.254.0.0/16"); -+ attribute ("value", -+ "user,id=usernet,net=" NETWORK_ADDRESS "/" NETWORK_PREFIX); - } end_element (); - - start_element ("qemu:arg") { --- -2.19.1.3.g30247aa5d201 - diff --git a/0006-launch-libvirt-add-virtio-net-via-the-standard-interface-element.patch b/0006-launch-libvirt-add-virtio-net-via-the-standard-interface-element.patch deleted file mode 100644 index cf9f36c..0000000 --- a/0006-launch-libvirt-add-virtio-net-via-the-standard-interface-element.patch +++ /dev/null @@ -1,91 +0,0 @@ -From a18bc12081bcebf2d78883d1c6981c454149bb39 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 23 Dec 2021 11:37:01 +0100 -Subject: [PATCH] launch-libvirt: add virtio-net via the standard - element - -Starting with version 3.8.0, libvirt allows us to specify the network -address and network mask (as prefix) for SLIRP directly via the - element in the domain XML: -. This means -we don't need the hack for virtio-net on such versions. - -Restrict the hack in construct_libvirt_xml_qemu_cmdline() to -libvirt<3.8.0, and generate the proper element in -construct_libvirt_xml_devices() on libvirt>=3.8.0. - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160 -Suggested-by: Richard W.M. Jones -Signed-off-by: Laszlo Ersek -Message-Id: <20211223103701.12702-4-lersek@redhat.com> -Reviewed-by: Richard W.M. Jones -Tested-by: Richard W.M. Jones -(cherry picked from commit 5858c2cf6c24b3776e3867eafd9d86a1f4912d9c) ---- - lib/guestfs-internal.h | 3 ++- - lib/launch-libvirt.c | 27 +++++++++++++++++++++++++-- - 2 files changed, 27 insertions(+), 3 deletions(-) - -diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h -index e24d570f5..4a19e5c6b 100644 ---- a/lib/guestfs-internal.h -+++ b/lib/guestfs-internal.h -@@ -173,7 +173,8 @@ cleanup_mutex_unlock (pthread_mutex_t **ptr) - #endif - - /* Place the virtio-net controller in slot 0x1e on the root bus, on normal -- * hardware with PCI. Refer to RHBZ#2034160. -+ * hardware with PCI. Necessary only before libvirt 3.8.0. Refer to -+ * RHBZ#2034160. - */ - #ifdef HAVE_LIBVIRT_BACKEND - #if defined(__arm__) || defined(__s390x__) -diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c -index 266d88824..cc714c02e 100644 ---- a/lib/launch-libvirt.c -+++ b/lib/launch-libvirt.c -@@ -1413,6 +1413,28 @@ construct_libvirt_xml_devices (guestfs_h *g, - } end_element (); - } end_element (); - -+ /* Virtio-net NIC with SLIRP (= userspace) back-end, if networking is -+ * enabled. Starting with libvirt 3.8.0, we can specify the network address -+ * and prefix for SLIRP in the domain XML. Therefore, we can add the NIC -+ * via the standard element rather than , and -+ * so libvirt can manage the PCI address of the virtio-net NIC like the PCI -+ * addresses of all other devices. Refer to RHBZ#2034160. -+ */ -+ if (g->enable_network && -+ guestfs_int_version_ge (¶ms->data->libvirt_version, 3, 8, 0)) { -+ start_element ("interface") { -+ attribute ("type", "user"); -+ start_element ("model") { -+ attribute ("type", "virtio"); -+ } end_element (); -+ start_element ("ip") { -+ attribute ("family", "ipv4"); -+ attribute ("address", NETWORK_ADDRESS); -+ attribute ("prefix", NETWORK_PREFIX); -+ } end_element (); -+ } end_element (); -+ } -+ - /* Libvirt adds some devices by default. Indicate to libvirt - * that we don't want them. - */ -@@ -1835,9 +1857,10 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g, - } end_element (); - - /* Workaround because libvirt user networking cannot specify "net=" -- * parameter. -+ * parameter. Necessary only before libvirt 3.8.0; refer to RHBZ#2034160. - */ -- if (g->enable_network) { -+ if (g->enable_network && -+ !guestfs_int_version_ge (¶ms->data->libvirt_version, 3, 8, 0)) { - start_element ("qemu:arg") { - attribute ("value", "-netdev"); - } end_element (); --- -2.19.1.3.g30247aa5d201 - diff --git a/0007-RHEL-Remove-libguestfs-live-RHBZ-798980.patch b/0007-RHEL-Remove-libguestfs-live-RHBZ-798980.patch deleted file mode 100644 index 62c8b50..0000000 --- a/0007-RHEL-Remove-libguestfs-live-RHBZ-798980.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dabee87775ee919a8ae930ca5f03c7bb4b7616e6 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 21 Dec 2012 15:50:11 +0000 -Subject: [PATCH] RHEL: Remove libguestfs live (RHBZ#798980). - -This isn't supported in RHEL. - -Disable daemon tests that require the 'unix' backend. ---- - lib/launch-unix.c | 7 +++++++ - tests/Makefile.am | 3 --- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/lib/launch-unix.c b/lib/launch-unix.c -index 0d344f9df..74dd1bb4a 100644 ---- a/lib/launch-unix.c -+++ b/lib/launch-unix.c -@@ -37,6 +37,12 @@ - static int - launch_unix (guestfs_h *g, void *datav, const char *sockpath) - { -+ error (g, -+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n" -+ "In particular, \"libguestfs live\" is not supported."); -+ return -1; -+ -+#if 0 - int r, daemon_sock = -1; - struct sockaddr_un addr; - uint32_t size; -@@ -106,6 +112,7 @@ launch_unix (guestfs_h *g, void *datav, const char *sockpath) - g->conn = NULL; - } - return -1; -+#endif - } - - static int -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 690e09b5e..919e2f248 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -328,9 +328,6 @@ EXTRA_DIST += create/test-disk-create.sh - - check_DATA = daemon/captive-daemon.pm - --TESTS += \ -- daemon/test-daemon-start.pl \ -- daemon/test-btrfs.pl - EXTRA_DIST += \ - daemon/test-daemon-start.pl \ - daemon/test-btrfs.pl --- -2.19.1.3.g30247aa5d201 - diff --git a/0008-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch b/0008-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch deleted file mode 100644 index 0c63a56..0000000 --- a/0008-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch +++ /dev/null @@ -1,329 +0,0 @@ -From 8d426264789f4b2ab5557087a39973e6fbc20983 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 18 Jul 2013 18:31:53 +0100 -Subject: [PATCH] RHEL: Remove 9p APIs from RHEL (RHBZ#921710). - ---- - daemon/9p.c | 182 -------------------------------------- - daemon/Makefile.am | 1 - - docs/C_SOURCE_FILES | 1 - - generator/actions_core.ml | 21 ----- - generator/proc_nr.ml | 2 - - gobject/Makefile.inc | 2 - - po/POTFILES | 2 - - tests/Makefile.am | 1 - - 8 files changed, 212 deletions(-) - delete mode 100644 daemon/9p.c - -diff --git a/daemon/9p.c b/daemon/9p.c -deleted file mode 100644 -index 9a3a5cfdf..000000000 ---- a/daemon/9p.c -+++ /dev/null -@@ -1,182 +0,0 @@ --/* libguestfs - the guestfsd daemon -- * Copyright (C) 2011 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, write to the Free Software -- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- */ -- --#include -- --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -- --#include "ignore-value.h" -- --#include "daemon.h" --#include "actions.h" -- --#define BUS_PATH "/sys/bus/virtio/drivers/9pnet_virtio" -- --static void --modprobe_9pnet_virtio (void) --{ -- /* Required with Linux 5.6 and maybe earlier kernels. For unclear -- * reasons the module is not an automatic dependency of the 9p -- * module so doesn't get loaded automatically. -- */ -- ignore_value (command (NULL, NULL, "modprobe", "9pnet_virtio", NULL)); --} -- --/* https://bugzilla.redhat.com/show_bug.cgi?id=714981#c1 */ --char ** --do_list_9p (void) --{ -- CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (r); -- DIR *dir; -- -- modprobe_9pnet_virtio (); -- -- dir = opendir (BUS_PATH); -- if (!dir) { -- perror ("opendir: " BUS_PATH); -- if (errno != ENOENT) { -- reply_with_perror ("opendir: " BUS_PATH); -- return NULL; -- } -- -- /* If this directory doesn't exist, it probably means that -- * the virtio driver isn't loaded. Don't return an error -- * in this case, but return an empty list. -- */ -- if (end_stringsbuf (&r) == -1) -- return NULL; -- -- return take_stringsbuf (&r); -- } -- -- while (1) { -- struct dirent *d; -- -- errno = 0; -- d = readdir (dir); -- if (d == NULL) break; -- -- if (STRPREFIX (d->d_name, "virtio")) { -- CLEANUP_FREE char *mount_tag_path = NULL; -- if (asprintf (&mount_tag_path, BUS_PATH "/%s/mount_tag", -- d->d_name) == -1) { -- reply_with_perror ("asprintf"); -- closedir (dir); -- return NULL; -- } -- -- /* A bit unclear, but it looks like the virtio transport allows -- * the mount tag length to be unlimited (or up to 65536 bytes). -- * See: linux/include/linux/virtio_9p.h -- */ -- CLEANUP_FREE char *mount_tag = read_whole_file (mount_tag_path, NULL); -- if (mount_tag == 0) -- continue; -- -- if (add_string (&r, mount_tag) == -1) { -- closedir (dir); -- return NULL; -- } -- } -- } -- -- /* Check readdir didn't fail */ -- if (errno != 0) { -- reply_with_perror ("readdir: " BUS_PATH); -- closedir (dir); -- return NULL; -- } -- -- /* Close the directory handle */ -- if (closedir (dir) == -1) { -- reply_with_perror ("closedir: " BUS_PATH); -- return NULL; -- } -- -- /* Sort the tags. */ -- if (r.size > 0) -- sort_strings (r.argv, r.size); -- -- /* NULL terminate the list */ -- if (end_stringsbuf (&r) == -1) -- return NULL; -- -- return take_stringsbuf (&r); --} -- --/* Takes optional arguments, consult optargs_bitmask. */ --int --do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options) --{ -- CLEANUP_FREE char *mp = NULL, *opts = NULL, *err = NULL; -- struct stat statbuf; -- int r; -- -- ABS_PATH (mountpoint, 0, return -1); -- -- mp = sysroot_path (mountpoint); -- if (!mp) { -- reply_with_perror ("malloc"); -- return -1; -- } -- -- /* Check the mountpoint exists and is a directory. */ -- if (stat (mp, &statbuf) == -1) { -- reply_with_perror ("%s", mountpoint); -- return -1; -- } -- if (!S_ISDIR (statbuf.st_mode)) { -- reply_with_perror ("%s: mount point is not a directory", mountpoint); -- return -1; -- } -- -- /* Add trans=virtio to the options. */ -- if ((optargs_bitmask & GUESTFS_MOUNT_9P_OPTIONS_BITMASK) && -- STRNEQ (options, "")) { -- if (asprintf (&opts, "trans=virtio,%s", options) == -1) { -- reply_with_perror ("asprintf"); -- return -1; -- } -- } -- else { -- opts = strdup ("trans=virtio"); -- if (opts == NULL) { -- reply_with_perror ("strdup"); -- return -1; -- } -- } -- -- modprobe_9pnet_virtio (); -- r = command (NULL, &err, -- "mount", "-o", opts, "-t", "9p", mount_tag, mp, NULL); -- if (r == -1) { -- reply_with_error ("%s on %s: %s", mount_tag, mountpoint, err); -- return -1; -- } -- -- return 0; --} -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 7322bfa5d..872eaa8bc 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -84,7 +84,6 @@ guestfsd_SOURCES = \ - ../common/protocol/guestfs_protocol.h \ - ../common/utils/cleanups.h \ - ../common/utils/guestfs-utils.h \ -- 9p.c \ - acl.c \ - actions.h \ - available.c \ -diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES -index 6a97d8b0e..896314e7e 100644 ---- a/docs/C_SOURCE_FILES -+++ b/docs/C_SOURCE_FILES -@@ -43,7 +43,6 @@ common/visit/visit.c - common/visit/visit.h - common/windows/windows.c - common/windows/windows.h --daemon/9p.c - daemon/acl.c - daemon/actions.h - daemon/augeas.c -diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index 226fb860a..05320fcd3 100644 ---- a/generator/actions_core.ml -+++ b/generator/actions_core.ml -@@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes. - - Note that for large devices this can take a long time to run." }; - -- { defaults with -- name = "list_9p"; added = (1, 11, 12); -- style = RStringList (RPlainString, "mounttags"), [], []; -- shortdesc = "list 9p filesystems"; -- longdesc = "\ --List all 9p filesystems attached to the guest. A list of --mount tags is returned." }; -- -- { defaults with -- name = "mount_9p"; added = (1, 11, 12); -- style = RErr, [String (PlainString, "mounttag"); String (PlainString, "mountpoint")], [OString "options"]; -- camel_name = "Mount9P"; -- shortdesc = "mount 9p filesystem"; -- longdesc = "\ --Mount the virtio-9p filesystem with the tag C on the --directory C. -- --If required, C will be automatically added to the options. --Any other options required can be passed in the optional C --parameter." }; -- - { defaults with - name = "list_dm_devices"; added = (1, 11, 15); - style = RStringList (RDevice, "devices"), [], []; -diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml -index 74b95baf7..6b6cb7353 100644 ---- a/generator/proc_nr.ml -+++ b/generator/proc_nr.ml -@@ -295,8 +295,6 @@ let proc_nr = [ - 282, "internal_autosync"; - 283, "is_zero"; - 284, "is_zero_device"; --285, "list_9p"; --286, "mount_9p"; - 287, "list_dm_devices"; - 288, "ntfsresize"; - 289, "btrfs_filesystem_resize"; -diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc -index 650f8ddac..c4e735967 100644 ---- a/gobject/Makefile.inc -+++ b/gobject/Makefile.inc -@@ -94,7 +94,6 @@ guestfs_gobject_headers= \ - include/guestfs-gobject/optargs-mksquashfs.h \ - include/guestfs-gobject/optargs-mkswap.h \ - include/guestfs-gobject/optargs-mktemp.h \ -- include/guestfs-gobject/optargs-mount_9p.h \ - include/guestfs-gobject/optargs-mount_local.h \ - include/guestfs-gobject/optargs-ntfsclone_out.h \ - include/guestfs-gobject/optargs-ntfsfix.h \ -@@ -188,7 +187,6 @@ guestfs_gobject_sources= \ - src/optargs-mksquashfs.c \ - src/optargs-mkswap.c \ - src/optargs-mktemp.c \ -- src/optargs-mount_9p.c \ - src/optargs-mount_local.c \ - src/optargs-ntfsclone_out.c \ - src/optargs-ntfsfix.c \ -diff --git a/po/POTFILES b/po/POTFILES -index 29205b6a6..23afe619c 100644 ---- a/po/POTFILES -+++ b/po/POTFILES -@@ -26,7 +26,6 @@ common/utils/stringlists-utils.c - common/utils/utils.c - common/visit/visit.c - common/windows/windows.c --daemon/9p.c - daemon/acl.c - daemon/augeas.c - daemon/available.c -@@ -264,7 +263,6 @@ gobject/src/optargs-mkfs_btrfs.c - gobject/src/optargs-mksquashfs.c - gobject/src/optargs-mkswap.c - gobject/src/optargs-mktemp.c --gobject/src/optargs-mount_9p.c - gobject/src/optargs-mount_local.c - gobject/src/optargs-ntfsclone_out.c - gobject/src/optargs-ntfsfix.c -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 919e2f248..e3613fec4 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -43,7 +43,6 @@ check-slow: - check-valgrind: - $(MAKE) VG="@VG@" check - --TESTS += 9p/test-9p.sh - EXTRA_DIST += 9p/test-9p.sh - - SLOW_TESTS += bigdirs/test-big-dirs.pl --- -2.19.1.3.g30247aa5d201 - diff --git a/0010-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch b/0010-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch deleted file mode 100644 index d4358f7..0000000 --- a/0010-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 1bb653591b25ac31ef773e0020cd0b0e5715d5cf Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 19 Sep 2014 13:38:20 +0100 -Subject: [PATCH] RHEL: Remove User-Mode Linux (RHBZ#1144197). - -This isn't supported in RHEL. ---- - lib/launch-uml.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/lib/launch-uml.c b/lib/launch-uml.c -index 5aec50a57..8b9fcd770 100644 ---- a/lib/launch-uml.c -+++ b/lib/launch-uml.c -@@ -44,7 +44,9 @@ struct backend_uml_data { - char umid[UML_UMID_LEN+1]; /* umid=<...> unique ID. */ - }; - -+#if 0 - static void print_vmlinux_command_line (guestfs_h *g, char **argv); -+#endif - - /* Run uml_mkcow to create a COW overlay. */ - static char * -@@ -81,6 +83,7 @@ create_cow_overlay_uml (guestfs_h *g, void *datav, struct drive *drv) - return make_cow_overlay (g, drv->src.u.path); - } - -+#if 0 - /* Test for features which are not supported by the UML backend. - * Possibly some of these should just be warnings, not errors. - */ -@@ -133,10 +136,17 @@ uml_supported (guestfs_h *g) - - return true; - } -+#endif - - static int - launch_uml (guestfs_h *g, void *datav, const char *arg) - { -+ error (g, -+ "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n" -+ "In particular, User-Mode Linux (UML) is not supported."); -+ return -1; -+ -+#if 0 - struct backend_uml_data *data = datav; - CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (cmdline); - int console_sock = -1, daemon_sock = -1; -@@ -496,8 +506,10 @@ launch_uml (guestfs_h *g, void *datav, const char *arg) - } - g->state = CONFIG; - return -1; -+#endif - } - -+#if 0 - /* This is called from the forked subprocess just before vmlinux runs, - * so it can just print the message straight to stderr, where it will - * be picked up and funnelled through the usual appliance event API. -@@ -527,6 +539,7 @@ print_vmlinux_command_line (guestfs_h *g, char **argv) - - fputc ('\n', stderr); - } -+#endif - - static int - shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) --- -2.19.1.3.g30247aa5d201 - diff --git a/copy-patches.sh b/copy-patches.sh index 21830aa..835b332 100755 --- a/copy-patches.sh +++ b/copy-patches.sh @@ -8,7 +8,7 @@ set -e # ./copy-patches.sh project=libguestfs -rhel_version=9.0.0 +rhel_version=9.1 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/libguestfs.spec b/libguestfs.spec index 0798b31..51b133c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,3 +1,4 @@ +%undefine _package_note_flags # Architectures on which golang works. #% global golang_arches aarch64 % {arm} % {ix86} x86_64 # In theory the above, in practice golang is so often broken that @@ -10,18 +11,8 @@ # we only do a sanity check that kernel/qemu/libvirt/appliance is not # broken. To perform the full test suite, see instructions here: # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html -# -# Currently the basic sanity check is *broken* on: -# -# arm: times out when running the test -# aarch64: "MSI is not supported by interrupt controller" (RHBZ#1414081) -# ppc64: qemu doesn't work with TCG (RHBZ#1614948) -# ppc64le: kernel doesn't boot on qemu (RHBZ#1435873) -# s390x: qemu TCG cannot emulate enough to boot the kernel -# (however KVM would work if it was available in Koji, so this -# is not a bug) %if !0%{?rhel} -%global test_arches x86_64 +%global test_arches aarch64 %{power64} s390x x86_64 %else # RHEL 9 only: # x86-64: "/lib64/libc.so.6: CPU ISA level is lower than required" @@ -45,7 +36,7 @@ %endif # The source directory. -%global source_directory 1.46-stable +%global source_directory 1.48-stable # Filter perl provides. %{?perl_default_filter} @@ -56,8 +47,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.46.1 -Release: 2%{?dist} +Version: 1.48.0 +Release: 1%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -92,21 +83,12 @@ Source7: libguestfs.keyring Source8: copy-patches.sh # Patches are maintained in the following repository: -# https://github.com/libguestfs/libguestfs/commits/rhel-9.0.0 +# https://github.com/libguestfs/libguestfs/commits/rhel-9.1 # Patches. -Patch0001: 0001-daemon-inspect_fs_unix-recognize-modern-Pardus-GNU-Linux-releases.patch -Patch0002: 0002-daemon-inspection-Add-support-for-Kylin-RHBZ-1995391.patch -Patch0003: 0003-Add-detection-support-for-Rocky-Linux-CentOS-RHEL-like.patch -Patch0004: 0004-launch-libvirt-place-our-virtio-net-pci-device-in-slot-0x1e.patch -Patch0005: 0005-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-macros.patch -Patch0006: 0006-launch-libvirt-add-virtio-net-via-the-standard-interface-element.patch -Patch0007: 0007-RHEL-Remove-libguestfs-live-RHBZ-798980.patch -Patch0008: 0008-RHEL-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch -Patch0009: 0009-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ-962113.patch -Patch0010: 0010-RHEL-Remove-User-Mode-Linux-RHBZ-1144197.patch -Patch0011: 0011-RHEL-Reject-use-of-libguestfs-winsupport-features-except-for-virt-tools-RHBZ-1240276.patch -Patch0012: 0012-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.config.patch +Patch0001: 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +Patch0002: 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +Patch0003: 0003-RHEL-Create-etc-crypto-policies-back-ends-opensslcnf.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel @@ -339,8 +321,11 @@ Requires: yajl%{?_isa} # For core mount-local (FUSE) API. Requires: fuse -# For core disk-create API. +# For core APIs: Requires: /usr/bin/qemu-img +Requires: coreutils +Requires: grep +Requires: tar # For qemu direct and libvirt backends. Requires: qemu-kvm-core @@ -945,7 +930,7 @@ rm ocaml/html/.gitignore %{_mandir}/man1/guestfs-performance.1* %{_mandir}/man1/guestfs-recipes.1* %{_mandir}/man1/guestfs-release-notes-1*.1* -%{_mandir}/man1/guestfs-release-notes-historical.1* +%{_mandir}/man1/guestfs-release-notes.1* %{_mandir}/man1/guestfs-security.1* %{_mandir}/man1/guestmount.1* %{_mandir}/man1/guestunmount.1* @@ -1146,6 +1131,10 @@ rm ocaml/html/.gitignore %changelog +* Mon Mar 14 2022 Richard W.M. Jones - 1:1.48.0-1 +- Rebase to new stable branch version 1.48.0 + resolves: rhbz#2059285 + * Thu Dec 23 2021 Laszlo Ersek - 1:1.46.1-2 - Add detection support for Rocky Linux resolves: rhbz#2030709 diff --git a/sources b/sources index cb89168..3fe554a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.46.1.tar.gz) = 28749578f01585a050975adb0ecafcc85cfa3b8940804e7e6846d64f4eabe2a65ca5a6084fdb4b34c97e388c5e4ec98703d41e0768c85c830b9b651874ebe45d -SHA512 (libguestfs-1.46.1.tar.gz.sig) = e80a4979a261bc0b9b35d857c2a52dae1124eeea65969923cc2f9c63f077493b0ae2166ea763a1c7a7a2055a752b3a736d06b890925d9d3daf08b67348d96eb6 +SHA512 (libguestfs-1.48.0.tar.gz) = b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2 +SHA512 (libguestfs-1.48.0.tar.gz.sig) = d884d4b5cdd5470978a56c8e31843847567221693711f4e35415c4ca992ad92d872be531641d945314556da65a7573d8cec5748d571ba4204c4bab81ee39bb1e