File 0001-build-fix-preinstallimage-with-build-uid-c... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-build-fix-preinstallimage-with-build-uid-caller.patch of Package build (Revision 2a8b460b08d38ac6159b1a1ed986feb3)

Currently displaying revision 2a8b460b08d38ac6159b1a1ed986feb3 , Show latest

From 7fc077c06d50238a9ce777c5a17f916d53ec4b2c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife+dev@b1-sytems.com>
Date: Sat, 16 Apr 2022 12:33:05 +0200
Subject: [PATCH] build: fix preinstallimage with build-uid=caller

A preinstallimage always contains default abuild uid/gid and thus can
not easily be used with build-uid=caller osc option.
Just fix up the uid/gid in passwd/shadow instead of aborting.
---
 build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: b/build
===================================================================
--- a/build
+++ b/build
@@ -1715,8 +1715,10 @@ for RECIPEPATH in "${RECIPEFILES[@]}" ;
 		grep -E "^abuild:" <$BUILD_ROOT/etc/passwd
 		echo "build script attempting to use:"
 		echo "abuild::${ABUILD_UID}:${ABUILD_GID}:..."
-		echo "build aborting"
-		cleanup_and_exit 1
+		echo "fixing..."
+		sed -i -e "/^abuild:/d;iabuild:x:${ABUILD_UID}:${ABUILD_GID}:Autobuild:/home/abuild:/bin/bash" $BUILD_ROOT/etc/passwd
+		sed -i -e "/^abuild:/d;iabuild:x:${ABUILD_GID}:" $BUILD_ROOT/etc/group
+		chown "$ABUILD_UID:$ABUILD_GID" $BUILD_ROOT/home/abuild
 	    fi
 	fi
 	if test -f $BUILD_ROOT/etc/shadow ; then

Places

File 0001-build-fix-preinstallimage-with-build-uid-caller.patch of Package build (Revision 2a8b460b08d38ac6159b1a1ed986feb3)

Places