87 lines
2.6 KiB
Diff
87 lines
2.6 KiB
Diff
|
From dd381efe588297b6f450665d374fcaafab0206e5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: xuezhixin <xuezhixin@uniontech.com>
|
||
|
|
Date: Fri, 10 Nov 2023 11:07:17 +0800
|
||
|
|
Subject: [PATCH] =?UTF-8?q?json=E5=92=8Clist=E6=A0=BC=E5=BC=8F=E4=BA=92?=
|
||
|
|
=?UTF-8?q?=E6=8D=A2?=
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
---
|
||
|
|
sysmig_agent/share.py | 35 ++++++++++++++++++++++++++---------
|
||
|
|
1 file changed, 26 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sysmig_agent/share.py b/sysmig_agent/share.py
|
||
|
|
index 68fcfa0..1a12a7e 100644
|
||
|
|
--- a/sysmig_agent/share.py
|
||
|
|
+++ b/sysmig_agent/share.py
|
||
|
|
@@ -1,14 +1,17 @@
|
||
|
|
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
|
||
|
|
# SPDX-License-Identifier: MulanPubL-2.0-or-later
|
||
|
|
|
||
|
|
-import logging
|
||
|
|
import os
|
||
|
|
-import platform
|
||
|
|
+import sys
|
||
|
|
+import json
|
||
|
|
import re
|
||
|
|
-import shutil
|
||
|
|
import subprocess
|
||
|
|
+import shutil
|
||
|
|
import socket
|
||
|
|
-from sysmig_agent.utils import list_to_json
|
||
|
|
+import platform
|
||
|
|
+import logging
|
||
|
|
+
|
||
|
|
+sys.path.append("..")
|
||
|
|
from connect_sql import DBHelper
|
||
|
|
|
||
|
|
def get_local_ip():
|
||
|
|
@@ -192,17 +195,19 @@ def get_disk_info(string):
|
||
|
|
|
||
|
|
|
||
|
|
def add_boot_option():
|
||
|
|
- print("Current system is uefi, add boot option to boot manager.")
|
||
|
|
- subprocess.run('which efibootmgr > /dev/null 2>&1 || dnf install -y efibootmgr', shell=True)
|
||
|
|
+ """
|
||
|
|
+ Current system is uefi, add boot option to boot manager.
|
||
|
|
+ """
|
||
|
|
+ subprocess.run('which efibootmgr > /dev/null 2>&1 || yum install -y efibootmgr', shell=True)
|
||
|
|
disk_name = subprocess.check_output('mount | grep /boot/efi | awk \'{print $1}\'', shell=True)
|
||
|
|
disk_name = str(disk_name, 'utf-8')
|
||
|
|
disk_name = disk_name.split('\n')[0]
|
||
|
|
- dev_name,part_num = get_disk_info(disk_name)
|
||
|
|
+ dev_name, part_num = get_disk_info(disk_name)
|
||
|
|
if dev_name == "" or part_num == "":
|
||
|
|
- print("Parse /boot/efi disk info failed, update boot loader failed.")
|
||
|
|
+ # "Parse /boot/efi disk info failed, update boot loader failed.
|
||
|
|
return
|
||
|
|
|
||
|
|
- cmd=""
|
||
|
|
+ cmd = ""
|
||
|
|
arch = platform.machine()
|
||
|
|
if arch == "x86_64":
|
||
|
|
cmd = 'efibootmgr -c -d ' + dev_name + ' -p ' + part_num + ' -l "/EFI/uos/grubx86.efi" -L "Uniontech OS"'
|
||
|
|
@@ -296,6 +301,18 @@ def title_conf(oldosname):
|
||
|
|
open(fpath, 'w').write(strall.replace(line, title))
|
||
|
|
|
||
|
|
|
||
|
|
+def json_list_to_json(keylist, valuelist):
|
||
|
|
+ res = dict(zip(keylist, valuelist))
|
||
|
|
+ # logdss.info (res)
|
||
|
|
+ return json.dumps(res)
|
||
|
|
+
|
||
|
|
+def list_to_json(keylist, valuelist):
|
||
|
|
+ res = dict(zip(keylist, valuelist))
|
||
|
|
+ res = json.dumps(res)
|
||
|
|
+ # logdss.info (res)
|
||
|
|
+ return json.dumps(res)
|
||
|
|
+
|
||
|
|
+
|
||
|
|
def main_conf(osname):
|
||
|
|
logger = logging.getLogger()
|
||
|
|
logger.setLevel(logging.INFO)
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|