From 1399888c50d009a0efedab905655fed46ba7f7d9 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 23:00:07 +0000
Subject: [PATCH] remove another impurity (/bin/rm -> $coreutils/bin/rm)

svn path=/nixpkgs/trunk/; revision=4512
---
 .../linux/hotplug/hotplug-2004_03_29.patch    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29.patch b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29.patch
index 393ddd5fe4b6..cb3e4c1dbe92 100644
--- a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29.patch
+++ b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29.patch
@@ -106,7 +106,7 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/tape.permissions hotplug-2004_03_29.new
  #
 diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/hotplug/usb.agent
 --- hotplug-2004_03_29/etc/hotplug/usb.agent	2004-03-26 23:36:38.000000000 +0100
-+++ hotplug-2004_03_29.new/etc/hotplug/usb.agent	2006-01-07 23:10:53.000000000 +0100
++++ hotplug-2004_03_29.new/etc/hotplug/usb.agent	2006-01-07 23:59:02.000000000 +0100
 @@ -143,7 +143,7 @@
      if [ ! -f $SYSFS/$DEVPATH/bNumConfigurations ]; then
  	exit 0
@@ -167,7 +167,7 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/ho
  fi
  export REMOVER
  
-@@ -365,7 +365,7 @@
+@@ -365,13 +365,13 @@
  
      FOUND=false
      if [ -f $SYSFS/$DEVPATH/manufacturer ]; then
@@ -176,6 +176,22 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/ho
      else
  	LABEL="USB product $PRODUCT"
      fi
+ 
+     if [ -e "$REMOVER" ]; then
+-	rm -f "$REMOVER"
++	@coreutils@/bin/rm -f "$REMOVER"
+     fi
+ 
+     # on 2.4 systems, modutils 2.4.2+ maintains MAP_CURRENT
+@@ -430,7 +430,7 @@
+     if [ -x $REMOVER ]; then
+ 	$REMOVER
+     fi
+-    rm -f $REMOVER
++    @coreutils@/bin/rm -f $REMOVER
+ 
+     if [ -x /usr/sbin/updfstab ]; then
+         /usr/sbin/updfstab
 diff -ruN hotplug-2004_03_29/etc/hotplug/usb.rc hotplug-2004_03_29.new/etc/hotplug/usb.rc
 --- hotplug-2004_03_29/etc/hotplug/usb.rc	2004-03-29 21:34:30.000000000 +0200
 +++ hotplug-2004_03_29.new/etc/hotplug/usb.rc	2006-01-07 23:10:53.000000000 +0100