opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: support PhoenixOS guest

Browse Source
This commit is contained in:
Qiu Jian
2021-10-17 04:19:10 +08:00
parent 674e8340b0
commit b4c6ee7a48
3 changed files with 109 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/fsdriver/android.go
+98 -60
View File
@@ -52,16 +52,92 @@ func BuildPropStr(prop map[string]string) string {
return ret
}
type SAndroidRootFs struct {
type sBaseAndroidRootFs struct {
*sGuestRootFsDriver
rootDir string
distroKey string
versionKey string
}
func (m *sBaseAndroidRootFs) IsFsCaseInsensitive() bool {
return false
}
func (m *sBaseAndroidRootFs) RootSignatures() []string {
return []string{
m.rootDir, "/grub",
}
}
func (m *sBaseAndroidRootFs) GetLoginAccount(rootFs IDiskPartition, user string, defaultRootUser bool, windowsDefaultAdminUser bool) (string, error) {
return "", nil
}
func (m *sBaseAndroidRootFs) DeployPublicKey(rootfs IDiskPartition, uname string, pubkeys *deployapi.SSHKeys) error {
return nil
}
func (m *sBaseAndroidRootFs) ChangeUserPasswd(part IDiskPartition, account, gid, publicKey, password string) (string, error) {
return "", nil
}
func (m *sBaseAndroidRootFs) DeployHostname(part IDiskPartition, hostname, domain string) error {
return nil
}
func (m *sBaseAndroidRootFs) DeployHosts(part IDiskPartition, hn, domain string, ips []string) error {
return nil
}
func (m *sBaseAndroidRootFs) GetOs() string {
return "Android"
}
func (m *sBaseAndroidRootFs) GetReleaseInfo(IDiskPartition) *deployapi.ReleaseInfo {
spath := fmt.Sprintf("/%s/system/build.prop", m.rootDir)
lines, _ := m.rootFs.FileGetContents(spath, false)
prop := ParsePropStr(string(lines))
distro, _ := prop[m.distroKey]
version, _ := prop[m.versionKey]
arch, _ := prop["ro.product.cpu.abi"]
return &deployapi.ReleaseInfo{
Distro: distro,
Version: version,
Arch: arch,
}
}
func (m *sBaseAndroidRootFs) PrepareFsForTemplate(IDiskPartition) error {
return nil
}
func (m *sBaseAndroidRootFs) DeployNetworkingScripts(rootfs IDiskPartition, nics []*types.SServerNic) error {
return nil
}
func (m *sBaseAndroidRootFs) CommitChanges(part IDiskPartition) error {
spath := fmt.Sprintf("/%s/system/build.prop", m.rootDir)
lines, _ := m.rootFs.FileGetContents(spath, false)
prop := ParsePropStr(string(lines))
prop["ro.setupwizard.mode"] = "DISABLED"
prop["persist.sys.timezone"] = "Asia/Shanghai"
return m.rootFs.FilePutContents(spath, BuildPropStr(prop), false, false)
}
type SAndroidRootFs struct {
*sBaseAndroidRootFs
}
func NewAndroidRootFs(part IDiskPartition) IRootFsDriver {
return &SAndroidRootFs{sGuestRootFsDriver: newGuestRootFsDriver(part)}
}
func (m *SAndroidRootFs) IsFsCaseInsensitive() bool {
return false
return &SAndroidRootFs{
&sBaseAndroidRootFs{
sGuestRootFsDriver: newGuestRootFsDriver(part),
rootDir: "android-*",
distroKey: "ro.product.model",
versionKey: "ro.build.version.release",
},
}
}
func (m *SAndroidRootFs) GetName() string {
@@ -72,63 +148,25 @@ func (m *SAndroidRootFs) String() string {
return "AndroidRootFs"
}
func (m *SAndroidRootFs) RootSignatures() []string {
return []string{
"/android-*", "/grub",
type SPhoenixOSRootFs struct {
*sBaseAndroidRootFs
}
func NewPhoenixOSRootFs(part IDiskPartition) IRootFsDriver {
return &SPhoenixOSRootFs{
&sBaseAndroidRootFs{
sGuestRootFsDriver: newGuestRootFsDriver(part),
rootDir: "PhoenixOS",
distroKey: "ro.phoenix.os.branch",
versionKey: "ro.phoenix.version.codename",
},
}
}
func (m *SAndroidRootFs) GetLoginAccount(rootFs IDiskPartition, user string, defaultRootUser bool, windowsDefaultAdminUser bool) (string, error) {
return "", nil
func (m *SPhoenixOSRootFs) GetName() string {
return "PhoenixOS"
}
func (m *SAndroidRootFs) DeployPublicKey(rootfs IDiskPartition, uname string, pubkeys *deployapi.SSHKeys) error {
return nil
}
func (m *SAndroidRootFs) ChangeUserPasswd(part IDiskPartition, account, gid, publicKey, password string) (string, error) {
return "", nil
}
func (m *SAndroidRootFs) DeployHostname(part IDiskPartition, hostname, domain string) error {
return nil
}
func (m *SAndroidRootFs) DeployHosts(part IDiskPartition, hn, domain string, ips []string) error {
return nil
}
func (m *SAndroidRootFs) GetOs() string {
return "Android"
}
func (m *SAndroidRootFs) GetReleaseInfo(IDiskPartition) *deployapi.ReleaseInfo {
spath := "/android-*/system/build.prop"
lines, _ := m.rootFs.FileGetContents(spath, false)
prop := ParsePropStr(string(lines))
distro, _ := prop["ro.product.model"]
version, _ := prop["ro.build.version.release"]
arch, _ := prop["ro.product.cpu.abi"]
return &deployapi.ReleaseInfo{
Distro: distro,
Version: version,
Arch: arch,
}
}
func (m *SAndroidRootFs) PrepareFsForTemplate(IDiskPartition) error {
return nil
}
func (m *SAndroidRootFs) DeployNetworkingScripts(rootfs IDiskPartition, nics []*types.SServerNic) error {
return nil
}
func (m *SAndroidRootFs) CommitChanges(part IDiskPartition) error {
spath := "/android-*/system/build.prop"
lines, _ := m.rootFs.FileGetContents(spath, false)
prop := ParsePropStr(string(lines))
prop["ro.setupwizard.mode"] = "DISABLED"
prop["persist.sys.timezone"] = "Asia/Shanghai"
return m.rootFs.FilePutContents(spath, BuildPropStr(prop), false, false)
func (m *SPhoenixOSRootFs) String() string {
return "PhoenixOSRootFs"
}
pkg/hostman/guestfs/fsdriver/drivers.go
+8 -1
View File
@@ -51,7 +51,14 @@ func Init(initPrivatePrefixes []string, cloudrootDir string) error {
rootfsDrivers = append(rootfsDrivers, NewMacOSRootFs)
rootfsDrivers = append(rootfsDrivers, NewEsxiRootFs)
rootfsDrivers = append(rootfsDrivers, NewWindowsRootFs)
rootfsDrivers = append(rootfsDrivers, NewAndroidRootFs)
androidFsDrivers := []newRootFsDriverFunc{
NewAndroidRootFs,
NewPhoenixOSRootFs,
}
rootfsDrivers = append(rootfsDrivers, androidFsDrivers...)
cpuArch, err := procutils.NewCommand("uname", "-m").Output()
if err != nil {
return errors.Wrap(err, "get cpu architecture")
pkg/hostman/guestman/qemu-kvmhelper.go
+3 -4
View File
@@ -558,10 +558,9 @@ function nic_mtu() {
!s.disableUsbKbd() {
cmd += " -device usb-kbd"
}
// # if osname == self.OS_NAME_ANDROID:
// # cmd += " -device usb-mouse"
// # else:
if !s.isOldWindows() {
if osname == OS_NAME_ANDROID {
cmd += " -device usb-mouse"
} else if !s.isOldWindows() {
cmd += " -device usb-tablet"
}