diff --git a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch index 8d072d702c4f..72a7466c7e58 100644 --- a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch +++ b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch @@ -79,7 +79,16 @@ 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-05 20:38:35.000000000 +0100 ++++ hotplug-2004_03_29.new/etc/hotplug/usb.agent 2006-01-05 20:44:40.000000000 +0100 +@@ -143,7 +143,7 @@ + if [ ! -f $SYSFS/$DEVPATH/bNumConfigurations ]; then + exit 0 + fi +- TMP=$(cat $SYSFS/$DEVPATH/bNumConfigurations) ++ TMP=$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bNumConfigurations) + if [ $TMP -ne 1 -a "$ACTION" = add ]; then + mesg Keeping default configuration with $SYSFS/$DEVPATH + fi @@ -174,10 +174,10 @@ # work around 2.2.early brokenness # munges the usb_bcdDevice such that it is a integer rather @@ -93,6 +102,32 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/ho usb_idVendor=$((0x$1)) usb_idProduct=$((0x$2)) usb_bcdDevice=$((0x$3)) +@@ -190,9 +190,9 @@ + usb_bDeviceProtocol=$3 + IFS="$DEFAULT_IFS" + elif [ -r $SYSFS/$DEVPATH/bDeviceClass ]; then +- usb_bDeviceClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceClass))) +- usb_bDeviceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceSubClass))) +- usb_bDeviceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bDeviceProtocol))) ++ usb_bDeviceClass=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bDeviceClass))) ++ usb_bDeviceSubClass=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bDeviceSubClass))) ++ usb_bDeviceProtocol=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bDeviceProtocol))) + else + # out-of-range values + usb_bDeviceClass=1000 +@@ -208,9 +208,9 @@ + usb_bInterfaceProtocol=$3 + IFS="$DEFAULT_IFS" + elif [ -r $SYSFS/$DEVPATH/bInterfaceClass ]; then +- usb_bInterfaceClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceClass))) +- usb_bInterfaceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceSubClass))) +- usb_bInterfaceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceProtocol))) ++ usb_bInterfaceClass=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bInterfaceClass))) ++ usb_bInterfaceSubClass=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bInterfaceSubClass))) ++ usb_bInterfaceProtocol=$((0x$(@coreutils@/bin/cat $SYSFS/$DEVPATH/bInterfaceProtocol))) + else + # out-of-range values + usb_bInterfaceClass=1000 @@ -340,9 +340,9 @@ # remover, or that the remove action can use to execute a remover. # @@ -105,6 +140,15 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/ho fi export REMOVER +@@ -365,7 +365,7 @@ + + FOUND=false + if [ -f $SYSFS/$DEVPATH/manufacturer ]; then +- LABEL="USB `cat $SYSFS/$DEVPATH/manufacturer` `cat $SYSFS/$DEVPATH/product`" ++ LABEL="USB `@coreutils@/bin/cat $SYSFS/$DEVPATH/manufacturer` `@coreutils@/bin/cat $SYSFS/$DEVPATH/product`" + else + LABEL="USB product $PRODUCT" + fi 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-05 20:26:21.000000000 +0100