[Glibc-bsd-commits] r3539 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-06 18:09:37 +0000 (Wed, 06 Jul 2011)
New Revision: 3539

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/022_devd.diff
Log:
022_devd.diff: Remove leftover FreeBSD-specific ACPI devd rules.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-07-06 17:55:33 UTC (rev 3538)
+++ trunk/freebsd-utils/debian/changelog	2011-07-06 18:09:37 UTC (rev 3539)
@@ -3,8 +3,9 @@
   * Add NFS client and server support packages.  (Closes: #629543)
   * Add __FreeBSD_version to CFLAGS.  This enables code in a few places
     that was previously disabled (or old version used instead).
+  * 022_devd.diff: Remove leftover FreeBSD-specific ACPI devd rules.
 
- -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 15:25:38 +0200
+ -- Robert Millan <rmh at debian.org>  Wed, 06 Jul 2011 20:09:13 +0200
 
 freebsd-utils (8.2+ds1-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff	2011-07-06 17:55:33 UTC (rev 3538)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff	2011-07-06 18:09:37 UTC (rev 3539)
@@ -242,11 +242,24 @@
  # Notify all users before beginning emergency shutdown when we get
  # a _CRT or _HOT thermal event and we're going to power down the system
  # very soon.
-@@ -262,55 +69,3 @@
- 	match "subsystem"	"Resume";
- 	action "/etc/rc.resume acpi $notify";
+@@ -249,68 +56,3 @@
+ 	match "type"		"checksum";
+ 	action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'";
  };
 -
+-# User requested suspend, so perform preparation steps and then execute
+-# the actual suspend process.
+-notify 10 {
+-	match "system"		"ACPI";
+-	match "subsystem"	"Suspend";
+-	action "/etc/rc.suspend acpi $notify";
+-};
+-notify 10 {
+-	match "system"		"ACPI";
+-	match "subsystem"	"Resume";
+-	action "/etc/rc.resume acpi $notify";
+-};
+-
 -/* EXAMPLES TO END OF FILE
 -
 -# The following might be an example of something that a vendor might