[d-i-commits] r32083 - in trunk/packages/rootskel: debian src/lib/debian-installer-startup.d

[Colin Watson]

Author: cjwatson
Date: 2005-11-15 17:52:42 +0000 (Tue, 15 Nov 2005)
New Revision: 32083

Modified:
   trunk/packages/rootskel/debian/changelog
   trunk/packages/rootskel/src/lib/debian-installer-startup.d/S05acpi-linux-x86
Log:
* Discard stderr when trying to load fan and thermal, to avoid noise on
  machines without those devices.

Modified: trunk/packages/rootskel/debian/changelog
===================================================================
--- trunk/packages/rootskel/debian/changelog	2005-11-15 15:12:37 UTC (rev 32082)
+++ trunk/packages/rootskel/debian/changelog	2005-11-15 17:52:42 UTC (rev 32083)
@@ -7,6 +7,8 @@
   [ Colin Watson ]
   * src/lib/debian-installer/init-udev-devices: Skip creating devices and
     directories if they already exist.
+  * Discard stderr when trying to load fan and thermal, to avoid noise on
+    machines without those devices.
 
   [ Sven Luther ]
   * Adapted to chrp_rs6k -> chrp_ibm transition.

Modified: trunk/packages/rootskel/src/lib/debian-installer-startup.d/S05acpi-linux-x86
===================================================================
--- trunk/packages/rootskel/src/lib/debian-installer-startup.d/S05acpi-linux-x86	2005-11-15 15:12:37 UTC (rev 32082)
+++ trunk/packages/rootskel/src/lib/debian-installer-startup.d/S05acpi-linux-x86	2005-11-15 17:52:42 UTC (rev 32083)
@@ -1,4 +1,4 @@
 # Load acpi fan and thermal modules if available, to avoid machine
 # overheating.
-modprobe fan >/dev/null || true
-modprobe thermal >/dev/null || true
+modprobe fan >/dev/null 2>&1 || true
+modprobe thermal >/dev/null 2>&1 || true