[27143] in Source-Commits
/svn/athena r25971 - in trunk/debathena/scripts/build-server: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri May 10 11:19:37 2013
Date: Fri, 10 May 2013 11:19:30 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201305101519.r4AFJUGO004916@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-05-10 11:19:30 -0400 (Fri, 10 May 2013)
New Revision: 25971
Added:
trunk/debathena/scripts/build-server/modify_etc_approx_approx.conf
trunk/debathena/scripts/build-server/modify_etc_pam.d_schroot
Removed:
trunk/debathena/scripts/build-server/approx.conf.tail
trunk/debathena/scripts/build-server/debian/transform_approx.conf
trunk/debathena/scripts/build-server/mount-defaults.patch
trunk/debathena/scripts/build-server/pam-schroot.patch
Modified:
trunk/debathena/scripts/build-server/debian/debathena-build-server.transform
Log:
- Move approx.conf transform script out of debian/, name it more
conspicuously, and add comments for manual use.
- Punt approx.conf.tail in favor of above script.
- Create a transform script for schroot's pam config, name it
conspicuously, and add comments for manual use.
- Punt pam-schroot.patch in favor of above script.
- Punt mount-defaults.patch in favor of new 'debathena' schroot config
- Update .transform file to reflect changes above.
Modified: trunk/debathena/scripts/build-server/debian/debathena-build-server.transform
===================================================================
--- trunk/debathena/scripts/build-server/debian/debathena-build-server.transform 2013-05-09 20:17:02 UTC (rev 25970)
+++ trunk/debathena/scripts/build-server/debian/debathena-build-server.transform 2013-05-10 15:19:30 UTC (rev 25971)
@@ -1,5 +1,2 @@
-# -*- mode: text; fill-column: 10000 -*-
-# Patch pam's schroot configuration, to avoid running common-session
-# because AFS PAGs
-/etc/pam.d/schroot.debathena sed -e 's/^\(@include common-session\)$/# \1\nsession required pam_unix.so/'
-/etc/approx/approx.conf.debathena debian/transform_approx.conf
+/etc/pam.d/schroot.debathena modify_etc_pam.d_schroot
+/etc/approx/approx.conf.debathena modify_etc_approx_approx.conf
Copied: trunk/debathena/scripts/build-server/modify_etc_approx_approx.conf (from rev 25970, trunk/debathena/scripts/build-server/debian/transform_approx.conf)
===================================================================
--- trunk/debathena/scripts/build-server/modify_etc_approx_approx.conf (rev 0)
+++ trunk/debathena/scripts/build-server/modify_etc_approx_approx.conf 2013-05-10 15:19:30 UTC (rev 25971)
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# This script appends some lines (below) to approx.conf suitable for
+# use on the Debathena build server. This script is normally called
+# as a config-packge-dev transform script, but can be applied by hand
+# with something like:
+# mv /etc/approx/approx.conf /etc/approx/approx.conf.orig
+# modify_approx.conf < /etc/approx/approx.conf.orig \
+# > /etc/approx/approx.conf
+# and then restart approx (via inetd)
+#
+cat
+cat <<EOF
+
+#debian http://debian.lcs.mit.edu/debian
+debian http://mirrors.mit.edu/debian
+debian-security http://security.us.debian.org
+#ubuntu http://archive.ubuntu.com/ubuntu
+ubuntu http://mirrors.mit.edu/ubuntu
+ubuntu-security http://security.ubuntu.com/ubuntu
+debathena http://debathena.mit.edu/apt
+EOF
Added: trunk/debathena/scripts/build-server/modify_etc_pam.d_schroot
===================================================================
--- trunk/debathena/scripts/build-server/modify_etc_pam.d_schroot (rev 0)
+++ trunk/debathena/scripts/build-server/modify_etc_pam.d_schroot 2013-05-10 15:19:30 UTC (rev 25971)
@@ -0,0 +1,12 @@
+#!/usr/bin/perl -0p
+#
+# This script modifies /etc/pam.d/schroot to replace common-session with
+# pam_unix.so for basic session support. If common-session is not
+# excluded, it creates a new AFS PAG and does other undesirable things.
+#
+# This script is normally called as a config-packge-dev transform
+# script, but can be applied by hand with something like:
+# mv /etc/pam.d/schroot /etc/pam.d/schroot.orig
+# modify_schroot < /etc/pam.d/schroot.orig > /etc/pam.d/schroot
+#
+s/^(\@include common-session)$/#$1\nsession required pam_unix.so/m or die;
Property changes on: trunk/debathena/scripts/build-server/modify_etc_pam.d_schroot
___________________________________________________________________
Added: svn:executable
+ *
