Distro: move rhel7 -> rhel/rhel7

Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Apr 11, 2024 · 1b06e0c · 1b06e0c
1 parent 1c79936
commit 1b06e0c
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 3 deletions.
diff --git a/pkg/distro/rhel7/azure.go → pkg/distro/rhel/rhel7/azure.go b/pkg/distro/rhel7/azure.go → pkg/distro/rhel/rhel7/azure.go
diff --git a/pkg/distro/rhel7/distro.go → pkg/distro/rhel/rhel7/distro.go b/pkg/distro/rhel7/distro.go → pkg/distro/rhel/rhel7/distro.go
diff --git a/pkg/distro/rhel7/distro_test.go → pkg/distro/rhel/rhel7/distro_test.go b/pkg/distro/rhel7/distro_test.go → pkg/distro/rhel/rhel7/distro_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/osbuild/images/pkg/blueprint"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/distro_test_common"
-	"github.com/osbuild/images/pkg/distro/rhel7"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 )
 
 type rhelFamilyDistro struct {

diff --git a/pkg/distro/rhel7/images.go → pkg/distro/rhel/rhel7/images.go b/pkg/distro/rhel7/images.go → pkg/distro/rhel/rhel7/images.go
diff --git a/pkg/distro/rhel7/imagetype.go → pkg/distro/rhel/rhel7/imagetype.go b/pkg/distro/rhel7/imagetype.go → pkg/distro/rhel/rhel7/imagetype.go
diff --git a/pkg/distro/rhel7/package_sets.go → pkg/distro/rhel/rhel7/package_sets.go b/pkg/distro/rhel7/package_sets.go → pkg/distro/rhel/rhel7/package_sets.go
diff --git a/pkg/distro/rhel7/partition_tables.go → pkg/distro/rhel/rhel7/partition_tables.go b/pkg/distro/rhel7/partition_tables.go → pkg/distro/rhel/rhel7/partition_tables.go
diff --git a/pkg/distro/rhel7/qcow2.go → pkg/distro/rhel/rhel7/qcow2.go b/pkg/distro/rhel7/qcow2.go → pkg/distro/rhel/rhel7/qcow2.go
diff --git a/pkg/distrofactory/distrofactory.go b/pkg/distrofactory/distrofactory.go
@@ -7,9 +7,9 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel10"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel8"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
-	"github.com/osbuild/images/pkg/distro/rhel7"
 	"github.com/osbuild/images/pkg/distro/test_distro"
 )
 

diff --git a/pkg/distroidparser/idparser.go b/pkg/distroidparser/idparser.go
@@ -4,9 +4,9 @@ import (
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/distro/fedora"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel10"
+	"github.com/osbuild/images/pkg/distro/rhel/rhel7"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel8"
 	"github.com/osbuild/images/pkg/distro/rhel/rhel9"
-	"github.com/osbuild/images/pkg/distro/rhel7"
 )
 
 var DefaultParser = NewDefaultParser()