[lxc-devel] [lxc-templates/master] plamo: fix for current Plamo 7.x

[tenforward on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 532 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200904/0078ae6e/attachment.bin>
-------------- next part --------------
From 551f56b5d529ced1b6b51206c4e9b7055e338028 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma at jazz.email.ne.jp>
Date: Sat, 5 Sep 2020 15:01:38 +0900
Subject: [PATCH] plamo: fix for current Plamo 7.x

* glibc is now initialized when a container is first started
* pkgtools7 is not initialized when a container is first started
* initpkg is not execute in lxc-plamo

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
---
 templates/lxc-plamo.in | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index 57f8951..5e27fba 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -183,9 +183,6 @@ configure_plamo6() {
 	EOF
   # configure the network using the dhcp
   echo "DHCP" > $rootfs/var/run/inet1-scheme
-  # glibc configure
-  mv $rootfs/etc/ld.so.conf{.new,}
-  chroot $rootfs ldconfig
 
   # delete unnecessary process from rc.S
   ed - $rootfs/etc/rc.d/rc.S <<- "EOF"
@@ -286,18 +283,13 @@ configure_plamo7() {
 	SERVICE="dhclient"
 	EOF
 
-    # initpkg
-    noexec="shadow netconfig7 eudev openssh"
+    # remove initpkg that do not execute on containers
+    noexec="shadow netconfig7 eudev openssh pkgtools${majorver}"
     for f in $noexec
     do
       rm -f $rootfs/var/log/initpkg/"$f"
     done
-    pushd $rootfs
-    for f in var/log/initpkg/*
-    do
-      chroot $rootfs sh ./$f
-    done
-    popd
+    ( cd $rootfs/sbin ; mv installer_new installer )
 }
 
 configure_plamo() {