From 2841d6ed696907317055a5512f45ea797bd17bf1 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 26 Oct 2023 06:43:28 +0800 Subject: [PATCH] fix: support rocky linux guestfs --- pkg/hostman/guestfs/fsdriver/drivers.go | 3 +- pkg/hostman/guestfs/fsdriver/rocky.go | 74 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 pkg/hostman/guestfs/fsdriver/rocky.go diff --git a/pkg/hostman/guestfs/fsdriver/drivers.go b/pkg/hostman/guestfs/fsdriver/drivers.go index a3e5246a476..bbca390b14a 100644 --- a/pkg/hostman/guestfs/fsdriver/drivers.go +++ b/pkg/hostman/guestfs/fsdriver/drivers.go @@ -43,7 +43,8 @@ func Init(initPrivatePrefixes []string, cloudrootDir string) error { linuxFsDrivers := []newRootFsDriverFunc{ NewFangdeRootFs, NewUnionOSRootFs, - NewAnolisRootFs, NewGalaxyKylinRootFs, NewNeoKylinRootFs, + NewAnolisRootFs, NewRockyRootFs, + NewGalaxyKylinRootFs, NewNeoKylinRootFs, NewFangdeDeskRootfs, NewUKylinRootfs, NewCentosRootFs, NewFedoraRootFs, NewRhelRootFs, diff --git a/pkg/hostman/guestfs/fsdriver/rocky.go b/pkg/hostman/guestfs/fsdriver/rocky.go new file mode 100644 index 00000000000..83be1951fb7 --- /dev/null +++ b/pkg/hostman/guestfs/fsdriver/rocky.go @@ -0,0 +1,74 @@ +// Copyright 2019 Yunion +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package fsdriver + +import ( + "strings" + + "yunion.io/x/jsonutils" + + "yunion.io/x/onecloud/pkg/cloudcommon/types" + deployapi "yunion.io/x/onecloud/pkg/hostman/hostdeployer/apis" +) + +type SRockyRootFs struct { + *sRedhatLikeRootFs +} + +func NewRockyRootFs(part IDiskPartition) IRootFsDriver { + return &SRockyRootFs{sRedhatLikeRootFs: newRedhatLikeRootFs(part)} +} + +func (d *SRockyRootFs) GetName() string { + return "Rocky" +} + +func (d *SRockyRootFs) String() string { + return "RockyRootFs" +} + +func (d *SRockyRootFs) RootSignatures() []string { + sig := d.sLinuxRootFs.RootSignatures() + return append([]string{"/etc/sysconfig/network", "/etc/rocky-release"}, sig...) +} + +func (d *SRockyRootFs) GetReleaseInfo(rootFs IDiskPartition) *deployapi.ReleaseInfo { + rel, _ := rootFs.FileGetContents("/etc/rocky-release", false) + var version string + if len(rel) > 0 { + dat := strings.Split(string(rel), " ") + if len(dat) > 3 { + version = dat[3] + } + } + return deployapi.NewReleaseInfo(d.GetName(), version, d.GetArch(rootFs)) +} + +func (d *SRockyRootFs) DeployNetworkingScripts(rootFs IDiskPartition, nics []*types.SServerNic) error { + relInfo := d.GetReleaseInfo(rootFs) + if err := d.sRedhatLikeRootFs.deployNetworkingScripts(rootFs, nics, relInfo); err != nil { + return err + } + return nil +} + +func (c *SRockyRootFs) EnableSerialConsole(rootFs IDiskPartition, sysInfo *jsonutils.JSONDict) error { + return c.enableSerialConsoleSystemd(rootFs) +} + +func (c *SRockyRootFs) DisableSerialConsole(rootFs IDiskPartition) error { + c.disableSerialConsoleSystemd(rootFs) + return nil +}