[26199] in Source-Commits
/svn/athena r25452 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Feb 15 13:13:55 2012
Date: Wed, 15 Feb 2012 13:13:54 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201202151813.q1FIDsDr014033@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-02-15 13:13:53 -0500 (Wed, 15 Feb 2012)
New Revision: 25452
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
Log:
A better solution for the Vostro/r8169 problem.
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2012-02-14 21:34:55 UTC (rev 25451)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2012-02-15 18:13:53 UTC (rev 25452)
@@ -1,9 +1,15 @@
#!/bin/sh
-# Live Poultry Fresh Killed
-if grep -q "^Vostro 320" /sys/class/dmi/id/product_name; then
- echo "Scribbling over check-missing-firmware"
- echo > /bin/check-missing-firmware
+# Sigh. check-missing-firmware is too stupid to reconfigure the NIC after
+# removing and reloading the module. So we lose network in the middle
+# of the install. The card works just fine without firmware, so we
+# just convince hwdetect and friends that there is no missing firmware.
+# NOTE: Although the nic-firmware udeb does not include the Realtek
+# firmware, shipping the firmware ourselves does not fix the problem,
+# because check-missing-firmware still insists on reloading the module
+# and we lose the network configuration.
+if grep -q "^Vostro 320" /sys/class/dmi/id/product_name || lsmod | grep -q r8169; then
+ rm -f /dev/.udev/firmware-missing/*
fi
cd /debathena
