rpms
/
one-context
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to v6.6.1, redebranded for MSVSphere

Browse Source
i9e changed/i9/one-context-6.6.1-1.el9.inferit
Alexey Lyubimov 2 years ago
parent d31c698832
commit 10fb4f5de7
5 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
.addon-context-linux.metadata
Unescape View File

@ -1 +1 @@
78b762c1895faa659a4f25a903778ce4a5c3d086 SOURCES/addon-context-linux-6.6.0.tar.gz
d2e70b6b500ab98144ca6d7881410e04e34e56a3 SOURCES/addon-context-linux-6.6.1.tar.gz

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/addon-context-linux-6.6.0.tar.gz
SOURCES/addon-context-linux-6.6.1.tar.gz

2
SOURCES/addon-context-linux-generate.patch → SOURCES/addon-context-linux-6.6.1-generate.patch
Unescape View File

@ -1,5 +1,5 @@
diff --git a/generate.sh b/generate.sh
index c9e3b82..413aec2 100755
index d32d8af..f84a622 100755
--- a/generate.sh
+++ b/generate.sh
@@ -30,11 +30,11 @@ set +e

47
SOURCES/addon-context-linux-msvsphere.patch → SOURCES/addon-context-linux-6.6.1-msvsphere.patch
Unescape View File

@ -1,20 +1,14 @@
commit 773e74d25eacaeb123594c5144d5597fdae29cf7
Author: Eugene Zamriy <eugene@zamriy.info>
Date: Wed Apr 5 20:36:32 2023 +0300
Adds MSVSphere distribution support
diff --git a/README.md b/README.md
index ff1b5f5..5f59b3e 100644
index 9631406..badf644 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ List of tested platforms only:
| Devuan | 2 |
| Fedora | 34, 35 |
| Devuan | 3,4 |
| Fedora | 36, 37 |
| FreeBSD | 12, 13 |
+| MSVSphere | 8, 9 |
| openSUSE | 15 |
| Oracle Linux | 7, 8 |
| Oracle Linux | 7, 8, 9 |
| Red Hat Enterprise Linux | 7, 8, 9 |
@@ -77,20 +78,20 @@ Following IPv6 configuration methods are supported via NIC attribute `IP6_METHOD
@ -22,40 +16,40 @@ index ff1b5f5..5f59b3e 100644
-| Platform | Network Type (`NETCFG_TYPE`) |
-|---------------------------------------------------------------|-------------------------------------------|
-| Alpine Linux 3.14+ | `interfaces` |
-| Alpine Linux 3.15+ | `interfaces` |
-| ALT Linux p10, Sisyphus | `networkd`, `nm` |
-| Amazon Linux 2 | `scripts` |
-| Debian 10+ | `interfaces`, `netplan`, `nm`, `networkd` |
-| Devuan 2 | `interfaces` |
-| Fedora 34+ | `scripts`, `nm`, `networkd` |
-| Devuan 3 | `interfaces` |
-| Fedora 36+ | `scripts`, `nm`, `networkd` |
-| FreeBSD 12+ | `bsd` |
-| openSUSE 15 | `scripts` |
-| RHEL-like 7 (CentOS, Oracle Linux) | `scripts` |
-| RHEL-like 8 (CentOS, Oracle/Rocky/AlmaLinux) | `scripts`, `nm`, `networkd` |
-| RHEL-like 9 (CentOS Stream 9, Oracle/Rocky/AlmaLinux) | `nm`, `networkd` |
-| Ubuntu 18.04, 20.04, 21.10, 22.04 | `interfaces`, `netplan`, `nm`, `networkd` |
-| Ubuntu 18.04, 20.04, 22.04 | `interfaces`, `netplan`, `nm`, `networkd` |
+| Platform | Network Type (`NETCFG_TYPE`) |
+|-----------------------------------------------------------------|-------------------------------------------|
+| Alpine Linux 3.14+ | `interfaces` |
+| Alpine Linux 3.15+ | `interfaces` |
+| ALT Linux p10, Sisyphus | `networkd`, `nm` |
+| Amazon Linux 2 | `scripts` |
+| Debian 10+ | `interfaces`, `netplan`, `nm`, `networkd` |
+| Devuan 2 | `interfaces` |
+| Fedora 34+ | `scripts`, `nm`, `networkd` |
+| Devuan 3 | `interfaces` |
+| Fedora 36+ | `scripts`, `nm`, `networkd` |
+| FreeBSD 12+ | `bsd` |
+| openSUSE 15 | `scripts` |
+| RHEL-like 7 (CentOS, Oracle Linux) | `scripts` |
+| RHEL-like 8 (CentOS, Oracle/Rocky/AlmaLinux/MSVSphere) | `scripts`, `nm`, `networkd` |
+| RHEL-like 9 (CentOS Stream 9, Oracle/Rocky/AlmaLinux/MSVSphere) | `nm`, `networkd` |
+| Ubuntu 18.04, 20.04, 21.10, 22.04 | `interfaces`, `netplan`, `nm`, `networkd` |
+| Ubuntu 18.04, 20.04, 22.04 | `interfaces`, `netplan`, `nm`, `networkd` |
(other than listed platforms are not supported for using `NETCFG_TYPE` nor `METHOD`/`IP6_METHOD`!):
diff --git a/src/etc/one-context.d/loc-10-network b/src/etc/one-context.d/loc-10-network
index 600102b..b37f7e5 100755
index 3638d4c..d95eaa2 100755
--- a/src/etc/one-context.d/loc-10-network
+++ b/src/etc/one-context.d/loc-10-network
@@ -39,7 +39,7 @@ if [ -z "${NETCFG_TYPE}" ] ; then
@@ -40,7 +40,7 @@ if [ -z "${NETCFG_TYPE}" ] ; then
debian|devuan|ubuntu)
NETCFG_TYPE='interfaces netplan nm networkd'
;;
@ -64,6 +58,19 @@ index 600102b..b37f7e5 100755
NETCFG_TYPE='scripts nm networkd'
;;
opensuse*|sles|sled)
diff --git a/src/etc/one-context.d/loc-10-network.d/functions b/src/etc/one-context.d/loc-10-network.d/functions
index 2b3484f..8a5fa08 100644
--- a/src/etc/one-context.d/loc-10-network.d/functions
+++ b/src/etc/one-context.d/loc-10-network.d/functions
@@ -208,7 +208,7 @@ detect_os()
case "$ID" in
# supported distros
- alpine|altlinux|debian|devuan|ubuntu|fedora|centos|rhel|almalinux|ol|rocky|opensuse*|sles|sled|amzn|freebsd)
+ alpine|altlinux|debian|devuan|ubuntu|fedora|centos|rhel|almalinux|ol|rocky|opensuse*|sles|sled|amzn|freebsd|msvsphere)
LINUX_ID=$ID
;;
*)
diff --git a/src/usr/sbin/onesysprep b/src/usr/sbin/onesysprep
index f13f66f..2a77d9b 100755
--- a/src/usr/sbin/onesysprep

10
SPECS/one-context.spec
Unescape View File

@ -5,7 +5,7 @@
%define _binary_payload w9.gzdio
Name: one-context
Version: 6.6.0
Version: 6.6.1
Release: 1%{?dist}.inferit
Summary: OpenNebula Contextualization Package
AutoReqProv: no
@ -15,8 +15,8 @@ Vendor: MSVSphere
URL: http://opennebula.org
Packager: MSVSphere <packager@msvsphere.ru>
Source: https://github.com/OpenNebula/%{name}/archive/refs/tags/addon-context-linux-%{version}.tar.gz
Patch1: addon-context-linux-msvsphere.patch
Patch2: addon-context-linux-generate.patch
Patch1: addon-context-linux-6.6.1-msvsphere.patch
Patch2: addon-context-linux-6.6.1-generate.patch
Requires: util-linux
Requires: bash
@ -361,6 +361,10 @@ fi
/usr/sbin/*
%changelog
* Tue Jun 27 2023 Alexey Lyubimov <a.lyubimov@msvsphere.ru> - 6.6.1-1.inferit
- Update to v6.6.1
- Redebranded for MSVSphere
* Fri Apr 28 2023 Alexey Lyubimov <a.lyubimov@msvsphere.ru> - 6.6.0-1.inferit
- De-branded for MSVSphere
- Initial built for MSVSphere 9.1

Write Preview
Loading…
Cancel
Save