From c691361ecb9771624d3da257b80c16707f311576 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 14 Mar 2007 13:47:37 +0000 Subject: [PATCH] Remove bashisms from modprobe.sh Package-Manager: portage-2.1.2.2 --- sys-fs/udev/ChangeLog | 5 ++++- sys-fs/udev/Manifest | 26 ++++++++------------------ sys-fs/udev/files/modprobe-105.sh | 6 +++--- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 43fa11e1381e..dcf321db1760 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.282 2007/03/13 18:59:45 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.283 2007/03/14 13:47:37 uberlord Exp $ + + 14 Mar 2007; Roy Marples files/modprobe-105.sh: + Remove bashisms from modprobe.sh *udev-106-r3 (13 Mar 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 6d5bf2e0b371..412a2fa4777b 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288 @@ -25,10 +22,10 @@ AUX modprobe-104-r12.sh 827 RMD160 99d2f95331b57412596d402798aeb269d8c2c3da SHA1 MD5 fa41f3306fe915917a496c9b6e263112 files/modprobe-104-r12.sh 827 RMD160 99d2f95331b57412596d402798aeb269d8c2c3da files/modprobe-104-r12.sh 827 SHA256 3ad266d27d48c0ef7e1281e6b449580427789f4a2bb15970d765c95bc26aec40 files/modprobe-104-r12.sh 827 -AUX modprobe-105.sh 987 RMD160 9fd17fb699be844c5a8d1fc250b318666172d186 SHA1 1194dd72e629ab7556b0b5619c754aef13c89a22 SHA256 2788690c9fd1df39f823c6b5e8219b23afb0499ae846e24598c1a3c4cd918190 -MD5 cc6e7665af2048ba27e542fcc42556fb files/modprobe-105.sh 987 -RMD160 9fd17fb699be844c5a8d1fc250b318666172d186 files/modprobe-105.sh 987 -SHA256 2788690c9fd1df39f823c6b5e8219b23afb0499ae846e24598c1a3c4cd918190 files/modprobe-105.sh 987 +AUX modprobe-105.sh 983 RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 SHA1 de5b95e5d3386e0930e12e7569eac614e0e4a945 SHA256 8a238646dd769481a0c69973b21c5833abdba8cbd98f19c9dee5e45f197b7604 +MD5 0aba148adab1a0f102f2cda3489d15e3 files/modprobe-105.sh 983 +RMD160 946919b0a6c3788207f5e4f4fa7e2c15bf1b66b5 files/modprobe-105.sh 983 +SHA256 8a238646dd769481a0c69973b21c5833abdba8cbd98f19c9dee5e45f197b7604 files/modprobe-105.sh 983 AUX modprobe.sh 749 RMD160 3077b65c67fc65e0c73db658a858cf37ad3c883d SHA1 f3e7a7bb399c8d4af7e6101a8058f707f62d3354 SHA256 7506fdd5ae89e958ff1e3953103c0ce49e2e8c5b242baf2d3f60e709548a969f MD5 667ea7d559b4a4b70673a9c56c672834 files/modprobe.sh 749 RMD160 3077b65c67fc65e0c73db658a858cf37ad3c883d files/modprobe.sh 749 @@ -381,10 +378,10 @@ EBUILD udev-106.ebuild 9197 RMD160 f41a2a34de78690fb114d8d48bea4e4c928724fd SHA1 MD5 e58b973d172923d98c751ec0b29181a5 udev-106.ebuild 9197 RMD160 f41a2a34de78690fb114d8d48bea4e4c928724fd udev-106.ebuild 9197 SHA256 bfb6ea516560a111c00cbd3abf3f8a4a86fa64e8215a66bac9897f24531e29eb udev-106.ebuild 9197 -MISC ChangeLog 52892 RMD160 65ee4b63c2c40c8eeb93cc29804a072311e5a1e4 SHA1 ac31cd723c3afcddf21a85d8b2493d509e5ec81f SHA256 6bda2ed35aec21cf8966528d445ce88de163de0d4e6c669325da5fae9bdb5a71 -MD5 6e2e12c46fde3c7b92f630e2e53ca6aa ChangeLog 52892 -RMD160 65ee4b63c2c40c8eeb93cc29804a072311e5a1e4 ChangeLog 52892 -SHA256 6bda2ed35aec21cf8966528d445ce88de163de0d4e6c669325da5fae9bdb5a71 ChangeLog 52892 +MISC ChangeLog 53004 RMD160 6f5962424d644f47d8b32db2cff87e40e36fdf5c SHA1 38c1a8d1c4ef22bff113a128bf7232f8f48efe1a SHA256 f3151f233b25fccb1b46ee663a1af108954b67a686abc989b4b46c0db8f28a81 +MD5 3aac2f1b374a578cfcf00f9c874e395a ChangeLog 53004 +RMD160 6f5962424d644f47d8b32db2cff87e40e36fdf5c ChangeLog 53004 +SHA256 f3151f233b25fccb1b46ee663a1af108954b67a686abc989b4b46c0db8f28a81 ChangeLog 53004 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -452,10 +449,3 @@ SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/di MD5 973c082873a5b1e461964c9db1753eab files/digest-udev-106-r3 229 RMD160 08bf8737aba13167f8f7c38148b937b767a086e1 files/digest-udev-106-r3 229 SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/digest-udev-106-r3 229 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFF9vS3t2vP6XvVdOcRAuyNAJ46oMc414sPFE2YyuRcLCq3UilF0ACePy4t -akis4etFESZKSEUhcA3Ifkk= -=MCKr ------END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/modprobe-105.sh b/sys-fs/udev/files/modprobe-105.sh index e32ace96a1fb..8f5d9d0778e9 100755 --- a/sys-fs/udev/files/modprobe-105.sh +++ b/sys-fs/udev/files/modprobe-105.sh @@ -5,11 +5,11 @@ if [ -e /dev/.udev_populate ]; then # Enable verbose while called from udev-addon-start - source /dev/.udev_populate + . /dev/.udev_populate if [ -c "${CONSOLE}" ]; then # redirect stdin/out/err - exec <${CONSOLE} &>${CONSOLE} + exec <${CONSOLE} >${CONSOLE} 2>/${CONSOLE} fi fi @@ -37,6 +37,6 @@ fi if ! grep -q "^${MODNAME}[[:space:]]" /proc/modules; then # now do real loading einfo " udev loading module ${MODNAME}" - exec "${MODPROBE}" -q "${@}" &>/dev/null + exec "${MODPROBE}" -q "${@}" fi -- 2.26.2