diff --git a/conf/aarch64/custom/cfg_openEuler/cmd.conf b/conf/aarch64/custom/cfg_openEuler/cmd.conf
index 3606b6a6388008b9bfe585a26ab6eaa44e070338..68ccd32120f0e7d043ee048c2272e65950244b07 100644
--- a/conf/aarch64/custom/cfg_openEuler/cmd.conf
+++ b/conf/aarch64/custom/cfg_openEuler/cmd.conf
@@ -27,6 +27,7 @@
+
@@ -37,83 +38,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121,9 +234,6 @@
-
-
-
@@ -132,93 +242,317 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,70 +561,269 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -298,41 +831,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -349,142 +975,594 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -492,22 +1570,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -515,96 +1610,236 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,410 +1856,27 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/conf/aarch64/custom/cfg_openEuler/rpm.conf b/conf/aarch64/custom/cfg_openEuler/rpm.conf
index 6af31c487668ebd897027fe5bedc25ecefc6d520..afda5abdf41baa5b56e480db836fbd19adfe91a8 100644
--- a/conf/aarch64/custom/cfg_openEuler/rpm.conf
+++ b/conf/aarch64/custom/cfg_openEuler/rpm.conf
@@ -26,8 +26,1734 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -44,15 +1770,16 @@
-
-
+
+
+
@@ -63,11 +1790,13 @@
-
+
-
+
+
+
@@ -80,23 +1809,43 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,19 +1859,24 @@
-
-
+
+
+
+
+
+
+
@@ -133,53 +1887,26 @@
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/conf/aarch64/kiwi/minios/cfg_minios/cmd.conf b/conf/aarch64/kiwi/minios/cfg_minios/cmd.conf
index 2db8516a7d11f568b81cc080c418245a15ce8fe4..b706cee03ca2621a3a1d2c82574c7e7de6b7ff9d 100644
--- a/conf/aarch64/kiwi/minios/cfg_minios/cmd.conf
+++ b/conf/aarch64/kiwi/minios/cfg_minios/cmd.conf
@@ -85,6 +85,7 @@
+
diff --git a/conf/x86_64/custom/cfg_openEuler/cmd.conf b/conf/x86_64/custom/cfg_openEuler/cmd.conf
index 3606b6a6388008b9bfe585a26ab6eaa44e070338..52131235e4452e04d67075011c7f54489438afd6 100644
--- a/conf/x86_64/custom/cfg_openEuler/cmd.conf
+++ b/conf/x86_64/custom/cfg_openEuler/cmd.conf
@@ -27,6 +27,7 @@
+
@@ -37,83 +38,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121,9 +226,6 @@
-
-
-
@@ -132,93 +234,290 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,70 +526,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -298,41 +725,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -349,142 +863,571 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -492,22 +1435,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -515,96 +1474,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,410 +1702,27 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/x86_64/custom/cfg_openEuler/rpm.conf b/conf/x86_64/custom/cfg_openEuler/rpm.conf
index 78f165d56207f8092a1b6b63c5ba73ae39978b7e..c5db01f40bec96ecb44b1179f9ea67eeac6e0c24 100644
--- a/conf/x86_64/custom/cfg_openEuler/rpm.conf
+++ b/conf/x86_64/custom/cfg_openEuler/rpm.conf
@@ -21,8 +21,6 @@
-
-
@@ -31,11 +29,14 @@
+
+
+
@@ -44,9 +45,21 @@
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -56,17 +69,20 @@
-
+
+
-
+
+
+
@@ -75,7 +91,12 @@
+
+
+
+
+
@@ -87,6 +108,7 @@
+
@@ -94,7 +116,10 @@
+
+
+
@@ -110,11 +135,14 @@
+
+
-
+
+
@@ -122,6 +150,7 @@
+
@@ -157,21 +186,24 @@
-
+
+
+
+
@@ -180,7 +212,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -193,13 +240,21 @@
+
+
+
+
+
+
+
+
@@ -209,18 +264,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -229,49 +302,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -286,15 +427,20 @@
+
+
+
+
+
-
+
@@ -319,6 +465,7 @@
+
@@ -333,12 +480,14 @@
+
+
@@ -381,19 +530,20 @@
-
+
+
-
+
@@ -411,15 +561,25 @@
+
+
+
+
+
+
+
+
+
+
@@ -435,11 +595,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -447,26 +649,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -479,14 +736,507 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -503,38 +1253,83 @@
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -543,15 +1338,20 @@
+
+
+
+
+
@@ -560,19 +1360,28 @@
+
+
+
+
+
+
+
+
+
+
-
@@ -580,65 +1389,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -648,6 +1502,7 @@
+
@@ -657,6 +1512,7 @@
+
@@ -674,22 +1530,54 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -700,19 +1588,37 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -725,14 +1631,22 @@
-
+
+
+
+
+
+
-
+
+
+
+
@@ -759,6 +1673,8 @@
+
+
@@ -774,6 +1690,7 @@
+
@@ -782,6 +1699,7 @@
+
@@ -803,6 +1721,8 @@
+
+
@@ -816,9 +1736,12 @@
+
+
+
-
+
@@ -826,35 +1749,49 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
+
@@ -865,7 +1802,9 @@
+
+
@@ -894,6 +1833,7 @@
+
@@ -909,6 +1849,7 @@
+
@@ -924,11 +1865,14 @@
+
+
+
@@ -943,6 +1887,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -953,23 +1907,37 @@
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -980,11 +1948,12 @@
-
+
+
@@ -998,10 +1967,12 @@
+
+
@@ -1011,6 +1982,8 @@
+
+
@@ -1020,21 +1993,25 @@
+
-
+
-
-
+
+
+
+
+
@@ -1043,12 +2020,13 @@
-
+
+
@@ -1069,10 +2047,10 @@
+
-
@@ -1084,18 +2062,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1103,29 +2095,32 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
@@ -1137,36 +2132,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
-
-
-
-
-
+
@@ -1176,8 +2180,15 @@
+
+
+
+
+
+
+
@@ -1185,16 +2196,26 @@
+
+
+
+
+
+
+
+
+
+
@@ -1202,20 +2223,20 @@
+
+
+
+
+
-
-
-
-
-
@@ -1224,18 +2245,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1247,44 +2281,54 @@
-
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
@@ -1296,35 +2340,53 @@
+
+
+
-
+
+
+
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1361,6 +2423,7 @@
+
@@ -1395,8 +2458,13 @@
+
+
+
+
+
@@ -1404,15 +2472,21 @@
+
+
+
+
+
+
-
+
@@ -1427,14 +2501,17 @@
+
+
+
@@ -1444,17 +2521,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1466,9 +2742,11 @@
+
-
+
+
@@ -1485,7 +2763,6 @@
-
@@ -1493,6 +2770,7 @@
+
@@ -1503,10 +2781,14 @@
+
+
-
+
+
+
@@ -1518,24 +2800,25 @@
-
+
+
+
-
+
-
@@ -1549,61 +2832,47 @@
-
-
+
+
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/x86_64/kiwi/eulerkiwi/minios.conf b/conf/x86_64/kiwi/eulerkiwi/minios.conf
index cef2a3d714ff08ba604f0a381fdb4026b58f12ba..ec4526b72c09ba68f4ae145664fd9f76bdf15cce 100644
--- a/conf/x86_64/kiwi/eulerkiwi/minios.conf
+++ b/conf/x86_64/kiwi/eulerkiwi/minios.conf
@@ -1,4 +1,4 @@
# product cut_conf initrd default
-openEuler kiwi/minios/cfg_minios_efi yes
+openEuler kiwi/minios/cfg_minios yes
test kiwi/minios/cfg_minios yes
diff --git a/conf/x86_64/kiwi/minios/cfg_minios/cmd.conf b/conf/x86_64/kiwi/minios/cfg_minios/cmd.conf
index ae6210ce3750fcbfdc970196b3ed041800a33972..b706cee03ca2621a3a1d2c82574c7e7de6b7ff9d 100644
--- a/conf/x86_64/kiwi/minios/cfg_minios/cmd.conf
+++ b/conf/x86_64/kiwi/minios/cfg_minios/cmd.conf
@@ -85,6 +85,7 @@
+
@@ -265,6 +266,7 @@
+
diff --git a/conf/x86_64/kiwi/minios/cfg_minios/rpm.conf b/conf/x86_64/kiwi/minios/cfg_minios/rpm.conf
index 157100c9a1a4126474b7556b7e54f1fcc9db4a6d..d9bce1b79d06138b128d3f39fc9831de718e0e07 100644
--- a/conf/x86_64/kiwi/minios/cfg_minios/rpm.conf
+++ b/conf/x86_64/kiwi/minios/cfg_minios/rpm.conf
@@ -90,7 +90,7 @@
-
+
@@ -101,6 +101,10 @@
+
+
+
+
@@ -412,14 +416,9 @@
-
-
-
-
-
-
-
-
+
+
+
@@ -436,6 +435,7 @@
+
@@ -447,11 +447,14 @@
+
+
+
diff --git a/conf/x86_64/kiwi/minios/cfg_minios/security_s.conf b/conf/x86_64/kiwi/minios/cfg_minios/security_s.conf
index 7dc13a05d3c74eef7f034a7234fb02fcaf010b19..236f5d2588d98f99441ea0310f45a2d975cf064d 100644
--- a/conf/x86_64/kiwi/minios/cfg_minios/security_s.conf
+++ b/conf/x86_64/kiwi/minios/cfg_minios/security_s.conf
@@ -280,3 +280,6 @@
607@rm -f@/usr/sbin/chpasswd
608@sed -i s/^#[[:space:]]*only_from[[:space:]]*=[[:space:]]*localhost/only_from=localhost/g@/etc/xinetd.conf
+
+# create /usr/lib/grub2 for pxe efi install
+609@ln -s /usr/lib/grub /usr/lib/grub2
diff --git a/conf/x86_64/kiwi/minios/cfg_minios/sys.conf b/conf/x86_64/kiwi/minios/cfg_minios/sys.conf
index 64d32cd3a0e1b31c4a19a4e790c91f00e328a2a5..2d42e8a6221b58061c042dd5e7008c0f7b133e6f 100644
--- a/conf/x86_64/kiwi/minios/cfg_minios/sys.conf
+++ b/conf/x86_64/kiwi/minios/cfg_minios/sys.conf
@@ -1,12 +1,12 @@
-sys_service_enable='boot.udev boot.debugfs boot.ldconfig boot.localnet boot.sysctl syslog network sshd rpcbind irq_balancer'
+sys_service_enable='boot.udev boot.debugfs boot.ldconfig boot.localnet boot.sysctl syslog network sshd rpcbind'
sys_utc='yes'
sys_timezone=''
sys_cut='yes'
sys_usrrpm_cut='no'
sys_hostname='Euler'
-sys_usermodules_autoload=''
+sys_usermodules_autoload='mfd-core intel-lpss-module 8250_dw'
diff --git a/conf/x86_64/kiwi/minios/cfg_minios_efi/usr_file/etc/modules b/conf/x86_64/kiwi/minios/cfg_minios/usr_file/etc/modules
similarity index 100%
rename from conf/x86_64/kiwi/minios/cfg_minios_efi/usr_file/etc/modules
rename to conf/x86_64/kiwi/minios/cfg_minios/usr_file/etc/modules
diff --git a/conf/x86_64/kiwi/minios/cfg_minios_efi/cmd.conf b/conf/x86_64/kiwi/minios/cfg_minios_efi/cmd.conf
deleted file mode 100644
index 2db8516a7d11f568b81cc080c418245a15ce8fe4..0000000000000000000000000000000000000000
--- a/conf/x86_64/kiwi/minios/cfg_minios_efi/cmd.conf
+++ /dev/null
@@ -1,290 +0,0 @@
-
-
-
-
-
-
- default items to keep or delete from the kiwi initrd
-
-
-
- 2.7.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/x86_64/kiwi/minios/cfg_minios_efi/rpm.conf b/conf/x86_64/kiwi/minios/cfg_minios_efi/rpm.conf
deleted file mode 100644
index d9bce1b79d06138b128d3f39fc9831de718e0e07..0000000000000000000000000000000000000000
--- a/conf/x86_64/kiwi/minios/cfg_minios_efi/rpm.conf
+++ /dev/null
@@ -1,511 +0,0 @@
-
-
-
-
-
-
- boot/initrd image used for LiveDVD media
-
-
-
- 2.1.2
- yum
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/x86_64/kiwi/minios/cfg_minios_efi/security_s.conf b/conf/x86_64/kiwi/minios/cfg_minios_efi/security_s.conf
deleted file mode 100644
index 236f5d2588d98f99441ea0310f45a2d975cf064d..0000000000000000000000000000000000000000
--- a/conf/x86_64/kiwi/minios/cfg_minios_efi/security_s.conf
+++ /dev/null
@@ -1,285 +0,0 @@
-########################################################################
-# Description: Configration file for dl_sec, and support pam common-auth/password/account/session style(based on linux)
-# HowTo:
-# # delete key, and difference caused by blankspace/tab on key is ignored
-# id@d@file@key
-#
-# # modify option: find line started with key, and get the value changed
-# id@m@file@key[@value]
-#
-# # modify sub-option: find line started with key, and then change the value of key2 to value2(prepositive seperator should not be blank characters) in the line
-# id@M@file@key@key2[@value2]
-#
-# # check existence of commands
-# id@which@command1 [command2 ...]
-#
-# # execute command on the files found
-# id@find@dir@condition@command
-#
-# # any command(with or without parameter), such as 'rm -f','chmod 700','which','touch', used to extend functions, return 0 is ok
-# id@command@file1 [file2 ...]
-#
-# Notes:
-# 1. The comment line should start with '#'
-# 2. "value" related with "key" should contain prepositive separator("="," " and so on), if there is any.
-# 3. When item starts with "d", "m" or "M", "file" should be a single normal file, otherwise multi-objects(separated by blankspace) are allowed.
-#
-########################################################################
-
-########################################################################
-# SSH server setting
-########################################################################
-# Set sshd Protocol version
-101@m@/etc/ssh/sshd_config@Protocol@ 2
-
-# Set sshd password algorithm
-102@m@/etc/ssh/sshd_config@Ciphers@ aes128-ctr,aes192-ctr,aes256-ctr
-
-# Set sshd message authentication code algorithm
-103@m@/etc/ssh/sshd_config@MACs@ hmac-sha1
-
-# Set sshd authentication
-104@m@/etc/ssh/sshd_config@PubkeyAuthentication@ yes
-104@m@/etc/ssh/sshd_config@RSAAuthentication@ yes
-# Don't read the user's ~/.rhosts and ~/.shosts files
-104@m@/etc/ssh/sshd_config@IgnoreRhosts@ yes
-# no /etc/ssh/ssh_known_hosts in RTOS, so close it
-104@m@/etc/ssh/sshd_config@RhostsRSAAuthentication@ no
-# To disable tunneled clear text passwords, change to no here
-104@m@/etc/ssh/sshd_config@PasswordAuthentication no
-
-# Make sshd check file modes and ownership of the user's files and home directory before accepting login
-105@m@/etc/ssh/sshd_config@StrictModes@ yes
-
-# Make sshd print warning banner
-106@m@/etc/ssh/sshd_config@Banner@ /etc/issue.net
-
-# Set ssh log level, logging login/logout on /var/log/messages
-107@m@/etc/ssh/sshd_config@SyslogFacility@Auth
-107@m@/etc/ssh/sshd_config@LogLevel@ INFO
-
-# Prevent user without password from remote ssh login
-108@m@/etc/ssh/sshd_config@PermitEmptyPasswords@ no
-
-# Set this to 'yes' to enable PAM authentication, account processing, and session processing.
-109@m@/etc/ssh/sshd_config@UsePAM yes
-
-########################################################################
-# System access and authorization
-########################################################################
-# Prevent rebooting by CTRL+ALT+DEL
-201@m@/etc/inittab@ca::ctrlaltdel:@/bin/false
-
-# Set timeout seconds of inactive sessions
-202@m@/etc/profile@TMOUT@=900
-202@m@/etc/profile@export TMOUT
-
-# Set a proper size above 0 of history commands number modify 100 to 5000
-203@m@/etc/profile@HISTSIZE@=5000
-203@m@/etc/profile@export HISTSIZE
-
-# close the kernel request debugging functionality
-204@m@/etc/sysctl.conf@kernel.sysrq@=0
-204@m@/etc/init.d/boot.local@/sbin/sysctl -p /etc/sysctl.conf
-
-########################################################################
-# File permission setting
-########################################################################
-# Common users are not allowed to delete or modify log files
-301@chmod go-wx@/var/log/*
-
-# Control the permission of administrator resources
-302@chmod 755@/var/log /sbin /usr/sbin
-
-# Set sticky bit of /tmp, then only owner or root can rename or delete files of /tmp
-303@chmod o+t@/tmp
-
-# Set strict permission of /root
-304@chmod 700@/root
-
-# Set ssh key permission
-305@chmod 400@/etc/ssh/*key
-305@chmod 400@/etc/ssh/*key.pub
-
-# Set shadow file permission
-306@chmod 400@/etc/shadow
-306@chmod 400@/etc/shadow.old
-
-# no coredump file
-307@m@/etc/profile@ulimit -c@ 0
-
-# TTYs list of PAM login, restrict root logins to system console
-308@touch@/etc/securetty
-308@chown root@/etc/securetty
-308@chgrp root@/etc/securetty
-308@chmod 400@/etc/securetty
-308@m@/etc/permissions.local@/etc/securetty @ root:root 400
-
-# Create files used by last and faillog command
-309@touch@/var/log/wtmp /var/log/faillog
-
-# Restrict common user to use command at
-310@rm -f@/etc/at.deny
-310@rm -f@/etc/at.allow
-310@touch@/etc/at.allow
-310@m@/etc/at.allow@root
-310@m@/etc/permissions.local@/etc/at.allow @ root:root 400
-
-# Restrict at and cron authorized
-311@rm -f@/etc/cron.deny
-311@rm -f@/etc/cron.allow
-311@touch@/etc/cron.allow
-311@m@/etc/cron.allow@root
-311@m@/etc/permissions.local@/etc/cron.allow @ root:root 400
-
-# Set daemon umask
-312@m@/etc/rc.status@umask@ 027
-
-# Set user default umask
-314@m@/etc/profile@umask@ 077
-314@m@/etc/permissions.local@/etc/profile @ root:root 644
-314@m@/etc/csh.login@umask@ 077
-314@m@/etc/permissions.local@/etc/csh.login @ root:root 444
-314@m@/etc/csh.cshrc@umask@ 077
-314@m@/etc/permissions.local@/etc/csh.cshrc @ root:root 444
-314@m@/etc/bash.bashrc@umask@ 077
-314@m@/etc/permissions.local@/etc/bash.bashrc @ root:root 444
-# Add umask to /root/.bash_profile /root/.bashrc /root/.cshrc /root/.tcshrc
-314@touch@/root/.bash_profile /root/.bashrc /root/.cshrc /root/.tcshrc
-314@m@/root/.bash_profile@umask@ 077
-314@m@/etc/permissions.local@/root/.bash_profile @ root:root 600
-314@m@/root/.bashrc@umask@ 077
-314@m@/etc/permissions.local@/root/.bashrc @ root:root 600
-314@m@/root/.cshrc@umask@ 077
-314@m@/etc/permissions.local@/root/.cshrc @ root:root 600
-314@m@/root/.tcshrc@umask@ 077
-314@m@/etc/permissions.local@/root/.tcshrc @ root:root 600
-
-315@m@/etc/permissions.local@/etc/crontab @ root:root 400
-315@m@/etc/permissions.local@/var/spool/cron/lastrun @ root:root 400
-315@m@/etc/permissions.local@/var/spool/cron/tabs @ root:root 400
-
-# Network parameter modifications
-316@chown root@/etc/sysctl.conf
-316@chgrp root@/etc/sysctl.conf
-316@chmod 600@/etc/sysctl.conf
-316@m@/etc/permissions.local@/etc/sysctl.conf @ root:root 600
-
-# Disable gui login
-317@chown root@/etc/inittab
-317@chgrp root@/etc/inittab
-317@chmod 600@/etc/inittab
-317@m@/etc/permissions.local@/etc/inittab @ root:root 644
-
-318@chown root@/etc/X11/xdm/Xservers
-318@chgrp root@/etc/X11/xdm/Xservers
-318@chmod 444@/etc/X11/xdm/Xservers
-318@m@/etc/permissions.local@/etc/X11/xdm/Xservers @ root:root 444
-
-319@chown root@/etc/sysconfig/displaymanager
-319@chgrp root@/etc/sysconfig/displaymanager
-319@chmod 644@/etc/sysconfig/displaymanager
-319@m@/etc/permissions.local@/etc/sysconfig/displaymanager @ root:root 644
-
-########################################################################
-# Account and password
-########################################################################
-### PAM auth setting, do not change the order of the configurations ###
-401@rm -f@/etc/pam.d/common-auth-pc
-401@touch@/etc/pam.d/common-auth-pc
-# Prevent logins of users in /etc/login.user.deny
-401@touch@/etc/login.user.deny
-401@m@/etc/pam.d/common-auth-pc@#%PAM-1.0\\n#\\n# This file is autogenerated by pam-config. All changes\\n# will be overwritten.\\n#\\n# Authentication-related modules common to all services\\n#\\n# This file is included from other service-specific PAM config files,\\n# and should contain a list of the authentication modules that define\\n# the central authentication scheme for use on the system\\n# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the\\n# traditional Unix authentication mechanisms.\\n#\\n
-401@m@/etc/pam.d/common-auth-pc@auth requisite pam_listfile.so item=user onerr=succeed sense=deny file=/etc/login.user.deny
-402@m@/etc/pam.d/common-auth-pc@auth required pam_env.so
-402@m@/etc/pam.d/common-auth-pc@auth required pam_unix2.so
-# Login failed 3 times will be locked for 5 minutes, even for root
-403@m@/etc/pam.d/common-auth-pc@auth required pam_tally2.so onerr=fail deny=3 unlock_time=300 even_deny_root root_unlock_time=300
-
-### PAM password setting, do not change the order of the configurations ###
-404@rm -f@/etc/pam.d/common-password-pc
-404@touch@/etc/pam.d/common-password-pc
-404@m@/etc/pam.d/common-password-pc@#%PAM-1.0\\n#\\n# This file is autogenerated by pam-config. All changes\\n# will be overwritten.\\n#\\n# Password-related modules common to all services\\n#\\n# This file is included from other service-specific PAM config files,\\n# and should contain a list of modules that define the services to be\\n# used to change user passwords.\\n#\\n
-# Set user(including root) password complexity, contain upper and lower characters, digit and other character;
-# length is no less than 8; cannot contain username; cannot use the latest 12 passwords
-404@m@/etc/pam.d/common-password-pc@password required pam_sek_pwck.so minlen=8 min_class=2 min_upper=0 min_lower=0 min_digits=0 min_special=0 remember=12 tries=5 enforce_for_root no_username use_cracklib cracklib=/usr/share/cracklib/pw_dict root_check_dict
-# Use the default password shadow file
-405@m@/etc/pam.d/common-password-pc@password required pam_unix2.so nullok use_authtok even_for_root
-# Use sha256 to encrypt password
-406@m@/etc/default/passwd@CRYPT=@sha256
-406@m@/etc/default/passwd@CRYPT_FILES=@sha256
-
-### PAM account setting, do not change the order of the configurations ###
-407@rm -f@/etc/pam.d/common-account-pc
-407@touch@/etc/pam.d/common-account-pc
-407@m@/etc/pam.d/common-account-pc@#%PAM-1.0\\n#\\n# This file is autogenerated by pam-config. All changes\\n# will be overwritten.\\n#\\n# Account-related modules common to all services\\n#\\n# This file is included from other service-specific PAM config files,\\n# and should contain a list of the accountorization modules that define\\n# the central access policy for use on the system. The default is to\\n# only deny service to users whose accounts are expired.\\n#\\n
-# Basic account verification
-407@m@/etc/pam.d/common-account-pc@account required pam_unix2.so
-# Maintain the failed login data
-408@m@/etc/pam.d/common-account-pc@account required pam_tally2.so
-
-# Set password lifetime and length of new added users
-409@m@/etc/login.defs@PASS_MAX_DAYS@ 30
-409@m@/etc/login.defs@PASS_MIN_DAYS@ 0
-409@m@/etc/login.defs@PASS_WARN_AGE@ 7
-
-### PAM login setting, do not change the order of the configurations ###
-# do not show login info of last user
-410@d@/etc/pam.d/login@session required pam_lastlog.so
-# no mail system on RTOS
-411@d@/etc/pam.d/login@session optional pam_mail.so
-
-# Limit access to the root by su
-412@m@/etc/pam.d/su@auth required pam_wheel.so use_uid group=wheel
-412@m@/etc/pam.d/su-l@auth required pam_wheel.so use_uid group=wheel
-
-########################################################################
-# Command checking
-########################################################################
-# Check root permission control command
-501@which@su
-
-# Check last and faillog command
-502@which@last faillog
-
-# delete lastlog and lastb, since last and faillog are provided and lastlog is not item of RTOS baseline
-503@rm -f@/usr/bin/lastlog /var/log/lastlog /usr/bin/lastb /var/log/btmp
-
-# Check logrotate command which is necessary for logging security
-504@which@logrotate
-
-
-########################################################################
-# DTS
-#######################################################################
-# Do not display architecture of OS
-601@rm -f@/etc/issue.net
-601@touch@/etc/issue.net
-601@m@/etc/issue.net@Welcome!
-601@m@/etc/permissions.local@/etc/issue.net @ root:root 644
-602@rm -f@/etc/issue
-602@touch@/etc/issue
-602@m@/etc/issue@Welcome!
-602@m@/etc/permissions.local@/etc/issue @ root:root 644
-603@rm -f@/etc/motd
-603@touch@/etc/motd
-603@m@/etc/motd@Authorized users only. All activities may be monitored and reported.\\n
-603@m@/etc/permissions.local@/etc/motd @ root:root 644
-
-# Clean up suspected plaintext password
-604@sed -i /password/s/assword[[:space:]]*=[[:space:]]*\".*\"/assword=\"******\"/I@/etc/openhpi/openhpi.conf
-
-# Add kernel param panic on oops
-605@m@/etc/sysctl.conf@kernel.panic_on_oops@=1
-605@m@/etc/init.d/boot.local@/sbin/sysctl -p /etc/sysctl.conf
-
-# Display user date when use history command.
-606@m@/etc/profile@HISTTIMEFORMAT@=\"%F %T \`whoami\` \"
-
-# Rremove chpasswd
-607@rm -f@/usr/sbin/chpasswd
-
-608@sed -i s/^#[[:space:]]*only_from[[:space:]]*=[[:space:]]*localhost/only_from=localhost/g@/etc/xinetd.conf
-
-# create /usr/lib/grub2 for pxe efi install
-609@ln -s /usr/lib/grub /usr/lib/grub2
diff --git a/conf/x86_64/kiwi/minios/cfg_minios_efi/sys.conf b/conf/x86_64/kiwi/minios/cfg_minios_efi/sys.conf
deleted file mode 100644
index 2d42e8a6221b58061c042dd5e7008c0f7b133e6f..0000000000000000000000000000000000000000
--- a/conf/x86_64/kiwi/minios/cfg_minios_efi/sys.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-sys_service_enable='boot.udev boot.debugfs boot.ldconfig boot.localnet boot.sysctl syslog network sshd rpcbind'
-sys_utc='yes'
-sys_timezone=''
-sys_cut='yes'
-sys_usrrpm_cut='no'
-sys_hostname='Euler'
-sys_usermodules_autoload='mfd-core intel-lpss-module 8250_dw'
-
-
-
-BOOTPROTO="dhcp"
-DEVICE="eth0"
-IPADDR=""
-NETMASK=""
-STARTMODE="auto"
-
diff --git a/mkdliso b/mkdliso
index 3b2a2da98924cd23e51e04ed76b1c055593aea97..4ad04300aae7f2520a262d01e2a793b2cda89e51 100644
--- a/mkdliso
+++ b/mkdliso
@@ -47,7 +47,6 @@ AVAIL_SYS_UTC=("yes" "no")
AVAIL_PRODUCT_MEM=$(cat $PRODUCT_CONF | grep -v "^#" | grep -v "^$" | grep "MEMORY" | awk -F " " '{print $1}')
AVAIL_PRODUCT_MEM_NAME="("${AVAIL_PRODUCT_MEM}")"
-KERNEL_VERSION_NUM=5 # repos/euler_base/kernel-5*
#########################################################
# minios val
@@ -88,7 +87,8 @@ COMPILE_ENV=""
KIWI_ISOBOOT="/usr/share/kiwi/custom_boot/pxeboot"
KIWI_MODULES="/usr/share/kiwi/modules/"
KIWI_METADATA="/usr/share/kiwi/metadata/"
-KIWI_STRIP_XML="/usr/lib/python3.9/site-packages/kiwi/config/strip.xml"
+python_v=$(python3 -V 2>&1|awk '{print $2}'|awk -F '.' '{print $1 "." $2}')
+KIWI_STRIP_XML="/usr/lib/python${python_v}/site-packages/kiwi/config/strip.xml"
KIWI_EULERLINUX_DOPRA_IMAGE="${KIWI_ISOBOOT}/dopralinuximage"
KIWI_EULERLINUX_IMAGE="${KIWI_ISOBOOT}/eulerlinuximage"
KIWI_EULERLINUX_ISO="kiwi/eulerlinuxiso"
@@ -2145,7 +2145,7 @@ function fn_init_for_openEuler() {
echo "error: ${isopackage_path} is not exist"
return 1
fi
- kernel_rpm_path="repos/euler_base/kernel-${KERNEL_VERSION_NUM}*."${ISO_ARCH}".rpm"
+ kernel_rpm_path="repos/euler_base/kernel-[1-9]*."${ISO_ARCH}".rpm"
if [ ! -f ${kernel_rpm_path} ]; then
echo "error: ${kernel_rpm_path} is not exist, please check package kernel's version"
return 1
@@ -2172,7 +2172,7 @@ function fn_check_pwd {
return 1
fi
- check_path_arr=("${SYS_CUSTOM_CONF_PATH}/rpm.conf" "${KIWI_MINIOS}/cfg_minios/rpm.conf" "${KIWI_MINIOS}/cfg_minios_efi/rpm.conf")
+ check_path_arr=("${SYS_CUSTOM_CONF_PATH}/rpm.conf" "${KIWI_MINIOS}/cfg_minios/rpm.conf")
for item in "${check_path_arr[@]}"; do
if [ -f ${item} ] && [ $(grep -c "pwd=\"\"" ${item}) -ne 0 ]; then
echo "error: password config is empty, please check pwd config in file ${item}"