[lxc-devel] [distrobuilder/master] sources: Fix Plamo 7.x

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 310 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200904/73492d13/attachment.bin>
-------------- next part --------------
From 12335bf1a02bf1350144a13bcbfdc7a7eb785c2f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Fri, 4 Sep 2020 20:08:01 +0200
Subject: [PATCH] sources: Fix Plamo 7.x

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 sources/plamolinux-http.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sources/plamolinux-http.go b/sources/plamolinux-http.go
index 183ffb0..3dfcac6 100644
--- a/sources/plamolinux-http.go
+++ b/sources/plamolinux-http.go
@@ -66,7 +66,7 @@ func (s *PlamoLinuxHTTP) Run(definition shared.Definition, rootfsDir string) err
 	if release < 7 {
 		pkgTool = "hdsetup"
 	} else {
-		pkgTool = "pkgtools"
+		pkgTool = "pkgtools7"
 	}
 
 	matches, err := filepath.Glob(filepath.Join(pkgDir, fmt.Sprintf("%s-*.txz", pkgTool)))
@@ -102,6 +102,12 @@ export PATH="${PKG_DIR}/sbin:${PATH}"
 export LC_ALL="C"
 export LANG="C"
 
+# Fix name of installer directory
+if [ -d "${PKG_DIR}/sbin/installer_new" ]; then
+    [ -d "${PKG_DIR}/sbin/installer" ] && rm -r "${PKG_DIR}/sbin/installer"
+    mv "${PKG_DIR}/sbin/installer_new" "${PKG_DIR}/sbin/installer"
+fi
+
 # Don't call ldconfig
 sed -i "/ldconfig/!s@/sbin@${PKG_DIR}&@g" ${PKG_DIR}/sbin/installpkg*