From c74bbf6e596fcc87df5f1ee995504c3111a0a5ac Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 22 Feb 2007 15:49:01 +0000 Subject: [PATCH] udev-start,shop.sh now work with any shell Package-Manager: portage-2.1.2-r10 --- sys-fs/udev/ChangeLog | 6 +++- sys-fs/udev/Manifest | 34 +++++++----------- sys-fs/udev/files/udev-start-104-r12.sh | 47 ++++++++++++------------- sys-fs/udev/files/udev-stop-104-r8.sh | 22 ++++++------ 4 files changed, 51 insertions(+), 58 deletions(-) diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 749e958e9f10..24a247c111d1 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # 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.267 2007/02/20 10:28:41 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.268 2007/02/22 15:49:01 uberlord Exp $ + + 22 Feb 2007; Roy Marples + files/udev-start-104-r12.sh, files/udev-stop-104-r8.sh: + udev-start,shop.sh now work with any shell *udev-104-r12 (20 Feb 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index b1ffbc31b247..1052a5dbb406 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 @@ -121,10 +118,10 @@ AUX udev-start-104-r10.sh 4038 RMD160 4c7c5c1b10cd12cf2f200a4e73b4a98526bfd895 S MD5 76bf49a5afa3324d6ae49eba6e7229b2 files/udev-start-104-r10.sh 4038 RMD160 4c7c5c1b10cd12cf2f200a4e73b4a98526bfd895 files/udev-start-104-r10.sh 4038 SHA256 a939dfeaf281119423230d640df21fc9821eb3a762a2069c55d430a3d4f717bc files/udev-start-104-r10.sh 4038 -AUX udev-start-104-r12.sh 4252 RMD160 e597fde87161bd7577e2d8715324d318a65dfdfc SHA1 fedd5cb8bd1c2740c917eca8cd6aa403475d1e2f SHA256 912bb0296c2217ae70004d74588de197f466093716b2984fcc23301c19b60111 -MD5 1527481631fb9431905bb75cd9577a9e files/udev-start-104-r12.sh 4252 -RMD160 e597fde87161bd7577e2d8715324d318a65dfdfc files/udev-start-104-r12.sh 4252 -SHA256 912bb0296c2217ae70004d74588de197f466093716b2984fcc23301c19b60111 files/udev-start-104-r12.sh 4252 +AUX udev-start-104-r12.sh 4251 RMD160 576db5d8b2e7c2b8753e0544e3c8506525b54fc3 SHA1 947b877218438f99aeb2227927578847006be2a7 SHA256 45ebbd670f439ae92da9f311488ba6382ca174c429a32cdb163f07083b091be5 +MD5 7e7ec7b4c208e51dab865a791edc4b83 files/udev-start-104-r12.sh 4251 +RMD160 576db5d8b2e7c2b8753e0544e3c8506525b54fc3 files/udev-start-104-r12.sh 4251 +SHA256 45ebbd670f439ae92da9f311488ba6382ca174c429a32cdb163f07083b091be5 files/udev-start-104-r12.sh 4251 AUX udev-start-104-r5.sh 3987 RMD160 026f1df381f26e84bab116b84bc86728e96901d4 SHA1 9aba68a0bc3cec3ba19c5193c23fee9c3286d60d SHA256 0dc871d20caa16622b61fb988a0e65064efa96192f7fa078d585d1361b222823 MD5 7078fc6867da38a73c6fecc643fc85c2 files/udev-start-104-r5.sh 3987 RMD160 026f1df381f26e84bab116b84bc86728e96901d4 files/udev-start-104-r5.sh 3987 @@ -133,10 +130,10 @@ AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d files/udev-start.sh 2460 -AUX udev-stop-104-r8.sh 3202 RMD160 3f52744956f6fbee8c70320e2e32542d8511e976 SHA1 344dea9dc9d21e332f6903ff66f1322615ca9770 SHA256 82169e891de6a952a46124f9a3c9cebb2982613173b3b259e4e37ee5b7d74a09 -MD5 ca852c634997ff81c700b0c76aa0bda5 files/udev-stop-104-r8.sh 3202 -RMD160 3f52744956f6fbee8c70320e2e32542d8511e976 files/udev-stop-104-r8.sh 3202 -SHA256 82169e891de6a952a46124f9a3c9cebb2982613173b3b259e4e37ee5b7d74a09 files/udev-stop-104-r8.sh 3202 +AUX udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e SHA1 78ec2b84513e9acba286dd5abb95e21f6d54d999 SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c +MD5 cbc06136105b520864575794e0dc3de7 files/udev-stop-104-r8.sh 3208 +RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e files/udev-stop-104-r8.sh 3208 +SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c files/udev-stop-104-r8.sh 3208 AUX udev-stop.sh 2158 RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 SHA1 6d918052006403d0fe1ab34041e36581cdeddcd4 SHA256 bb4fad16e3b58707565d9bb6652c94d917378dc0c462fd660957e17860313429 MD5 b73dfbd0300c444f047f77914ca1c956 files/udev-stop.sh 2158 RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 files/udev-stop.sh 2158 @@ -311,10 +308,10 @@ EBUILD udev-104-r9.ebuild 9216 RMD160 d022e7088ec4526f76fed85971ee66779b6ae547 S MD5 d5f8b36e305c0d8c7647b5aae1b619ed udev-104-r9.ebuild 9216 RMD160 d022e7088ec4526f76fed85971ee66779b6ae547 udev-104-r9.ebuild 9216 SHA256 546534c95123130045723adb5fda371697713c95a016349eb99ae3b5a7d5831b udev-104-r9.ebuild 9216 -MISC ChangeLog 49351 RMD160 beb6ab26c19c0f96b2574546f3fff467f3d06601 SHA1 6eef1e77cea13d16f646d847ad51e22d6cbba2fb SHA256 c506cd508b541776cd929e0a55ea51841bb5f4c18e62f91685d18c51f747dd4a -MD5 a093afc5b815e517a0f48c6ab1496d2d ChangeLog 49351 -RMD160 beb6ab26c19c0f96b2574546f3fff467f3d06601 ChangeLog 49351 -SHA256 c506cd508b541776cd929e0a55ea51841bb5f4c18e62f91685d18c51f747dd4a ChangeLog 49351 +MISC ChangeLog 49508 RMD160 2387f1840e2a30ecf9cd7d62f28324571db66b87 SHA1 58fce4c7b42e83befd4254f5b34c67e59d733bc7 SHA256 3ee717e09ea7798791603a6ca9757101ba3c62ec4e962818346589400cfa4f81 +MD5 1290051275fce95007309b88123c26d7 ChangeLog 49508 +RMD160 2387f1840e2a30ecf9cd7d62f28324571db66b87 ChangeLog 49508 +SHA256 3ee717e09ea7798791603a6ca9757101ba3c62ec4e962818346589400cfa4f81 ChangeLog 49508 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -367,10 +364,3 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r9 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r9 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r9 229 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF27KC8bi6rjpTunYRAqPSAKDjwP74o44YPZwZbva8Hfu4mwry2wCg0+0j -Qz9oHB+Eu9qZnqJfqst3DQk= -=nGX0 ------END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/udev-start-104-r12.sh b/sys-fs/udev/files/udev-start-104-r12.sh index f0aa0a624ef6..7c9a8b26ae9c 100644 --- a/sys-fs/udev/files/udev-start-104-r12.sh +++ b/sys-fs/udev/files/udev-start-104-r12.sh @@ -15,10 +15,10 @@ populate_udev() { # tell modprobe.sh to be verbose to $CONSOLE echo CONSOLE=${CONSOLE} > /dev/.udev_populate - if [ $(get_KV) -gt "$(KV_to_int '2.6.14')" ] ; then + if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then ebegin "Populating /dev with existing devices through uevents" local opts= - [[ ${RC_COLDPLUG} != "yes" && $(udev_version) -ge "96" ]] && \ + [ ${RC_COLDPLUG} != "yes" ] && [ $(udev_version) -ge 96 ] && \ opts="--attr-match=dev" /sbin/udevtrigger ${opts} eend $? @@ -45,19 +45,19 @@ seed_dev() { # if /dev/console is missing on root-partition, # kernel could not open it and we need to do that for # udevd (Bug #151414) - mknod /dev/console c 5 1 + [ ! -c /dev/console ] && mknod /dev/console c 5 1 # creating /dev/tty1 as it is used by bootsplash # (to allow us to write to $CONSOLE before udev has # created it) - mknod /dev/tty1 c 4 1 + [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 # udevd will dup its stdin/stdout/stderr to /dev/null # and we do not want a file which gets buffered in ram - mknod /dev/null c 1 3 + [ ! -c /dev/null ] && mknod /dev/null c 1 3 # copy over any persistant things - if [[ -d /lib/udev/devices ]] ; then + if [ -d /lib/udev/devices ] ; then cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null fi @@ -66,35 +66,34 @@ seed_dev() { ln -snf fd/0 /dev/stdin ln -snf fd/1 /dev/stdout ln -snf fd/2 /dev/stderr - [[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core + [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core # Create problematic directories - mkdir -p /dev/{pts,shm} + mkdir -p /dev/pts /dev/shm eend 0 } main() { # check if /dev/console exists outside tmpfs - [[ -c /dev/console ]] ; local need_redirect=$? + [ -c /dev/console ] ; local need_redirect=$? # Setup temporary storage for /dev ebegin "Mounting /dev for udev" - if [[ ${RC_USE_FSTAB} == "yes" ]] ; then + if [ "${RC_USE_FSTAB}" = "yes" ] ; then mntcmd=$(get_mount_fstab /dev) else unset mntcmd fi - if [[ -n ${mntcmd} ]] ; then + if [ -n "${mntcmd}" ] ; then try mount -n ${mntcmd} else - # This is bash only, but saves on using grep - if [[ $( /selinux/null + if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then + restorecon /dev > /selinux/null fi # Actually get udev rolling - if [[ ${RC_DEVICE_TARBALL} == "yes" && \ - -s /lib/udev/state/devices.tar.bz2 ]] ; then + if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ + [ -s /lib/udev/state/devices.tar.bz2 ] ; then ebegin "Populating /dev with saved device nodes" try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev eend $? @@ -119,10 +118,10 @@ main() { seed_dev # Setup hotplugging (if possible) - if [[ -e /proc/sys/kernel/hotplug ]] ; then + if [ -e /proc/sys/kernel/hotplug ] ; then ebegin "Setting up proper hotplug agent" eindent - if [[ $(get_KV) -gt $(KV_to_int '2.6.14') ]] ; then + if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then einfo "Using netlink for hotplug events..." echo "" > /proc/sys/kernel/hotplug else @@ -134,7 +133,7 @@ main() { fi ebegin "Starting udevd" - if [[ ${need_redirect} == 1 ]]; then + if [ ${need_redirect} -eq 1 ]; then # we need to open fds 0 1 2 to solve Bug #151414 /sbin/udevd --daemon /dev/console 2>/dev/console else @@ -146,11 +145,11 @@ main() { # Create nodes that udev can't ebegin "Finalizing udev configuration" - [[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null - [[ -x /sbin/lvm ]] && \ + [ -x /sbin/dmsetup ] && /sbin/dmsetup mknodes &>/dev/null + [ -x /sbin/lvm ] && \ /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null # Running evms_activate on a LiveCD causes lots of headaches - [[ -z ${CDBOOT} ]] && [[ -x /sbin/evms_activate ]] && \ + [ -z "${CDBOOT}" ] && [ -x /sbin/evms_activate ] && \ /sbin/evms_activate -q &>/dev/null eend 0 } diff --git a/sys-fs/udev/files/udev-stop-104-r8.sh b/sys-fs/udev/files/udev-stop-104-r8.sh index 13a9f746a765..5c84e93a5bfa 100755 --- a/sys-fs/udev/files/udev-stop-104-r8.sh +++ b/sys-fs/udev/files/udev-stop-104-r8.sh @@ -19,7 +19,7 @@ store_persistent_rules() { tmp_rules=/dev/.udev/tmp-rules--${base} real_rules=/etc/udev/rules.d/${base} - if [[ -f ${tmp_rules} ]]; then + if [ -f ${tmp_rules} ]; then einfo "Saving udev persistent ${type} rules to /etc/udev/rules.d" cat ${tmp_rules} >> ${real_rules} rm ${tmp_rules} @@ -30,8 +30,8 @@ store_persistent_rules() { main() { store_persistent_rules - if [[ -e /dev/.devfsd || ! -e /dev/.udev || ! -z ${CDBOOT} || \ - ${RC_DEVICE_TARBALL} != "yes" ]] || \ + if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ + [ "${RC_DEVICE_TARBALL}" != "yes" ] || \ ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null then return 0 @@ -50,22 +50,20 @@ main() { touch "${devices_udev}" "${devices_real}" \ "${devices_totar}" "${device_tarball}" - if [[ ! ( -f ${devices_udev} && -f ${devices_real} && \ - -f ${devices_totar} && -f ${device_tarball} ) ]] ; then - eend 1 "Could not create temporary files!" - else + if [ -f ${devices_udev} ] && [ -f ${devices_real} ] && \ + [ -f ${devices_totar} ] && [ -f ${device_tarball} ] ; then cd /dev # Find all devices find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \ "${devices_real}" # Figure out what udev created eval $(grep '^[[:space:]]*udev_db=' /etc/udev/udev.conf) - if [[ -d ${udev_db} ]]; then + if [ -d ${udev_db} ]; then # New udev_db is clear text ... udevinfo=$(cat "${udev_db}"/*) else # if no udev_db - if [[ $(udev_version) -ge "104" ]]; then + if [ $(udev_version) -ge 104 ]; then udevinfo=$(udevinfo --export-db) else # Old one is not ... @@ -85,7 +83,7 @@ main() { for x in MAKEDEV core fd initctl pts shm stderr stdin stdout; do echo "${x}" >> "${devices_udev}" done - if [[ -d /lib/udev/devices ]]; then + if [ -d /lib/udev/devices ]; then cd /lib/udev/devices find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}" fi @@ -94,7 +92,7 @@ main() { grep -v ^\\.udev > "${devices_totar}" # Now only tarball those not created by udev if we have any - if [[ -s ${devices_totar} ]]; then + if [ -s ${devices_totar} ]; then # we dont want to descend into mounted filesystems (e.g. devpts) # looking up username may involve NIS/network, and net may be down tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" @@ -103,6 +101,8 @@ main() { rm -f /lib/udev/state/devices.tar.bz2 fi eend 0 + else + eend 1 "Could not create temporary files!" fi rm -rf "${save_tmp_base}" -- 2.26.2