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

tenforward on Github lxc-bot at linuxcontainers.org
Mon Oct 26 10:37:17 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 471 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201026/ec3d972d/attachment.bin>
-------------- next part --------------
From eaa1f53c31f93b2a1be1442b6c4c9738daaaf612 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma at jazz.email.ne.jp>
Date: Mon, 26 Oct 2020 17:10:15 +0900
Subject: [PATCH] images/plamo: fix for current Plamo 7.x

This is the equivalent of https://github.com/lxc/lxc-templates/commit/551f56b5d529ced1b6b51206c4e9b7055e338028

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
---
 images/plamo.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/images/plamo.yaml b/images/plamo.yaml
index fa98f4c..02475eb 100644
--- a/images/plamo.yaml
+++ b/images/plamo.yaml
@@ -322,14 +322,11 @@ actions:
       sed -i -e '/wait_for_user/d' -e '/Press Enter to/d' /etc/rc.d/init.d/rc
     fi
 
-    # initpkg
-    for pkg in shadow netconfig7 eudev openssh; do
+    # remove initpkg that do not execute on containers
+    for pkg in shadow netconfig7 eudev openssh pkgtools7; do
       rm -f "/var/log/initpkg/${pkg}"
     done
-
-    for pkg in /var/log/initpkg/*; do
-      sh ${pkg}
-    done
+    ( cd /sbin ; mv installer_new installer )
 
 mappings:
   architecture_map: plamolinux


More information about the lxc-devel mailing list