[Pbuilder-maint] pbuilder CVS update: pbuilder ChangeLog
pdebuild-internal
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Fri Nov 3 18:45:01 CET 2006
User: lool
Date: 06/11/03 18:45:01
Modified: . ChangeLog pdebuild-internal
Log:
* pdebuild-internal: install the passwd package before calling
groupadd and useradd; restore it's installation state after groupadd and
useradd.
Revision Changes Path
1.416 +7 -1 pbuilder/ChangeLog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.416&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.416&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.416&r2=1.415&cvsroot=
-----------------------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- ChangeLog 30 Oct 2006 10:04:03 -0000 1.415
+++ ChangeLog 3 Nov 2006 17:45:01 -0000 1.416
@@ -1,3 +1,9 @@
+2006-11-03 Loic Minier <lool at dooz.org>
+
+ * pdebuild-internal: install the passwd package before calling
+ groupadd and useradd; restore it's installation state after groupadd
+ and useradd.
+
2006-10-30 Loic Minier <lool at dooz.org>
* pbuilder-modules: add sanity checks during umount_one(); ignore
1.14 +13 -2 pbuilder/pdebuild-internal
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?annotate=1.14&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?rev=1.14&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal.diff?r1=1.14&r2=1.13&cvsroot=
-----------------------------------
Index: pdebuild-internal
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-internal,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pdebuild-internal 25 Jun 2006 16:39:31 -0000 1.13
+++ pdebuild-internal 3 Nov 2006 17:45:01 -0000 1.14
@@ -73,9 +73,20 @@
/usr/lib/pbuilder/pbuilder-satisfydepends
apt-get install -y --force-yes fakeroot
-# create the user similar to that used outside
+# we will need "passwd" for groupadd/useradd, retain whether it was installed
+# warning: dpkg --get-selections returns true for unknown packages
+PASSWD_SELECTION="$(LC_ALL=C dpkg --get-selections passwd && true)"
+if [ -z "$PASSWD_SELECTION" ]; then
+ PASSWD_SELECTION="passwd purge"
+fi
+# install passwd
+apt-get install -y --force-yes passwd
+# create the user similar to that used outside
groupadd -g "${BUILDRESULTGID}" -o pbgroup
useradd -g pbgroup -u "${BUILDRESULTUID}" -o pbuser
+# restore the state of the passwd package
+echo "$PASSWD_SELECTION" | LC_ALL=C dpkg --set-selections
+apt-get dselect-upgrade -u -y --force-yes
# what about id -G output? if other groups than the designated is used, we're stuffed.
More information about the Pbuilder-maint
mailing list