[23247] in Source-Commits
/svn/athena r22908 - in trunk/debathena/config/athena-chroot: debian installer schroot
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Thu Apr 17 10:47:43 2008
Date: Thu, 17 Apr 2008 10:47:12 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804171447.KAA06416@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-17 10:47:11 -0400 (Thu, 17 Apr 2008)
New Revision: 22908
Removed:
trunk/debathena/config/athena-chroot/schroot/exec.d/
Modified:
trunk/debathena/config/athena-chroot/debian/athmode
trunk/debathena/config/athena-chroot/debian/debathena-athena-chroot.postinst
trunk/debathena/config/athena-chroot/debian/lastlog.debathena
trunk/debathena/config/athena-chroot/installer/install
trunk/debathena/config/athena-chroot/schroot/schroot.conf.debathena
Log:
debathena-athena-chroot: various bugfixes
* debian/lastlog.debathena: Add -- to command line.
* installer/install: Setup NSS in chroot sloppily.
* schroot/exec.d: Remove passwd file copying code.
* schroot/schroot.conf.debathena: set personality to linux32.
Modified: trunk/debathena/config/athena-chroot/debian/athmode
===================================================================
--- trunk/debathena/config/athena-chroot/debian/athmode 2008-04-17 06:57:37 UTC (rev 22907)
+++ trunk/debathena/config/athena-chroot/debian/athmode 2008-04-17 14:47:11 UTC (rev 22908)
@@ -1,3 +1,3 @@
#!/bin/sh
unset ENV_SET
-exec schroot -qpc athena "$@"
+exec schroot -qpc athena -- "$@"
Modified: trunk/debathena/config/athena-chroot/debian/debathena-athena-chroot.postinst
===================================================================
--- trunk/debathena/config/athena-chroot/debian/debathena-athena-chroot.postinst 2008-04-17 06:57:37 UTC (rev 22907)
+++ trunk/debathena/config/athena-chroot/debian/debathena-athena-chroot.postinst 2008-04-17 14:47:11 UTC (rev 22908)
@@ -22,8 +22,10 @@
case "$1" in
configure)
# schroot doesn't deal with symlinks; see bug #476332
- rm -f /etc/schroot/schroot.conf
- mv /etc/schroot/schroot.conf.debathena /etc/schroot/schroot.conf
+ if [ -z "$2" ]; then
+ rm -f /etc/schroot/schroot.conf
+ ln /etc/schroot/schroot.conf.debathena /etc/schroot/schroot.conf
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/debathena/config/athena-chroot/debian/lastlog.debathena
===================================================================
--- trunk/debathena/config/athena-chroot/debian/lastlog.debathena 2008-04-17 06:57:37 UTC (rev 22907)
+++ trunk/debathena/config/athena-chroot/debian/lastlog.debathena 2008-04-17 14:47:11 UTC (rev 22908)
@@ -1,4 +1,3 @@
#!/bin/sh
unset ENV_SET
-shift
-exec schroot -qpc athena /usr/athena/bin/lastlog "$@"
+exec schroot -qpc athena /usr/athena/bin/lastlog -- "$@"
Modified: trunk/debathena/config/athena-chroot/installer/install
===================================================================
--- trunk/debathena/config/athena-chroot/installer/install 2008-04-17 06:57:37 UTC (rev 22907)
+++ trunk/debathena/config/athena-chroot/installer/install 2008-04-17 14:47:11 UTC (rev 22908)
@@ -64,6 +64,12 @@
chroot "$chroot" /phase2.debathena
mkdir -p "$sysimage/dev/pts"
mkdir -p "$sysimage/dev/shm"
+# setup Athena machine to use NSS for naming information
+# This code currently is an awful hack that assumes a 32-bit host.
+cp -a /etc/hesiod.conf "$sysimage/etc"
+cp -a /etc/nsswitch.conf.debathena "$sysimage/etc/nsswitch.conf"
+cp -a /lib/libnss_nonlocal* "$sysimage/lib"
+cp -a /lib/libnss_afspag* "$sysimage/lib"
maybe_umount "$chroot/sysimage/proc"
maybe_umount "$chroot/sysimage"
Modified: trunk/debathena/config/athena-chroot/schroot/schroot.conf.debathena
===================================================================
--- trunk/debathena/config/athena-chroot/schroot/schroot.conf.debathena 2008-04-17 06:57:37 UTC (rev 22907)
+++ trunk/debathena/config/athena-chroot/schroot/schroot.conf.debathena 2008-04-17 14:47:11 UTC (rev 22908)
@@ -7,3 +7,4 @@
run-setup-scripts=true
run-exec-scripts=true
script-config=athena.conf
+personality=linux32
