[26221] in Source-Commits
/svn/athena r25461 - trunk/debathena/scripts/installer/pxe/oneiric/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Mar 28 14:58:21 2012
Date: Wed, 28 Mar 2012 14:58:19 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201203281858.q2SIwJdJ005148@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-03-28 14:58:19 -0400 (Wed, 28 Mar 2012)
New Revision: 25461
Modified:
trunk/debathena/scripts/installer/pxe/oneiric/debathena/installer.sh
Log:
Deploy #1004 Vostro change for Oneiric too
Modified: trunk/debathena/scripts/installer/pxe/oneiric/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/oneiric/debathena/installer.sh 2012-03-26 23:06:27 UTC (rev 25460)
+++ trunk/debathena/scripts/installer/pxe/oneiric/debathena/installer.sh 2012-03-28 18:58:19 UTC (rev 25461)
@@ -1,9 +1,19 @@
#!/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
+ # This will break if the firmware eventually wants to live somewhere else
+ # This is possibly a bad idea if there are r8169-based cards that do need
+ # firmware, but if they do, it's not likely they made it this far in the
+ # installation process.
+ rm -f /dev/.udev/firmware-missing/rtl_nic*
fi
cd /debathena
