From 2a42cfa0d96e64fbffe6d17d7adaca5fcd10d934 Mon Sep 17 00:00:00 2001
From: lixiaoyong <lixiaoyong19@huawei.com>
Date: Wed, 23 Mar 2022 06:41:50 +0000
Subject: [PATCH] yocto: fix the issue where required packages for vconfig are
 not installed

fix vconfig add problem

Signed-off-by: lixiaoyong <lixiaoyong19@huawei.com>
---
 meta-openeuler/recipes-core/os-base/os-base/load_modules | 8 ++++++++
 meta-openeuler/recipes-core/os-base/os-base/rc.local     | 2 ++
 meta-openeuler/recipes-core/os-base/os-base_1.0.bb       | 7 +++++--
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meta-openeuler/recipes-core/os-base/os-base/load_modules

diff --git a/meta-openeuler/recipes-core/os-base/os-base/load_modules b/meta-openeuler/recipes-core/os-base/os-base/load_modules
new file mode 100644
index 00000000000..513e814f39c
--- /dev/null
+++ b/meta-openeuler/recipes-core/os-base/os-base/load_modules
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# 8021q modules
+insmod /lib/modules/5.10.0/kernel/net/llc/llc.ko
+insmod /lib/modules/5.10.0/kernel/net/802/stp.ko
+insmod /lib/modules/5.10.0/kernel/net/802/garp.ko
+insmod /lib/modules/5.10.0/kernel/net/8021q/8021q.ko
+
diff --git a/meta-openeuler/recipes-core/os-base/os-base/rc.local b/meta-openeuler/recipes-core/os-base/os-base/rc.local
index b014990f5eb..b90cfcc0398 100644
--- a/meta-openeuler/recipes-core/os-base/os-base/rc.local
+++ b/meta-openeuler/recipes-core/os-base/os-base/rc.local
@@ -8,3 +8,5 @@ chmod 640 /dev/mem
 chmod 600 /var/log/audit/audit.log
 
 . /etc/init.d/sshd start 1>/dev/null 2>&1 &
+
+. /etc/init.d/load_modules
diff --git a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb
index ace31e0a664..8276b7426e6 100644
--- a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb
+++ b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb
@@ -23,7 +23,9 @@ SRC_URI = "file://bashrc \
 	file://sysctl.conf \
 	file://rc.functions \
 	file://rc.sysinit \
-	file://rc.local"
+	file://rc.local \
+        file://load_modules \
+"
 
 hostname = "openeuler"
 
@@ -46,6 +48,7 @@ do_install() {
 	install -m 0744 ${WORKDIR}/rc.local ${D}/etc/rc.d
         install -m 0755 -d ${D}/etc/init.d/
 	install -m 0750 ${WORKDIR}/rcS ${D}/etc/init.d/
+	install -m 0750 ${WORKDIR}/load_modules ${D}/etc/init.d/
         mkdir -p ${D}/var/log/
         touch ${D}/var/log/messages ${D}/var/log/lastlog
         mkdir -p ${D}/var/run/faillock ${D}/tmp
@@ -61,7 +64,7 @@ do_install() {
 }
 
 do_install_append_arm() {
-	echo "insmod /lib/modules/5.10.0/kernel/net/unix/unix.ko" >> ${D}/etc/rc.d/rc.local
+       echo "insmod /lib/modules/5.10.0/kernel/net/unix/unix.ko" >> ${D}/etc/init.d/load_modules
 }
 
 do_install_append_raspberrypi4() {
-- 
Gitee