From 1b0e227d8bac215ea4e8a7e9d8c5a1ea35070cff Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 13 Oct 2024 21:47:44 +0300 Subject: [PATCH] Fix typo --- SOURCES/0001-Added-MSVSphere-support.patch | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch index cdf4d0a..746f72f 100644 --- a/SOURCES/0001-Added-MSVSphere-support.patch +++ b/SOURCES/0001-Added-MSVSphere-support.patch @@ -1,4 +1,4 @@ -From 681a15eadcf33d1850856c0224242a1956c9fe70 Mon Sep 17 00:00:00 2001 +From 1c161f5ae8b53c804d85f7184a6d7691356cb8da Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 13 Oct 2024 21:32:45 +0300 Subject: [PATCH] Added MSVSphere support @@ -6,16 +6,16 @@ Subject: [PATCH] Added MSVSphere support --- cmd/osbuild-composer/config_test.go | 6 ++++++ cmd/osbuild-composer/testdata/test.toml | 2 ++ - repositories/msvsphere-810.json | 16 +++++++++++++++ - repositories/msvsphere-89.json | 16 +++++++++++++++ - repositories/msvsphere-93.json | 16 +++++++++++++++ - repositories/msvsphere-94.json | 16 +++++++++++++++ - repositories/msvsphere-95.json | 16 +++++++++++++++ - .../images/pkg/distro/rhel/distribution.go | 20 +++++++++++++++++++ + repositories/msvsphere-810.json | 16 ++++++++++++++++ + repositories/msvsphere-89.json | 16 ++++++++++++++++ + repositories/msvsphere-93.json | 16 ++++++++++++++++ + repositories/msvsphere-94.json | 16 ++++++++++++++++ + repositories/msvsphere-95.json | 16 ++++++++++++++++ + .../images/pkg/distro/rhel/distribution.go | 19 +++++++++++++++++++ .../images/pkg/distro/rhel/imagetype.go | 4 ++++ - .../images/pkg/distro/rhel/rhel8/distro.go | 12 +++++++---- - .../images/pkg/distro/rhel/rhel9/distro.go | 12 +++++++---- - 11 files changed, 128 insertions(+), 8 deletions(-) + .../images/pkg/distro/rhel/rhel8/distro.go | 12 ++++++++---- + .../images/pkg/distro/rhel/rhel9/distro.go | 12 ++++++++---- + 11 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 repositories/msvsphere-810.json create mode 100644 repositories/msvsphere-89.json create mode 100644 repositories/msvsphere-93.json @@ -174,7 +174,7 @@ index 0000000..5be6c20 + ] +} diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go -index 849ca43..03aca11 100644 +index 849ca43..b7cbd51 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go @@ -97,6 +97,10 @@ func (d *Distribution) IsRHEL() bool { @@ -188,7 +188,7 @@ index 849ca43..03aca11 100644 func (d *Distribution) GetDefaultImageConfig() *distro.ImageConfig { if d.DefaultImageConfig == nil { return nil -@@ -138,6 +142,22 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { +@@ -138,6 +142,21 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { ostreeRefTmpl: fmt.Sprintf("centos/%d/%%s/edge", major), runner: &runner.CentOS{Version: uint64(major)}, } @@ -207,7 +207,6 @@ index 849ca43..03aca11 100644 + ostreeRefTmpl: fmt.Sprintf("msvsphere/%d/%%s/edge", major), + runner: &runner.RHEL{Major: uint64(major), Minor: uint64(minor)}, + } -+ } default: return nil, fmt.Errorf("unknown distro name: %s", name) }