1054 lines
31 KiB
Diff
1054 lines
31 KiB
Diff
From b6d391c21b1c09497a70d40c7cdd02dbb51fbc3d Mon Sep 17 00:00:00 2001
|
|
From: tpw56j <smoker.tabac@gmail.com>
|
|
Date: Tue, 9 Nov 2021 11:39:20 +0300
|
|
Subject: [PATCH 1/8] fix/ldap_anonymous_bind
|
|
|
|
---
|
|
cobbler/modules/authentication/ldap.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cobbler/modules/authentication/ldap.py b/cobbler/modules/authentication/ldap.py
|
|
index 0abbd3538..a55ac1269 100644
|
|
--- a/cobbler/modules/authentication/ldap.py
|
|
+++ b/cobbler/modules/authentication/ldap.py
|
|
@@ -102,7 +102,7 @@ def authenticate(api_handle, username, password) -> bool:
|
|
return False
|
|
|
|
# if we're not allowed to search anonymously, grok the search bind settings and attempt to bind
|
|
- if api_handle.settings().ldap_anonymous_bind:
|
|
+ if not api_handle.settings().ldap_anonymous_bind:
|
|
searchdn = api_handle.settings().ldap_search_bind_dn
|
|
searchpw = api_handle.settings().ldap_search_passwd
|
|
|
|
|
|
From 22cdc2d1475bc5df2581c713336f07efc135e104 Mon Sep 17 00:00:00 2001
|
|
From: Xavier Bachelot <xavier@bachelot.org>
|
|
Date: Tue, 18 Jan 2022 19:04:54 +0100
|
|
Subject: [PATCH 2/8] Sync signatures from master
|
|
|
|
---
|
|
config/cobbler/distro_signatures.json | 704 ++++++++++++++++++++++----
|
|
1 file changed, 609 insertions(+), 95 deletions(-)
|
|
|
|
diff --git a/config/cobbler/distro_signatures.json b/config/cobbler/distro_signatures.json
|
|
index ca7943481..92fd6d758 100644
|
|
--- a/config/cobbler/distro_signatures.json
|
|
+++ b/config/cobbler/distro_signatures.json
|
|
@@ -12,9 +12,11 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"i386",
|
|
- "x86_64",
|
|
+ "ia64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -42,9 +44,10 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"i386",
|
|
- "x86_64",
|
|
+ "ia64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -69,8 +72,9 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc64"
|
|
+ "ppc64",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -94,10 +98,11 @@
|
|
"kernel_arch": "kernel-(.*).rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
- "i386",
|
|
- "x86_64",
|
|
+ "aarch64",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -129,11 +134,37 @@
|
|
"kernel_arch": "kernel-(.*).rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
- "i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
- "ppc64",
|
|
- "ppc64le"
|
|
+ "aarch64",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "rsync",
|
|
+ "rhn",
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "vmlinuz(.*)",
|
|
+ "initrd_file": "initrd(.*)\\.img",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "rhel9": {
|
|
+ "signatures": [
|
|
+ "BaseOS"
|
|
+ ],
|
|
+ "version_file": "(redhat|sl|slf|almalinux|centos|centos-linux|centos-stream|oraclelinux|rocky|vzlinux)-release-(?!notes)([\\w]*-)*9[\\.-]+(.*)\\.rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*).rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -208,10 +239,14 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "arm",
|
|
+ "armhfp",
|
|
"i386",
|
|
"x86_64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "ppc64",
|
|
+ "s390",
|
|
+ "s390x"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -235,10 +270,14 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "arm",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "ppc64",
|
|
+ "x86_64",
|
|
+ "s390",
|
|
+ "s390x"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -262,10 +301,13 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "arm",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "ppc64",
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -289,10 +331,13 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc",
|
|
- "ppc64"
|
|
+ "ppc64",
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -321,11 +366,14 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -354,11 +402,14 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -387,11 +438,14 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -420,11 +474,13 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -453,11 +509,13 @@
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -487,10 +545,12 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -520,10 +580,12 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -553,10 +615,12 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
"ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -586,10 +650,11 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -619,9 +684,11 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
+ "armhfp",
|
|
"i386",
|
|
- "x86_64",
|
|
- "ppc64le"
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -651,9 +718,10 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
- "i386",
|
|
- "x86_64",
|
|
- "ppc64le"
|
|
+ "armhfp",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -683,9 +751,10 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
- "i386",
|
|
- "x86_64",
|
|
- "ppc64le"
|
|
+ "armhfp",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -715,9 +784,10 @@
|
|
"kernel_arch_regex": null,
|
|
"supported_arches": [
|
|
"aarch64",
|
|
- "i386",
|
|
- "x86_64",
|
|
- "ppc64le"
|
|
+ "armhfp",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
],
|
|
"supported_repo_breeds": [
|
|
"rsync",
|
|
@@ -737,6 +807,68 @@
|
|
]
|
|
}
|
|
},
|
|
+ "fedora34": {
|
|
+ "signatures": [
|
|
+ "Packages"
|
|
+ ],
|
|
+ "version_file": "(fedora)-release-34-(.*)\\.noarch\\.rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "rsync",
|
|
+ "rhn",
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "vmlinuz(.*)",
|
|
+ "initrd_file": "initrd(.*)\\.img",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample.ks",
|
|
+ "kernel_options": "repo=$tree",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": [],
|
|
+ "boot_loaders": {
|
|
+ "ppc64": [
|
|
+ "grub"
|
|
+ ]
|
|
+ }
|
|
+ },
|
|
+ "fedora35": {
|
|
+ "signatures": [
|
|
+ "Packages"
|
|
+ ],
|
|
+ "version_file": "(fedora)-release-35-(.*)\\.noarch\\.rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "armhfp",
|
|
+ "ppc64le",
|
|
+ "s390x",
|
|
+ "x86_64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "rsync",
|
|
+ "rhn",
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "vmlinuz(.*)",
|
|
+ "initrd_file": "initrd(.*)\\.img",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample.ks",
|
|
+ "kernel_options": "repo=$tree",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": [],
|
|
+ "boot_loaders": []
|
|
+ },
|
|
"cloudlinux6": {
|
|
"signatures": [
|
|
"Packages"
|
|
@@ -880,6 +1012,29 @@
|
|
"kernel_options": "",
|
|
"kernel_options_post": "",
|
|
"boot_files": []
|
|
+ },
|
|
+ "bullseye": {
|
|
+ "signatures": [
|
|
+ "dists"
|
|
+ ],
|
|
+ "version_file": "Release",
|
|
+ "version_file_regex": "Codename: bullseye",
|
|
+ "kernel_arch": "linux-headers-(.*)\\.deb",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "i386",
|
|
+ "amd64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "apt"
|
|
+ ],
|
|
+ "kernel_file": "vmlinuz(.*)",
|
|
+ "initrd_file": "initrd(.*)\\.gz",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample.seed",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
}
|
|
},
|
|
"ubuntu": {
|
|
@@ -1394,6 +1549,32 @@
|
|
"template_files": "",
|
|
"boot_files": [],
|
|
"boot_loaders": {}
|
|
+ },
|
|
+ "impish": {
|
|
+ "signatures": [
|
|
+ "dists",
|
|
+ ".disk"
|
|
+ ],
|
|
+ "version_file": "Release|info",
|
|
+ "version_file_regex": "Suite: impish|Ubuntu-Server 21\\.10",
|
|
+ "kernel_arch": "linux-headers-(.*)\\.deb",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "i386",
|
|
+ "amd64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "apt"
|
|
+ ],
|
|
+ "kernel_file": "(linux|vmlinuz(.*))",
|
|
+ "initrd_file": "initrd($|.gz$|.lz$)",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "template_files": "",
|
|
+ "boot_files": [],
|
|
+ "boot_loaders": {}
|
|
}
|
|
},
|
|
"suse": {
|
|
@@ -1613,11 +1794,107 @@
|
|
"kernel_options_post": "",
|
|
"boot_files": []
|
|
},
|
|
- "opensuse15generic": {
|
|
+ "opensuse15.0": {
|
|
+ "signatures": [
|
|
+ ""
|
|
+ ],
|
|
+ "version_file": "openSUSE-release-15.0-(.*).rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "x86_64",
|
|
+ "ppc64le"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "(linux|vmlinuz(.*))",
|
|
+ "initrd_file": "initrd(.*)",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample_autoyast.xml",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "opensuse15.1": {
|
|
"signatures": [
|
|
""
|
|
],
|
|
- "version_file": "openSUSE-release-15.(.*).rpm",
|
|
+ "version_file": "openSUSE-release-15.1-(.*).rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "x86_64",
|
|
+ "ppc64le"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "(linux|vmlinuz(.*))",
|
|
+ "initrd_file": "initrd(.*)",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample_autoyast.xml",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "opensuse15.2": {
|
|
+ "signatures": [
|
|
+ ""
|
|
+ ],
|
|
+ "version_file": "openSUSE-release-15.2-(.*).rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "x86_64",
|
|
+ "ppc64le"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "(linux|vmlinuz(.*))",
|
|
+ "initrd_file": "initrd(.*)",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample_autoyast.xml",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "opensuse15.3": {
|
|
+ "signatures": [
|
|
+ ""
|
|
+ ],
|
|
+ "version_file": "openSUSE-release-15.3-(.*).rpm",
|
|
+ "version_file_regex": null,
|
|
+ "kernel_arch": "kernel-(.*)\\.rpm",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "aarch64",
|
|
+ "x86_64",
|
|
+ "ppc64le"
|
|
+ ],
|
|
+ "supported_repo_breeds": [
|
|
+ "yum"
|
|
+ ],
|
|
+ "kernel_file": "(linux|vmlinuz(.*))",
|
|
+ "initrd_file": "initrd(.*)",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "sample_autoyast.xml",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "opensuse15.4": {
|
|
+ "signatures": [
|
|
+ ""
|
|
+ ],
|
|
+ "version_file": "openSUSE-release-15.4-(.*).rpm",
|
|
"version_file_regex": null,
|
|
"kernel_arch": "kernel-(.*)\\.rpm",
|
|
"kernel_arch_regex": null,
|
|
@@ -2613,6 +2890,81 @@
|
|
"kernel_options": "",
|
|
"kernel_options_post": "",
|
|
"boot_files": []
|
|
+ },
|
|
+ "freebsd12.2": {
|
|
+ "signatures": [
|
|
+ "boot"
|
|
+ ],
|
|
+ "version_file": "freebsd-version",
|
|
+ "version_file_regex": "USERLAND_VERSION=\"12.2-RELEASE\"",
|
|
+ "kernel_arch": "device\\.hints",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "i386",
|
|
+ "amd64",
|
|
+ "ppc64",
|
|
+ "ppc64le",
|
|
+ "ppc64el",
|
|
+ "aarch64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "base.txz",
|
|
+ "initrd_file": "base.txz",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "freebsd12.3": {
|
|
+ "signatures": [
|
|
+ "boot"
|
|
+ ],
|
|
+ "version_file": "freebsd-version",
|
|
+ "version_file_regex": "USERLAND_VERSION=\"12.3-RELEASE\"",
|
|
+ "kernel_arch": "device\\.hints",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "i386",
|
|
+ "amd64",
|
|
+ "ppc64",
|
|
+ "ppc64le",
|
|
+ "ppc64el",
|
|
+ "aarch64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "base.txz",
|
|
+ "initrd_file": "base.txz",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "freebsd13.0": {
|
|
+ "signatures": [
|
|
+ "boot"
|
|
+ ],
|
|
+ "version_file": "freebsd-version",
|
|
+ "version_file_regex": "USERLAND_VERSION=\"13.0-RELEASE\"",
|
|
+ "kernel_arch": "device\\.hints",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches": [
|
|
+ "i386",
|
|
+ "amd64",
|
|
+ "ppc64",
|
|
+ "ppc64le",
|
|
+ "ppc64el",
|
|
+ "aarch64"
|
|
+ ],
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "base.txz",
|
|
+ "initrd_file": "base.txz",
|
|
+ "isolinux_ok": false,
|
|
+ "default_autoinstall": "",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
}
|
|
},
|
|
"xen": {
|
|
@@ -2752,42 +3104,204 @@
|
|
"unix": {
|
|
},
|
|
"windows": {
|
|
- "2003": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub"]}
|
|
- },
|
|
- "2008": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "2012": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "2016": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "2019": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "XP": {
|
|
- "supported_arches":["i386","x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub"]}
|
|
- },
|
|
- "7": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "8": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- },
|
|
- "10": {
|
|
- "supported_arches":["x86_64"],
|
|
- "boot_loaders":{"x86_64":["pxelinux","grub","ipxe"]}
|
|
- }
|
|
+ "2003": {
|
|
+ "signatures": [
|
|
+ "amd64",
|
|
+ "i386",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "relnotes\\.htm",
|
|
+ "version_file_regex": "^.*Microsoft Windows Server 2003.*$",
|
|
+ "kernel_arch": "(i386|amd64)",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches":["i386","amd64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": [
|
|
+ "i386/*.*",
|
|
+ "amd64/*.*"
|
|
+ ]
|
|
+ },
|
|
+ "2008": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows Server 2008.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86|x86_64)$",
|
|
+ "supported_arches":["x86","x86_64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "2012": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows Server 2012.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86_64)$",
|
|
+ "supported_arches":["x86_64"],
|
|
+ "boot_loaders":{"x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "2016": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows Server 2016.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86_64)$",
|
|
+ "supported_arches":["x86_64"],
|
|
+ "boot_loaders":{"x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "2019": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows Server 2019.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86_64)$",
|
|
+ "supported_arches":["x86_64"],
|
|
+ "boot_loaders":{"x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "XP": {
|
|
+ "signatures": [
|
|
+ "amd64",
|
|
+ "i386",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "readme\\.htm",
|
|
+ "version_file_regex": "^Version of Microsoft Windows XP.*$",
|
|
+ "kernel_arch": "(i386|amd64)",
|
|
+ "kernel_arch_regex": null,
|
|
+ "supported_arches":["i386","amd64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": [
|
|
+ "i386/*.*",
|
|
+ "amd64/*.*"
|
|
+ ]
|
|
+ },
|
|
+ "7": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows 7.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86|x86_64)$",
|
|
+ "supported_arches":["x86","x86_64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "8": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows 8.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86|x86_64)$",
|
|
+ "supported_arches":["x86","x86_64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "10": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows 10.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(x86|x86_64)$",
|
|
+ "supported_arches":["x86","x86_64"],
|
|
+ "boot_loaders":{"i386":["pxe","ipxe"], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ },
|
|
+ "11": {
|
|
+ "signatures": [
|
|
+ "sources",
|
|
+ "autorun.inf"
|
|
+ ],
|
|
+ "version_file": "install\\.wim",
|
|
+ "version_file_regex": "^Name:.*Windows 11.*$",
|
|
+ "kernel_arch": "install\\.wim",
|
|
+ "kernel_arch_regex": "^Architecture:.*(ARM64|x86_64)$",
|
|
+ "supported_arches":["ARM64","x86_64"],
|
|
+ "boot_loaders":{"aarch64":[], "x86_64":["pxe","ipxe"]},
|
|
+ "supported_repo_breeds": [],
|
|
+ "kernel_file": "pxeboot\\.n12",
|
|
+ "initrd_file": "boot\\.sdi",
|
|
+ "default_autoinstall": "win.ks",
|
|
+ "kernel_options": "",
|
|
+ "kernel_options_post": "",
|
|
+ "boot_files": []
|
|
+ }
|
|
},
|
|
"powerkvm": {
|
|
"2.1": {
|
|
@@ -2815,7 +3329,7 @@
|
|
"boot_files": [],
|
|
"boot_loaders": {
|
|
"ppc64": [
|
|
- "pxelinux"
|
|
+ "pxe"
|
|
]
|
|
}
|
|
}
|
|
|
|
From e60691af699a1bb2045fedf4c74fc4deb107cd7c Mon Sep 17 00:00:00 2001
|
|
From: Xavier Bachelot <xavier@bachelot.org>
|
|
Date: Tue, 18 Jan 2022 19:11:31 +0100
|
|
Subject: [PATCH 3/8] Add support for older anaconda (tftpgen)
|
|
|
|
---
|
|
cobbler/tftpgen.py | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cobbler/tftpgen.py b/cobbler/tftpgen.py
|
|
index 3e2da2124..d8aa91d2f 100644
|
|
--- a/cobbler/tftpgen.py
|
|
+++ b/cobbler/tftpgen.py
|
|
@@ -730,8 +730,10 @@ def build_kernel_options(self, system, profile, distro, image, arch: str, autoin
|
|
|
|
if distro.breed is None or distro.breed == "redhat":
|
|
|
|
- append_line += " kssendmac"
|
|
- append_line = "%s inst.ks=%s" % (append_line, autoinstall_path)
|
|
+ if distro.os_version in ["rhel4", "rhel5", "rhel6", "fedora16"]:
|
|
+ append_line += " kssendmac ks=%s" % autoinstall_path
|
|
+ else:
|
|
+ append_line += " inst.ks.sendmac inst.ks=%s" % autoinstall_path
|
|
gpxe = blended["enable_gpxe"]
|
|
if gpxe:
|
|
append_line = append_line.replace('ksdevice=bootif', 'ksdevice=${net0/mac}')
|
|
|
|
From 365a9d6b1c33f14a1a390a1070d5d822c9db7ce5 Mon Sep 17 00:00:00 2001
|
|
From: Xavier Bachelot <xavier@bachelot.org>
|
|
Date: Tue, 18 Jan 2022 19:19:26 +0100
|
|
Subject: [PATCH 4/8] Add support for older anaconda (buildiso)
|
|
|
|
---
|
|
cobbler/actions/buildiso.py | 15 ++++++++++++---
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/cobbler/actions/buildiso.py b/cobbler/actions/buildiso.py
|
|
index 9b204aabf..31772c067 100644
|
|
--- a/cobbler/actions/buildiso.py
|
|
+++ b/cobbler/actions/buildiso.py
|
|
@@ -223,7 +223,10 @@ def generate_netboot_iso(self, imagesdir, isolinuxdir, profiles=None, systems=No
|
|
if dist.breed == "redhat":
|
|
if "proxy" in data and data["proxy"] != "":
|
|
append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"])
|
|
- append_line += " inst.ks=%s" % data["autoinstall"]
|
|
+ if dist.os_version in ["rhel4", "rhel5", "rhel6", "fedora16"]:
|
|
+ append_line += " ks=%s" % self.data["autoinstall"]
|
|
+ else:
|
|
+ append_line += " inst.ks=%s" % self.data["autoinstall"]
|
|
|
|
if dist.breed in ["ubuntu", "debian"]:
|
|
append_line += " auto-install/enable=true url=%s" % data["autoinstall"]
|
|
@@ -273,7 +276,10 @@ def generate_netboot_iso(self, imagesdir, isolinuxdir, profiles=None, systems=No
|
|
if dist.breed == "redhat":
|
|
if "proxy" in data and data["proxy"] != "":
|
|
append_line += " proxy=%s http_proxy=%s" % (data["proxy"], data["proxy"])
|
|
- append_line += " inst.ks=%s" % data["autoinstall"]
|
|
+ if os_version in ["rhel4", "rhel5", "rhel6", "fedora16"]:
|
|
+ append_line += " ks=%s" % self.data["autoinstall"]
|
|
+ else:
|
|
+ append_line += " inst.ks=%s" % self.data["autoinstall"]
|
|
|
|
if dist.breed in ["ubuntu", "debian"]:
|
|
append_line += " auto-install/enable=true url=%s netcfg/disable_autoconfig=true" % data["autoinstall"]
|
|
@@ -540,7 +546,10 @@ def generate_standalone_iso(self, imagesdir, isolinuxdir, distname, filesource,
|
|
|
|
append_line = " append initrd=%s" % os.path.basename(distro.initrd)
|
|
if distro.breed == "redhat":
|
|
- append_line += " inst.ks=cdrom:/isolinux/%s.cfg" % descendant.name
|
|
+ if distro.os_version in ["rhel4", "rhel5", "rhel6", "fedora16"]:
|
|
+ append_line += " ks=cdrom:/isolinux/%s.cfg" % descendant.name
|
|
+ else:
|
|
+ append_line += " inst.ks=cdrom:/isolinux/%s.cfg" % descendant.name
|
|
if distro.breed == "suse":
|
|
append_line += " autoyast=file:///isolinux/%s.cfg install=cdrom:///" % descendant.name
|
|
if "install" in data["kernel_options"]:
|
|
|