From 6bedd5525e6b1cc5253ecd13a4e11ed2afe1ae54 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 19 Jul 2021 17:10:00 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E5=A2=9E=E5=8A=A0=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=90=8E=E6=89=A7=E8=A1=8Cldconfig=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/distro-setup.sh                     |  1 +
 rootconf/sysroot-usr/service/ldconfig.service | 23 +++++++++++++++++++
 tools/mk-base-image                           |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100644 rootconf/sysroot-usr/service/ldconfig.service

diff --git a/installer/distro-setup.sh b/installer/distro-setup.sh
index b51f0106..d6adb631 100755
--- a/installer/distro-setup.sh
+++ b/installer/distro-setup.sh
@@ -31,6 +31,7 @@ ln -sf /usr/bin/grub2-editenv /usr/bin/grub-editenv
 
 rm -rf /data/overlay/rootfs_var/rw/lib/rpm
 rm -rf /data/overlay/rootfs_var/rw/lib/docker
+rm -rf /data/overlay/rootfs_etc/rw/ld.so.conf.d
 
 # Setup o/s mount points
 (cat <<EOF2
diff --git a/rootconf/sysroot-usr/service/ldconfig.service b/rootconf/sysroot-usr/service/ldconfig.service
new file mode 100644
index 00000000..33824d4d
--- /dev/null
+++ b/rootconf/sysroot-usr/service/ldconfig.service
@@ -0,0 +1,23 @@
+#  SPDX-License-Identifier: LGPL-2.1-or-later
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Rebuild Dynamic Linker Cache
+Documentation=man:ldconfig(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=local-fs.target
+Before=sysinit.target shutdown.target systemd-update-done.service
+ConditionNeedsUpdate=|/etc
+ConditionFileNotEmpty=|!/etc/ld.so.cache
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/sbin/ldconfig -X
diff --git a/tools/mk-base-image b/tools/mk-base-image
index 28af295f..87867d77 100755
--- a/tools/mk-base-image
+++ b/tools/mk-base-image
@@ -65,11 +65,14 @@ cp -a /dev/zero $target/dev/
 cp -a /dev/urandom $target/dev/
 cp -a /dev/random $target/dev/
 
+
 # install ONIE helpers
 chmod 0755 $projectdir/rootconf/sysroot-bin/*
 chmod 0755 $projectdir/rootconf/sysroot-lib/*
 cp -rf $projectdir/rootconf/sysroot-bin/* $target/bin/
 cp -rf $projectdir/rootconf/sysroot-lib/* $target/lib/
+cp -rf $projectdir/rootconf/sysroot-usr/service/* $target/usr/lib/systemd/system
+ln -vfs --relative  $target/usr/lib/systemd/system/ldconfig.service $target/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service
 
 # ansible-playbook -i tsg-9140-scripts/install_config/tsg_9140_host tsg-9140-scripts/tsg_9140_deploy.yml
 yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt clean all