JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1399888c50
nixpkgs/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29.patch

244 lines
9.0 KiB
Diff
Raw Normal View History

patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
diff -ruN hotplug-2004_03_29/etc/hotplug/dasd.agent hotplug-2004_03_29.new/etc/hotplug/dasd.agent
--- hotplug-2004_03_29/etc/hotplug/dasd.agent 2002-08-08 12:05:17.000000000 +0200
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/dasd.agent 2006-01-07 23:10:53.000000000 +0100
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
#
# Dasd hotplug policy agent for Linux 2.4 kernels
#
diff -ruN hotplug-2004_03_29/etc/hotplug/dasd.permissions hotplug-2004_03_29.new/etc/hotplug/dasd.permissions
--- hotplug-2004_03_29/etc/hotplug/dasd.permissions 2002-08-08 11:53:23.000000000 +0200
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/dasd.permissions 2006-01-07 23:10:53.000000000 +0100
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
#
# Copyright (c) 2002 SuSE Linux AG, Nuremberg
#
@@ -27,4 +27,4 @@
*)
die "dasd_permissions: don't know what permissions to give $NODE-$MAJOR-$MINOR-$MISC"
esac
-}
\ No newline at end of file
+}
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
diff -ruN hotplug-2004_03_29/etc/hotplug/hotplug.functions hotplug-2004_03_29.new/etc/hotplug/hotplug.functions
--- hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-03-29 21:25:59.000000000 +0200
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/hotplug.functions 2006-01-07 23:15:07.000000000 +0100
@@ -11,9 +11,9 @@
#
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
# DEBUG=yes; export DEBUG
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
-PATH=/bin:/sbin:/usr/sbin:/usr/bin
+#PATH=/bin:/sbin:/usr/sbin:/usr/bin
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
-KERNEL=`uname -r`
argh, substitute the right way svn path=/nixpkgs/trunk/; revision=4497
2006-01-05 18:18:41 +00:00
+KERNEL=`@coreutils@/bin/uname -r`
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
MODULE_DIR=/lib/modules/$KERNEL
HOTPLUG_DIR=/etc/hotplug
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
@@ -22,10 +22,10 @@
. /etc/sysconfig/hotplug
fi
-if [ -x /usr/bin/logger ]; then
- LOGGER=/usr/bin/logger
-elif [ -x /bin/logger ]; then
- LOGGER=/bin/logger
+if [ -x @utillinux@/bin/logger ]; then
+ LOGGER=@utillinux@/bin/logger
+#elif [ -x /bin/logger ]; then
+ #LOGGER=/bin/logger
else
unset LOGGER
fi
@@ -38,7 +38,7 @@
}
else
mesg () {
- $LOGGER -t $(basename $0)"[$$]" "$@"
+ $LOGGER -t $(@coreutils@/bin/basename $0)"[$$]" "$@"
}
fi
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
diff -ruN hotplug-2004_03_29/etc/hotplug/input.rc hotplug-2004_03_29.new/etc/hotplug/input.rc
--- hotplug-2004_03_29/etc/hotplug/input.rc 2004-03-26 23:34:34.000000000 +0100
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/input.rc 2006-01-07 23:10:53.000000000 +0100
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
@@ -119,7 +119,7 @@
: not supported currently
;;
status)
- echo $"INPUT status for kernel: " `uname -srm`
+ echo $"INPUT status for kernel: " `@coreutils@/bin/uname -srm`
echo ''
echo "INPUT devices:"
diff -ruN hotplug-2004_03_29/etc/hotplug/pci.rc hotplug-2004_03_29.new/etc/hotplug/pci.rc
--- hotplug-2004_03_29/etc/hotplug/pci.rc 2004-03-26 23:34:24.000000000 +0100
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/pci.rc 2006-01-07 23:10:53.000000000 +0100
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
@@ -70,7 +70,7 @@
# echo $"pci stop -- ignored"
;;
status)
- echo $"PCI Status for kernel: " `uname -srm`
PATH screws up quite a bit...fix this... svn path=/nixpkgs/trunk/; revision=4498
2006-01-05 19:30:22 +00:00
+ echo $"PCI Status for kernel: " `@coreutils/bin/uname -srm`
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
echo ''
if [ -f /proc/bus/pci/devices ]; then
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
diff -ruN hotplug-2004_03_29/etc/hotplug/tape.agent hotplug-2004_03_29.new/etc/hotplug/tape.agent
--- hotplug-2004_03_29/etc/hotplug/tape.agent 2002-10-10 15:43:24.000000000 +0200
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/tape.agent 2006-01-07 23:10:53.000000000 +0100
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
###############################################################################
# Tape hotplug agent for Linux 2.4 kernels
#
diff -ruN hotplug-2004_03_29/etc/hotplug/tape.permissions hotplug-2004_03_29.new/etc/hotplug/tape.permissions
--- hotplug-2004_03_29/etc/hotplug/tape.permissions 2002-10-08 13:09:14.000000000 +0200
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/tape.permissions 2006-01-07 23:10:53.000000000 +0100
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
#
# Copyright (c) 2002 IBM Development Germany, Boeblingen
#
more path fixes... svn path=/nixpkgs/trunk/; revision=4499
2006-01-05 19:39:31 +00:00
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
remove another impurity (/bin/rm -> $coreutils/bin/rm) svn path=/nixpkgs/trunk/; revision=4512
2006-01-07 23:00:07 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/usb.agent 2006-01-07 23:59:02.000000000 +0100
last pathfix...for now... svn path=/nixpkgs/trunk/; revision=4500
2006-01-05 19:45:06 +00:00
@@ -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
more path fixes... svn path=/nixpkgs/trunk/; revision=4499
2006-01-05 19:39:31 +00:00
@@ -174,10 +174,10 @@
# work around 2.2.early brokenness
# munges the usb_bcdDevice such that it is a integer rather
# than a float: e.g. 1.0 become 0100
- PRODUCT=`echo $PRODUCT | sed -e "s+\.\([0-9]\)$+.\10+" -e "s/\.$/00/" \
+ PRODUCT=`echo $PRODUCT | @gnused@/bin/sed -e "s+\.\([0-9]\)$+.\10+" -e "s/\.$/00/" \
-e "s+/\([0-9]\)\.\([0-9][0-9]\)+/0\1\2+" \
-e "s+/\([0-9][0-9]\)\.\([0-9][0-9]\)+/\1\2+"`
- set $(echo $PRODUCT | sed -e 's+\([^/]*\)/\([^/]*\)/\(.*\)+\1 \2 \3+')
+ set $(echo $PRODUCT | @gnused@/bin/sed -e 's+\([^/]*\)/\([^/]*\)/\(.*\)+\1 \2 \3+')
usb_idVendor=$((0x$1))
usb_idProduct=$((0x$2))
usb_bcdDevice=$((0x$3))
last pathfix...for now... svn path=/nixpkgs/trunk/; revision=4500
2006-01-05 19:45:06 +00:00
@@ -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
more path fixes... svn path=/nixpkgs/trunk/; revision=4499
2006-01-05 19:39:31 +00:00
@@ -340,9 +340,9 @@
# remover, or that the remove action can use to execute a remover.
#
if [ "$DEVICE" = "" ]; then
- REMOVER=/var/run/usb/`echo "$INTERFACE/$PRODUCT/$TYPE" | sed -e 's;/;%;g'`
+ REMOVER=/var/run/usb/`echo "$INTERFACE/$PRODUCT/$TYPE" | @gnused@/bin/sed -e 's;/;%;g'`
else
- REMOVER=/var/run/usb/`echo $DEVICE | sed -e 's;/;%;g'`
+ REMOVER=/var/run/usb/`echo $DEVICE | @gnused@/bin/sed -e 's;/;%;g'`
fi
export REMOVER
remove another impurity (/bin/rm -> $coreutils/bin/rm) svn path=/nixpkgs/trunk/; revision=4512
2006-01-07 23:00:07 +00:00
@@ -365,13 +365,13 @@
last pathfix...for now... svn path=/nixpkgs/trunk/; revision=4500
2006-01-05 19:45:06 +00:00
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
remove another impurity (/bin/rm -> $coreutils/bin/rm) svn path=/nixpkgs/trunk/; revision=4512
2006-01-07 23:00:07 +00:00
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
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
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
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug/usb.rc 2006-01-07 23:10:53.000000000 +0100
PATH screws up quite a bit...fix this... svn path=/nixpkgs/trunk/; revision=4498
2006-01-05 19:30:22 +00:00
@@ -19,7 +19,8 @@
# system console can't be removed by accident.
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+#PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=@coreutils@/bin:@gnugrep@/bin:@utillinux@/bin:@module_init_tools@/sbin:@gnused@/bin:@procps@/bin
unset I_WANT_A_BROKEN_PS
PS_PERSONALITY=linux
@@ -331,7 +332,7 @@
apparently uname is used in a few more scripts. Expect more updates to this package, since it is rather keen on hardcoded paths, also to configuration information and where it can find scripts. However, testing has to be done on NixOS, making the process a bit slow...ish... svn path=/nixpkgs/trunk/; revision=4496
2006-01-05 17:55:52 +00:00
maybe_stop_usb
;;
status)
- echo $"USB Status for kernel: " `uname -srm`
+ echo $"USB Status for kernel: " `@coreutils@/bin/uname -srm`
echo ''
if [ -f /proc/bus/usb/devices ]; then
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
diff -ruN hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug hotplug-2004_03_29.new/etc/hotplug.d/default/default.hotplug
--- hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug 2004-03-26 23:34:34.000000000 +0100
rename a patch (we patch a lot more than the location of bash) and fix another location... svn path=/nixpkgs/trunk/; revision=4510
2006-01-07 22:16:37 +00:00
+++ hotplug-2004_03_29.new/etc/hotplug.d/default/default.hotplug 2006-01-07 23:10:53.000000000 +0100
patch hotplug so we won't need /bin/bash. I'm not sure how free of bashisms these scripts are, so using /bin/sh instead is no option... svn path=/nixpkgs/trunk/; revision=4492
2006-01-05 16:31:29 +00:00
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@bash@/bin/bash
#
# This version of /sbin/hotplug should works on most GNU/Linux systems
# using Linux 2.2.18+ or 2.4.* kernels. On 2.2.*, only USB has such
hotplug uses some tools from gnused and coreutils svn path=/nixpkgs/trunk/; revision=4493
2006-01-05 17:38:12 +00:00
@@ -32,7 +32,7 @@
# DEBUG=yes export DEBUG
-debug_mesg "arguments ($*) env (`env`)"
use the right path for env svn path=/nixpkgs/trunk/; revision=4495
2006-01-05 17:45:15 +00:00
+debug_mesg "arguments ($*) env (`@coreutils@/bin/env`)"
hotplug uses some tools from gnused and coreutils svn path=/nixpkgs/trunk/; revision=4493
2006-01-05 17:38:12 +00:00
#
# Only one required argument: event type type being dispatched.
@@ -47,7 +47,7 @@
AGENTS=""
for AGENT in /etc/hotplug/*.agent ; do
- TYPE=`basename $AGENT | sed s/.agent//`
+ TYPE=`@coreutils@/bin/basename $AGENT | @gnused@/bin/sed s/.agent//`
if [ -x $AGENT ]; then
AGENTS="$AGENTS $TYPE"
else
Reference in New Issue Copy Permalink