[26206] in Source-Commits
/svn/athena r25454 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Feb 17 14:10:35 2012
Date: Fri, 17 Feb 2012 14:10:33 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201202171910.q1HJAX0C005086@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-02-17 14:10:33 -0500 (Fri, 17 Feb 2012)
New Revision: 25454
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
Log:
Only remove Realtek NIC firmware requests, not all of them
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2012-02-15 21:04:21 UTC (rev 25453)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2012-02-17 19:10:33 UTC (rev 25454)
@@ -9,7 +9,11 @@
# 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/*
+ # 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
