The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-templates/pull/34
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Our package manager "pkgtools" is updated, and renamed "pkgtools7".
Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>
From 4c11070332fa6c301be4dbd2de8900afd5148f9a Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Date: Thu, 3 Sep 2020 14:42:29 +0900
Subject: [PATCH] plamo: Support current pkgtools
Our package manager "pkgtools" is updated, and renamed "pkgtools7".
Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>
---
templates/lxc-plamo.in | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index 2145d01..57f8951 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -123,13 +123,18 @@ install_plamo() {
echo "Installing 'installpkg' command into $dlcache/sbin..."
if [ $majorver -ge 7 ]; then
- pkgtool="pkgtools"
+ pkgtool="pkgtools"
+ pkgtool=$( cd $dlcache ; ls "$pkgtool"* )
+ pkgtool=${pkgtool%%-*}
else
- pkgtool="hdsetup"
- LANG=C
+ pkgtool="hdsetup"
+ LANG=C
fi
( cd $dlcache ; tar xpJf "$pkgtool"-*.txz ; rm -rf tmp usr var )
+ if [ $pkgtool = "pkgtools${majorver}" ]; then
+ ( cd $dlcache/sbin ; mv installer_new installer )
+ fi
sed -i "/ldconfig/!s@/sbin@$dlcache&@g" $dlcache/sbin/installpkg*
PATH=$dlcache/sbin:$PATH
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
