Don't use bashisms in init scripts

Package-Manager: portage-2.1.2-r10

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 436811e24d56e297986ab5796069abda9e603b0a..115cdee4f6ae85a4f0537c084a42937e5337a1ac 100644 (file)
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.40 2007/01/16 23:15:08 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.41 2007/02/23 14:03:08 uberlord Exp $
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/moused.initd,
+  files/nfsmount.initd, files/powerd.initd, files/rarpd.initd,
+  files/syscons.initd, files/syslogd.initd:
+  Don't use bashisms in init scripts.
 
   16 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
   +files/freebsd-usbin-6.2_rc2-libedit-netbsd.patch:

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 5da62e78fb39e9f07f40e5c10e9d79bd63857658..25cb845013526d87a5b6679c8927ef84b8678629 100644 (file)
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freebsd-usbin-6.0-fixmakefiles.patch 691 RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 SHA1 77a29d98fe51c2b848d663a150326baec5e718cc SHA256 d94f8d091ec7eaf75c264ee351b1b6c590297cb99f0c603c5e75672bb6c6c069
 MD5 7158b6024cc0e8c5a8237fcc899e6210 files/freebsd-usbin-6.0-fixmakefiles.patch 691
 RMD160 247fdda9f51068dece3098d1ef01df0e30da7c65 files/freebsd-usbin-6.0-fixmakefiles.patch 691
@@ -25,10 +22,10 @@ AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f
 MD5 820d1c2ee0ee1c6d0c000b333a50001f files/moused.confd 827
 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e files/moused.confd 827
 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e files/moused.confd 827
-AUX moused.initd 1767 RMD160 ecdf0f04fa4501707dca856b225f04c232c3b098 SHA1 8ae87c09f6127735ecaa90a46b2b662021a460e9 SHA256 006d7135984e8c96ddeb6f6b93878d28011aeedcf4c7b8d612b9329565da4f9a
-MD5 c78a687f69b27e116228c1498dd1192b files/moused.initd 1767
-RMD160 ecdf0f04fa4501707dca856b225f04c232c3b098 files/moused.initd 1767
-SHA256 006d7135984e8c96ddeb6f6b93878d28011aeedcf4c7b8d612b9329565da4f9a files/moused.initd 1767
+AUX moused.initd 1783 RMD160 46241b5cf795ad06460e4053f8a76726af70c665 SHA1 02b5c22b7c35439a4c59ddadfd5bb7910cf3cdff SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e
+MD5 83d72d4c7629cf3a70a3ddc2af730392 files/moused.initd 1783
+RMD160 46241b5cf795ad06460e4053f8a76726af70c665 files/moused.initd 1783
+SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e files/moused.initd 1783
 AUX nfs.confd 589 RMD160 6ba14cb8218bf7ea16eb6274885dc92e1a84803c SHA1 6f3e0701c3a5bbaaa341f1744ddddb2ff755d30d SHA256 642ff72e941722b6c235bb4a8c4f8bbb9444866559e65b55032e0206d9a970a5
 MD5 4855fe0bc6e7d9a037631453e024fa20 files/nfs.confd 589
 RMD160 6ba14cb8218bf7ea16eb6274885dc92e1a84803c files/nfs.confd 589
@@ -37,18 +34,18 @@ AUX nfs.initd 5985 RMD160 e42809b0a86e35427b66de4c4bc07d5e95093ff8 SHA1 3c717aca
 MD5 6974742df7e94e46b96bff63413a8d2f files/nfs.initd 5985
 RMD160 e42809b0a86e35427b66de4c4bc07d5e95093ff8 files/nfs.initd 5985
 SHA256 aa071504b3669816d0295456301042224cd6cd820ea85167d85a12aab2ffa2d2 files/nfs.initd 5985
-AUX nfsmount.initd 1633 RMD160 506a8ebcacb67048e47c0045afa643aa806c97c3 SHA1 42599989ad164a4de9c7cdeb89d1d7cf68c0fbf0 SHA256 c4884ca48e253ffcf3bac07a09191d96105a06e2adcd40157eaddceb16c83210
-MD5 56fd62bf71daa1b6c7ad86383429bc5b files/nfsmount.initd 1633
-RMD160 506a8ebcacb67048e47c0045afa643aa806c97c3 files/nfsmount.initd 1633
-SHA256 c4884ca48e253ffcf3bac07a09191d96105a06e2adcd40157eaddceb16c83210 files/nfsmount.initd 1633
+AUX nfsmount.initd 1596 RMD160 a54832db1b10f15f8c0b65266deffeef90bc3c52 SHA1 e23b356c798c4a101080718524e505f0f1105da0 SHA256 8b133f58fa1ec085d36871df062b779fdee0f4ee7f8fe2227b5e23b1c15fc7a8
+MD5 dceaac028c9a2318c49b628ddfd0a554 files/nfsmount.initd 1596
+RMD160 a54832db1b10f15f8c0b65266deffeef90bc3c52 files/nfsmount.initd 1596
+SHA256 8b133f58fa1ec085d36871df062b779fdee0f4ee7f8fe2227b5e23b1c15fc7a8 files/nfsmount.initd 1596
 AUX powerd.confd 368 RMD160 4273367b5b1956080d70c300f071ccb7aa614672 SHA1 6cbebc62910ff2d45079f8430d2494ebd7293546 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98
 MD5 49d44524fbab807f81ab22b8e439f78c files/powerd.confd 368
 RMD160 4273367b5b1956080d70c300f071ccb7aa614672 files/powerd.confd 368
 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98 files/powerd.confd 368
-AUX powerd.initd 778 RMD160 5389d68efc0fc8bc7c36a1c5a4203c0ed5ca0676 SHA1 e84a4d800e1b899e2219ac5bd9c43d5051ed645c SHA256 ed8003a8c8c3aa6839d4619539ba717d89487a64280aaa76d2da4f1162762b08
-MD5 093927097eb1b3cfb41163265ba62edf files/powerd.initd 778
-RMD160 5389d68efc0fc8bc7c36a1c5a4203c0ed5ca0676 files/powerd.initd 778
-SHA256 ed8003a8c8c3aa6839d4619539ba717d89487a64280aaa76d2da4f1162762b08 files/powerd.initd 778
+AUX powerd.initd 774 RMD160 650b7f09be40db75e03c086bc70491c2ce18c40d SHA1 89186f3894357b466d438d7b7b23b7f1228058d6 SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03
+MD5 f3118ad1318579ae59646875a87987b1 files/powerd.initd 774
+RMD160 650b7f09be40db75e03c086bc70491c2ce18c40d files/powerd.initd 774
+SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03 files/powerd.initd 774
 AUX pw.conf 179 RMD160 b40103a1c85c1b5e24ad60da82741ee744e46cb8 SHA1 f08952bb60e7c85e676900b277ed51face945a0e SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef
 MD5 990afbd0fae94ba8dc2e77ad70bed008 files/pw.conf 179
 RMD160 b40103a1c85c1b5e24ad60da82741ee744e46cb8 files/pw.conf 179
@@ -57,10 +54,10 @@ AUX rarpd.confd 269 RMD160 de16adb7bd4a7e2deea75fb6ba4d717582e376cf SHA1 b15f515
 MD5 da16b87b1e974c523572a1ab545f8432 files/rarpd.confd 269
 RMD160 de16adb7bd4a7e2deea75fb6ba4d717582e376cf files/rarpd.confd 269
 SHA256 aa45f3085267be17d6549e05c5fbe21c4035b41c620023d76e38537fc82594cb files/rarpd.confd 269
-AUX rarpd.initd 867 RMD160 5f146a5f74688ceea6eaf9d4e089cc0c7e22e3b9 SHA1 4f7a59139807ec8e68be6801baba59a63558e4d4 SHA256 d5df8b6f5ff86a5a201a05ee025a749c21aeb25eb8d27259e8f0b3a433cd30f3
-MD5 543cdfe800cd3620b85859be6ff8bafb files/rarpd.initd 867
-RMD160 5f146a5f74688ceea6eaf9d4e089cc0c7e22e3b9 files/rarpd.initd 867
-SHA256 d5df8b6f5ff86a5a201a05ee025a749c21aeb25eb8d27259e8f0b3a433cd30f3 files/rarpd.initd 867
+AUX rarpd.initd 866 RMD160 edec84e9a30b0ec729515da6b31428eb0cfee23e SHA1 5e9e352319b3309ede30f96b3416a211647cab35 SHA256 3484f19992ae773a43ffad50477072c3bd288fea5f9a5c22a98c323129df49f7
+MD5 42a20ea79f0083bf58b29afce5033940 files/rarpd.initd 866
+RMD160 edec84e9a30b0ec729515da6b31428eb0cfee23e files/rarpd.initd 866
+SHA256 3484f19992ae773a43ffad50477072c3bd288fea5f9a5c22a98c323129df49f7 files/rarpd.initd 866
 AUX rpcbind.initd 716 RMD160 86d0b4b9e1ce8013777624375ddd012b8a86f02d SHA1 9769382e6bb7f3faed5d5c3086ee532896c68f5b SHA256 2f14334ba584acd31306060bd134c0eccd3afa24c61531f93f884ad70a9ee96a
 MD5 059230a505ece20d347b69320df9416b files/rpcbind.initd 716
 RMD160 86d0b4b9e1ce8013777624375ddd012b8a86f02d files/rpcbind.initd 716
@@ -69,14 +66,14 @@ AUX syscons.confd 464 RMD160 c9673b5f9f92443a6afb7276db0f0e163044ac4d SHA1 5b753
 MD5 88a74d774fdf5505022d26aa69a61376 files/syscons.confd 464
 RMD160 c9673b5f9f92443a6afb7276db0f0e163044ac4d files/syscons.confd 464
 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee files/syscons.confd 464
-AUX syscons.initd 1610 RMD160 c744033fc2efd1157cbbc90c3289e652c238d8ac SHA1 ee1c149c3dc3f534105e244e29befd19beb0bc1e SHA256 014af9d58133a730fa0b8b385967e82ad4e3b0ac725964204b3b9743cdbbfdee
-MD5 054ea5a85b03d6742599b45f8fccbf9b files/syscons.initd 1610
-RMD160 c744033fc2efd1157cbbc90c3289e652c238d8ac files/syscons.initd 1610
-SHA256 014af9d58133a730fa0b8b385967e82ad4e3b0ac725964204b3b9743cdbbfdee files/syscons.initd 1610
-AUX syslogd.initd 573 RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f SHA1 22472c0d36f2ddf35cbcf887697de42ad21426aa SHA256 32079c481847728f4cd182a7957edb2cbb21606ecae9dfab2b4f8ceb8ad7a3ac
-MD5 48a59f2d635b32605288394a094e9e0b files/syslogd.initd 573
-RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f files/syslogd.initd 573
-SHA256 32079c481847728f4cd182a7957edb2cbb21606ecae9dfab2b4f8ceb8ad7a3ac files/syslogd.initd 573
+AUX syscons.initd 1709 RMD160 b50db11f6a22b2de368ff6b661630754df6783a7 SHA1 e972b55ec7bbd0d9263c6c61a3f2672a11e33c15 SHA256 1f47620f615478dd23c2f3ba8873b1b4f677d3f0e7d0226a17ed5131a7f0b54a
+MD5 967381e59e0f14e89fde100571a931fd files/syscons.initd 1709
+RMD160 b50db11f6a22b2de368ff6b661630754df6783a7 files/syscons.initd 1709
+SHA256 1f47620f615478dd23c2f3ba8873b1b4f677d3f0e7d0226a17ed5131a7f0b54a files/syscons.initd 1709
+AUX syslogd.initd 571 RMD160 915d4efbd2bac506c162a3fb8c08efc3a97082b7 SHA1 a3200b5973fb0e474fcc9f93709324162a03b679 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005
+MD5 a2fe83ea29696cce25474d027c355f31 files/syslogd.initd 571
+RMD160 915d4efbd2bac506c162a3fb8c08efc3a97082b7 files/syslogd.initd 571
+SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 files/syslogd.initd 571
 DIST freebsd-contrib-6.2.tar.bz2 36594160 RMD160 8b89f1ac72ba0054efe1aec2d747ecd33789fde3 SHA1 02493b8d90b0e1bb4304ce6466203135bf5709b1 SHA256 dbbd9198597e176242806329242d0e12181820a921e5da42aadefaacda1b6277
 DIST freebsd-etc-6.2.tar.bz2 190297 RMD160 1540601566ece689b3fc2935329a2eca62a24314 SHA1 e8337672d0a0d207a9e9674c9f516d8ed94af0cf SHA256 ff5970db1d7842d2933589203ae0c3907dee427b2ea99de68fce678582bf1804
 DIST freebsd-include-6.2.tar.bz2 131651 RMD160 9264ba0661bbdceba85c4bef19a2ebd788ec6957 SHA1 2e36c98dc3b6c1588eb78d5483475bea441a695a SHA256 38928510c34efd735a977896a9f96e71b48c22cf4727677ee954a23aff871d53
@@ -90,10 +87,10 @@ EBUILD freebsd-usbin-6.2.ebuild 5392 RMD160 5ff17c2634e8c2cc5b7b5b037458070175ba
 MD5 8a7bd8730e6436f2bbf6e29f2e706237 freebsd-usbin-6.2.ebuild 5392
 RMD160 5ff17c2634e8c2cc5b7b5b037458070175ba299f freebsd-usbin-6.2.ebuild 5392
 SHA256 1d8a1b2ab32a9c26211fdb1f8cbcc3d0a9217e3b79c82629bcab2175465da210 freebsd-usbin-6.2.ebuild 5392
-MISC ChangeLog 13607 RMD160 1f1d7fe51cc1ba5e46c71e2926e231acef6f5f5f SHA1 69e8f4475580f0521af1c6b8932e0cbd2fe5dc32 SHA256 0c1eefb0b9cdb3da057edab13b3efb2c1de1d18f698ef2411a270bc629634f40
-MD5 3d87967ec5af83e9bace2367b76ea802 ChangeLog 13607
-RMD160 1f1d7fe51cc1ba5e46c71e2926e231acef6f5f5f ChangeLog 13607
-SHA256 0c1eefb0b9cdb3da057edab13b3efb2c1de1d18f698ef2411a270bc629634f40 ChangeLog 13607
+MISC ChangeLog 13824 RMD160 0134c16b8bae2f13ecaf05613fd018574a9953ef SHA1 43819c37b48377bcdef13b8594a0959dec4f66b7 SHA256 06e796d267ff88695206725d927b0f21d440e1ee8bbe8f8f429f6b7426dc3af8
+MD5 e10c134f62acff880fa8ce96b4bdcc3d ChangeLog 13824
+RMD160 0134c16b8bae2f13ecaf05613fd018574a9953ef ChangeLog 13824
+SHA256 06e796d267ff88695206725d927b0f21d440e1ee8bbe8f8f429f6b7426dc3af8 ChangeLog 13824
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -101,10 +98,3 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c0f7f64e7397df601f6a8a035c40721e files/digest-freebsd-usbin-6.2 2322
 RMD160 2c74c614cc5fe32efc4f1a9c9149a6ec49f58c2f files/digest-freebsd-usbin-6.2 2322
 SHA256 75f92c7c16164e2b95abaa8bcf34c259d2b3663bf7dbccf0bc59c64f6032a39e files/digest-freebsd-usbin-6.2 2322
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFrVyEGDyatLGpTbYRAhcxAJ9UOrceoy3hh4wgDBjdi9CvB9oOAwCfXa83
-znd4vh+B5vM97Y3TFGCQF5I=
-=j9aY
------END PGP SIGNATURE-----

diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd
index 19db707f1476539b1dc97987c99585e4b3e6c52f..3ac9a34c9d307afcc2056a5e8e4a7bbc02c26dad 100644 (file)
--- a/sys-freebsd/freebsd-usbin/files/moused.initd
+++ b/sys-freebsd/freebsd-usbin/files/moused.initd
@@ -1,15 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
 
-MOUSED_NAME="${SVCNAME##*.}"
-if [[ -n ${MOUSED_NAME} && ${MOUSED_NAME} != "moused" ]] ; then
-       MOUSED_DEVICE="/dev/${MOUSED_NAME}"
-       MOUSED_PIDFILE="/var/run/moused-${MOUSED_NAME}.pid"
+MOUSED_NAME=${SVCNAME##*.}
+if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then
+       MOUSED_DEVICE=/dev/"${MOUSED_NAME}"
+       MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid
 else
        MOUSED_NAME=
-       MOUSED_PIDFILE="/var/run/moused.pid"
+       MOUSED_PIDFILE=/var/run/moused.pid
 fi
 
 depend() {
@@ -17,13 +17,13 @@ depend() {
 }
 
 start() {
-       ebegin $"Starting the Console Mouse Daemon" "${MOUSED_NAME}"
+       ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}"
 
-       if [[ -z ${MOUSED_DEVICE} ]] ; then
+       if [ -z ${MOUSED_DEVICE} ] ; then
                for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do
-                       if [[ -e ${x} && \
-                       ! -e /var/run/moused-$(basename "${x}").pid ]] ; then
-                               MOUSED_DEVICE="${x}"
+                       if [ -e "${x}" ] && \
+                       [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then
+                               MOUSED_DEVICE=${x}
                                eindent
                                einfo "Using mouse on ${MOUSED_DEVICE}"
                                eoutdent
@@ -32,9 +32,9 @@ start() {
                done
        fi
 
-       if [[ -z ${MOUSED_DEVICE} ]] ; then
-               eend 1 $"No device specified in" "/etc/conf.d/${SVCNAME}" \
-                       $"and no mouse detected"
+       if [ -z "${MOUSED_DEVICE}" ] ; then
+               eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \
+                       "and no mouse detected"
                return 1
        fi
 
@@ -44,21 +44,22 @@ start() {
                -- ${opts} -I "${MOUSED_PIDFILE}"
        local retval=$?
        
-       [[ -n ${MOUSE_CHAR_START} ]] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}"
+       [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}"
        local ttyv=
        for ttyv in /dev/ttyv* ; do
-               vidcontrol < ${ttyv} ${MOUSE_CHAR_START} -m on || retval=1
+               vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1
        done
        
-       eend ${retval} $"Failed to start moused"
+       eend ${retval} "Failed to start moused"
 }
 
 stop() {
-       ebegin $"Stopping the Console Mouse Daemon" "${MOUSED_NAME}"
+       ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}"
        # Don't specify the binary as >1 instance of moused may be running
        # which is perfectly valid as we can be multiplexed.
-       start-stop-daemon --stop --quiet --pidfile "${MOUSED_PIDFILE}"
-       eend $? $"Failed to stop moused"
+       start-stop-daemon --stop --exec /usr/sbin/moused \
+               --pidfile "${MOUSED_PIDFILE}"
+       eend $? "Failed to stop moused"
 }
 
 # vim: set ts=4 :

diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
index bf30eeb92870572f4f9a512908d5e4c9193453db..a17dff3957a4338dbf610ea71cb1743028eb0c70 100755 (executable)
--- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.2 2007/02/23 14:03:08 uberlord Exp $
 
 depend() {
        need net rpcbind
@@ -61,8 +61,3 @@ stop() {
        stop_statd
        stop_lockd
 }
-
-restart() {
-       svc_stop
-       svc_start
-}

diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd
index 03112d3535c1092b7c954ac2e72d6ac147055bc3..c99adf84644874c2ec8e2fb564f89263023f0dfe 100755 (executable)
--- a/sys-freebsd/freebsd-usbin/files/powerd.initd
+++ b/sys-freebsd/freebsd-usbin/files/powerd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
 
 depend() {
        need localmount
@@ -9,19 +9,19 @@ depend() {
 
 start() {
        local args=
-       [[ -n ${BATTERY_MODE} ]] && args="${args} -b ${BATTERY_MODE}"
-       [[ -n ${AC_MODE} ]] && args="${args} -a ${AC_MODE}"
+       [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}"
+       [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}"
        
-       ebegin $"Starting Power Control Daemon"
+       ebegin "Starting Power Control Daemon"
        start-stop-daemon --start --exec /usr/sbin/powerd \
                --pidfile /var/run/powerd.pid \
                -- ${args} ${POWERD_OPTS}
-       eend $? $"Failed to start powerd"
+       eend $? "Failed to start powerd"
 }
 
 stop() {
-       ebegin $"Stopping Power Control Daemon"
+       ebegin "Stopping Power Control Daemon"
        start-stop-daemon --stop --exec /usr/sbin/powerd \
                --pidfile /var/run/powerd.pid
-       eend $? $"Failed to stop powerd"
+       eend $? "Failed to stop powerd"
 }

diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd
index ab4ad4f59c914809d5904b4cd91d63389e428ad0..f5b21c8218ee854221223503663974bac1ec6690 100644 (file)
--- a/sys-freebsd/freebsd-usbin/files/rarpd.initd
+++ b/sys-freebsd/freebsd-usbin/files/rarpd.initd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.initd,v 1.2 2006/11/20 12:37:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
 
 depend() {
-       if [[ -z ${RARPD_ONLY_INTERFACE} ]]; then
+       if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
                need net
        else
                need net."${RARPD_ONLY_INTERFACE}"
@@ -14,7 +14,7 @@ depend() {
 start() {
        local rarpd_opts
 
-       if [[ -z ${RARPD_ONLY_INTERFACE} ]]; then
+       if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
                rarpd_opts="${rarpd_opts} -a"
        else
                rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}"

diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd
index 0bc9cda8851207cfaa9dbdde502fe9a4cc63ade9..320b870d2ecee108ce9a7c151dcc73a0799f8c69 100755 (executable)
--- a/sys-freebsd/freebsd-usbin/files/syscons.initd
+++ b/sys-freebsd/freebsd-usbin/files/syscons.initd
@@ -1,16 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
 
 depend() {
        need localmount
 }
 
 start() {
-       ebegin $"Configuring system console"
+       ebegin "Configuring system console"
 
-       if [[ -n ${MODE} ]] ; then
+       if [ -n "${MODE}" ] ; then
                einfo "Setting mode to ${MODE}"
                vidcontrol "${MODE}"
                eend $?
@@ -20,37 +20,43 @@ start() {
        
        # Set the keymap.
        if [ -n "${KEYMAP}" ]; then
-               einfo $"Setting keymap to" "${KEYMAP}"
+               einfo "Setting keymap to" "${KEYMAP}"
                kbdcontrol -l ${KEYMAP} < /dev/console
        fi
        
        if [ -n "${KEYRATE}" ]; then
-               einfo $"Setting keyrate to" "${KEYRATE}"
+               einfo "Setting keyrate to" "${KEYRATE}"
                kbdcontrol -r ${KEYRATE} < /dev/console
        fi
 
        if [ -n "${KEYCHANGE}" ]; then
-               einfo $"Changing function keys..."
-               while read $a $b; do
-                       kbdcontrol -f "$a" "$b" < /dev/console
-               done <<< ${KEYCHANGE}
+               einfo "Changing function keys..."
+               eval set -- "${KEYCHANGE}"
+               eindent
+               while [ $# -gt 0 ] ; do
+                       veinfo "F$1 -> \`$2'"
+                       kbdcontrol -f "$1" "$2" < /dev/console
+                       shift ; shift
+               done
+               eoutdent
        fi
        
        if [ -n "${CURSOR}" ]; then
-               einfo $"Setting cursor"
+               einfo "Setting cursor"
                vidcontrol -c ${CURSOR}
        fi
 
-       einfo $"Setting custom fonts..."
+       einfo "Setting custom fonts..."
        # Nothing to see here, move along...
-       for v in FONT8x{16,14,8}; do
-               if [ -n "${!v}" ]; then
-                       vidcontrol -f ${v##FONT} ${!v}
+       for v in FONT8x16 FONT8x14 FONT8x8; do
+               f=$(eval \$"${v}")
+               if [ -n "${f}" ]; then
+                       vidcontrol -f ${v##FONT} ${f}
                fi
        done
 
        if [ -n "${BLANKTIME}" ]; then
-               einfo $"Setting blanktime"
+               einfo "Setting blanktime"
                vidcontrol -t ${BLANKTIME}
        fi
 
@@ -62,7 +68,7 @@ start() {
        fi
 
        if [ -n "${KBDFLAGS}" ]; then
-               einfo $"Setting keyboard flags for all screens"
+               einfo "Setting keyboard flags for all screens"
                for ttyv in /dev/ttyv*; do    
                        kbdcontrol ${KBDFLAGS} <${ttyv} &>${ttyv}
                done

diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd
index b0eb291e40b3779a46b1f54d115de140d0cffd56..0cb314e5079116cef88542c7630f8a76840b7cc8 100755 (executable)
--- a/sys-freebsd/freebsd-usbin/files/syslogd.initd
+++ b/sys-freebsd/freebsd-usbin/files/syslogd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
 
 depend() {
        provide logger
@@ -9,14 +9,14 @@ depend() {
 }
 
 start() {
-       ebegin $"Starting System Logger"
+       ebegin "Starting System Logger"
        start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \
                -- ${SYSLOGD_OPTS}
        eend $?
 }
 
 stop() {
-       ebegin $"Stopping System Logger"
+       ebegin "Stopping System Logger"
        start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid
        eend $?
 }