[24350] in Source-Commits
/svn/athena r23948 - trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon Aug 3 10:58:58 2009
Date: Mon, 3 Aug 2009 10:56:48 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200908031456.n73EumuM016445@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-08-03 10:56:48 -0400 (Mon, 03 Aug 2009)
New Revision: 23948
Modified:
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh
Log:
Revert "Use d-i-utils' chroot setup script before installing Debathena."
This reverts r23944. chroot_setup and chroot_cleanup clobber our packaged
policy-rc.d file.
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh 2009-08-03 01:24:02 UTC (rev 23947)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh 2009-08-03 14:56:48 UTC (rev 23948)
@@ -9,13 +9,6 @@
cp /debathena-jaunty/pxe-install-flag /target/root/pxe-install-flag
fi
-. /lib/chroot-setup.sh
-
-if ! chroot_setup; then
- logger -t postinstall.sh -- "Target system not usable. Can't install Debathena."
- exit 1
-fi
-
chvt 5
chroot /target sh /root/install-debathena.sh < /dev/tty5 > /dev/tty5 2>&1
# This approach fails due to lingering processes keeping the
@@ -23,5 +16,4 @@
# chroot /target sh /root/install-debathena.sh < /dev/tty5 2>&1 \
# | chroot /target tee /var/log/athena-install.log > /dev/tty5
sleep 5
-chroot_cleanup
chvt 1
