File _service:gitpkg:0010-Pass-the-ABUILD_UID-GID-to... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File _service:gitpkg:0010-Pass-the-ABUILD_UID-GID-to-the-sb2-init.patch of Package build

From a6f18b9aaac259d69547a59757f952e55f785637 Mon Sep 17 00:00:00 2001
From: David Greaves <david@dgreaves.com>
Date: Fri, 31 Aug 2012 00:05:36 +0100
Subject: [PATCH] Pass the ABUILD_UID/GID to the sb2 init

Signed-off-by: David Greaves <david@dgreaves.com>
---
 build-vm       | 5 +++++
 initscript_sb2 | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build-vm b/build-vm
index 436281b..6ada9e9 100644
--- a/build-vm
+++ b/build-vm
@@ -691,6 +691,11 @@ vm_first_stage() {
     # put our config into .build/build.data
     Q="'\''"
     echo "RECIPEFILE='${RECIPEFILE//"'"/$Q}'" > $BUILD_ROOT/.build/build.data
+    if test "$VM_TYPE" = lxc -o "VM_TYPE" = docker -o "$VM_TYPE" = sb2; then
+	# abuild user equivalence is useful
+	echo "ABUILD_UID='${ABUILD_UID//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
+	echo "ABUILD_GID='${ABUILD_GID//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
+    fi
     echo "BUILD_JOBS='${BUILD_JOBS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
     echo "BUILD_ARCH='${BUILD_ARCH//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
     echo "BUILD_RPMS='${BUILD_RPMS//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
diff --git a/initscript_sb2 b/initscript_sb2
index b5e80a5..36d5245 100644
--- a/initscript_sb2
+++ b/initscript_sb2
@@ -1,6 +1,7 @@
 #!/bin/bash
-ABUILD_UID=399
-ABUILD_GID=399
+
+# Set ABUILD_UID and ABUILD_GID from saved data
+. /.build/build.data
 
 # Xen needs the / remounted rw in SB2
 if [[ -e /proc/sys/xen/independent_wallclock ]]; then
-- 
2.1.0

Places

File _service:gitpkg:0010-Pass-the-ABUILD_UID-GID-to-the-sb2-init.patch of Package build

Places