[26361] in Source-Commits
Re: /svn/athena r25536 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed May 30 14:42:41 2012
Date: Wed, 30 May 2012 11:42:38 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205301841.q4UIfOU4024649@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1205301142380.31917@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK
--
Geoffrey Thomas
geofft@mit.edu
On Wed, 30 May 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-05-30 14:41:23 -0400 (Wed, 30 May 2012)
> New Revision: 25536
>
> Added:
> trunk/debathena/config/reactivate/debian/lightdm-session.debathena
> Modified:
> trunk/debathena/config/reactivate/debian/90debathena-reactivate
> trunk/debathena/config/reactivate/debian/changelog
> trunk/debathena/config/reactivate/debian/rules
> trunk/debathena/config/reactivate/debian/snapshot-run
> Log:
> In reactivate:
> * Set NSS_NONLOCAL_IGNORE when running getent, because we care about
> local gruops, not Hesiod ones
> * Add the user to "sudo" as well, since "admin" is gone in Precise (LP:
> 893842)
> * Use SESSION_ID, not CHROOT_NAME in schroot setup script. SESSION_ID
> was always right, and CHROOT_NAME simply happened to match it due to a
> bug (Debian: 623828)
> * Also divert lightdm-session (lightdm's session wrapper) and wrap it in
> snapshot-run
>
>
> Modified: trunk/debathena/config/reactivate/debian/90debathena-reactivate
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/90debathena-reactivate 2012-05-30 16:31:43 UTC (rev 25535)
> +++ trunk/debathena/config/reactivate/debian/90debathena-reactivate 2012-05-30 18:41:23 UTC (rev 25536)
> @@ -12,7 +12,7 @@
> fi
>
> if [ $STAGE = "setup-start" ]; then
> - info "Adding messagebus to access list for session ${CHROOT_NAME}"
> - sed -i "/^root-users/s/$/,messagebus/" /var/lib/schroot/session/"${CHROOT_NAME}"
> + info "Adding messagebus to access list for session ${SESSION_ID}"
> + sed -i "/^root-users/s/$/,messagebus/" /var/lib/schroot/session/"${SESSION_ID}"
> fi
>
>
> Modified: trunk/debathena/config/reactivate/debian/changelog
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/changelog 2012-05-30 16:31:43 UTC (rev 25535)
> +++ trunk/debathena/config/reactivate/debian/changelog 2012-05-30 18:41:23 UTC (rev 25536)
> @@ -6,8 +6,17 @@
> logins
> * Use new Debathena-Build-For field in control file to control releases
> this gets built on.
> + * Set NSS_NONLOCAL_IGNORE when running getent, because we care about
> + local gruops, not Hesiod ones
> + * Add the user to "sudo" as well, since "admin" is gone in Precise (LP:
> + 893842)
> + * Use SESSION_ID, not CHROOT_NAME in schroot setup script. SESSION_ID
> + was always right, and CHROOT_NAME simply happened to match it due to a
> + bug (Debian: 623828)
> + * Also divert lightdm-session (lightdm's session wrapper) and wrap it in
> + snapshot-run
>
> - -- Jonathan Reed <jdreed@mit.edu> Sun, 13 May 2012 20:44:41 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Wed, 30 May 2012 14:41:10 -0400
>
> debathena-reactivate (2.0.30) unstable; urgency=low
>
>
> Added: trunk/debathena/config/reactivate/debian/lightdm-session.debathena
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/lightdm-session.debathena (rev 0)
> +++ trunk/debathena/config/reactivate/debian/lightdm-session.debathena 2012-05-30 18:41:23 UTC (rev 25536)
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +exec /usr/lib/debathena-reactivate/snapshot-run /usr/sbin/lightdm-session.debathena-orig "$@"
>
>
> Property changes on: trunk/debathena/config/reactivate/debian/lightdm-session.debathena
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Modified: trunk/debathena/config/reactivate/debian/rules
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/rules 2012-05-30 16:31:43 UTC (rev 25535)
> +++ trunk/debathena/config/reactivate/debian/rules 2012-05-30 18:41:23 UTC (rev 25536)
> @@ -2,7 +2,8 @@
>
> DEB_DIVERT_EXTENSION = .debathena
> DEB_DIVERT_FILES_debathena-reactivate += \
> - /etc/gdm/Xsession.debathena
> + /etc/gdm/Xsession.debathena \
> + /usr/sbin/lightdm-session.debathena
> DEB_TRANSFORM_FILES_debathena-reactivate += \
> /etc/pam.d/su.debathena \
> /etc/default/schroot.debathena \
>
> Modified: trunk/debathena/config/reactivate/debian/snapshot-run
> ===================================================================
> --- trunk/debathena/config/reactivate/debian/snapshot-run 2012-05-30 16:31:43 UTC (rev 25535)
> +++ trunk/debathena/config/reactivate/debian/snapshot-run 2012-05-30 18:41:23 UTC (rev 25536)
> @@ -11,7 +11,7 @@
> set -e
> cd /
>
> -addgroups="admin lpadmin adm fuse cdrom floppy audio video plugdev scanner dialout lp"
> +addgroups="sudo admin lpadmin adm fuse cdrom floppy audio video plugdev scanner dialout lp"
> daemons="$(/usr/sbin/policy-rc.d --daemons)"
>
> # Setup
> @@ -22,7 +22,7 @@
> schr() { schroot -r -c "$session" -u root -- "$@"; } # Run in the chroot as root
>
> for group in $addgroups; do
> - schr getent group "$group" >/dev/null 2>&1 && schr adduser "$USER" "$group"
> + schr env NSS_NONLOCAL_IGNORE=ignore getent group "$group" >/dev/null 2>&1 && schr adduser "$USER" "$group"
> done
>
> schr sed -i "/su-error/d" "/etc/pam.d/su.debathena"
>
>
