JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PATH screws up quite a bit...fix this...

Browse Source 
svn path=/nixpkgs/trunk/; revision=4498
This commit is contained in:
Armijn Hemel 2006-01-05 19:30:22 +00:00
parent f3ee45412f
commit 1674963479
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/hotplug/builder.sh
View File

@ -24,6 +24,11 @@ preBuild() {
mv etc/hotplug/pci.rc.tmp etc/hotplug/pci.rc mv etc/hotplug/pci.rc.tmp etc/hotplug/pci.rc
sed -e "s^@coreutils\@^$coreutils^g" \ sed -e "s^@coreutils\@^$coreutils^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@utillinux\@^$utillinux^g" \
-e "s^@module_init_tools\@^$module_init_tools^g" \
-e "s^@gnused\@^$gnused^g" \
-e "s^@procps\@^$procps^g" \
< etc/hotplug/usb.rc > etc/hotplug/usb.rc.tmp < etc/hotplug/usb.rc > etc/hotplug/usb.rc.tmp
mv etc/hotplug/usb.rc.tmp etc/hotplug/usb.rc mv etc/hotplug/usb.rc.tmp etc/hotplug/usb.rc

4
pkgs/os-specific/linux/hotplug/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, bash, gnused, coreutils}: {stdenv, fetchurl, bash, gnused, coreutils, utillinux, gnugrep, module_init_tools}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hotplug-2004_03_29"; name = "hotplug-2004_03_29";
@ -8,5 +8,5 @@ stdenv.mkDerivation {
md5 = "167bd479a1ca30243c51ca088e0942b3"; md5 = "167bd479a1ca30243c51ca088e0942b3";
}; };
patches = [./hotplug-install-path.patch ./hotplug-install.patch ./hotplug-2004_03_29-bash.patch]; patches = [./hotplug-install-path.patch ./hotplug-install.patch ./hotplug-2004_03_29-bash.patch];
inherit bash gnused coreutils; inherit bash gnused coreutils utillinux gnugrep module_init_tools;
} }

16
pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch
View File

@ -55,7 +55,7 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/pci.rc hotplug-2004_03_29.new/etc/hotpl
;; ;;
status) status)
- echo $"PCI Status for kernel: " `uname -srm` - echo $"PCI Status for kernel: " `uname -srm`
+ echo $"PCI Status for kernel: " `@coreutils@/bin/uname -srm` + echo $"PCI Status for kernel: " `@coreutils/bin/uname -srm`
echo '' echo ''
if [ -f /proc/bus/pci/devices ]; then if [ -f /proc/bus/pci/devices ]; then
@ -79,8 +79,18 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/tape.permissions hotplug-2004_03_29.new
# #
diff -ruN hotplug-2004_03_29/etc/hotplug/usb.rc hotplug-2004_03_29.new/etc/hotplug/usb.rc 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/etc/hotplug/usb.rc 2004-03-29 21:34:30.000000000 +0200
+++ hotplug-2004_03_29.new/etc/hotplug/usb.rc 2006-01-05 18:51:06.000000000 +0100 +++ hotplug-2004_03_29.new/etc/hotplug/usb.rc 2006-01-05 20:26:21.000000000 +0100
@@ -331,7 +331,7 @@ @@ -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 @@
maybe_stop_usb maybe_stop_usb
;; ;;
status) status)