[26581] in Source-Commits
/svn/athena r25635 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 11 16:58:53 2012
Date: Wed, 11 Jul 2012 16:58:51 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207112058.q6BKwpDM016074@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-11 16:58:51 -0400 (Wed, 11 Jul 2012)
New Revision: 25635
Modified:
trunk/debathena/scripts/installer/install-debathena.beta.sh
Log:
* Cleanup installing.txt
* Abuse dpkg --compare-versions to determine whether to add the reboot=pci
hack or not
Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-07-11 20:27:27 UTC (rev 25634)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-07-11 20:58:51 UTC (rev 25635)
@@ -175,7 +175,8 @@
echo "sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true" |debconf-set-selections
fi
-if [ "$(cat /sys/class/dmi/id/product_name)" = "OptiPlex 790" ]; then
+if [ "$(cat /sys/class/dmi/id/product_name)" = "OptiPlex 790" ] && \
+ dpkg --compare-versions "$(uname -r)" ge 3.2~; then
noacpi=y
if [ "$category" != "cluster" ]; then
echo
@@ -419,6 +420,7 @@
fi
# Post-install cleanup for cluster systems.
+rm installing.txt
if [ "$divertedbg" = "yes" ]; then
rm -f $bgimage
if ! dpkg-divert --rename --remove $bgimage; then
