Don't run grep in global scope of init script (bug #279477)

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 14 insertions, 21 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 5c1b9dad8fcf..0c380e0d3455 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.46 2009/10/26 07:47:26 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.47 2009/11/16 14:28:14 cla Exp $
+
+  16 Nov 2009; Dawid Węgliński <cla@gentoo.org> files/chronyd.conf,
+  files/chronyd.rc:
+  Don't run grep in global scope (bug #279477)
 
   26 Oct 2009; Torsten Veller <tove@gentoo.org> chrony-1.23.ebuild:
   Update HOMEPAGE
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 59b3c5e62c9a..0c34fc1c99e6 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX chrony-1.20-chrony.conf.example-gentoo.diff 1592 RMD160 582a9ee48d12f677772c54c3e97f6baa2c19811d SHA1 d64706e3e96124c88254de569629bd52ec511cd5 SHA256 8eb8a3cec402ab25b24c595d113f41c901e975260e7106b738e6ec72368efb97
 AUX chrony-1.20-conf.c-gentoo.diff 342 RMD160 8e7eaf6091171d7cca51e8f82f7c94f15f8231ad SHA1 0769dd921e1e52f678dc81232b12749e161ca92c SHA256 c99dd789529c1cb7a3533069f5cc66be672910c23cd7c7c1aea710bb4779e61f
 AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f SHA1 159abdea72e63268ae87655859908404d4d179ed SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c
 AUX chrony-1.21-makefile.diff 627 RMD160 4a661285ceebdf8609baa084454fdfdff3e47443 SHA1 7162220786f568f8170cf36fa9d6da8c2a0af6c5 SHA256 e90b6ac857b854aaa2f67124da3ec18933f3897eec075d5438ae3bdf751481ac
 AUX chrony-1.23-sources.diff 1719 RMD160 56c443d44647603407e05ea7b0c0ac6e8e4fa96c SHA1 2aaff60839745d43f28c6df7931bb7b932c09250 SHA256 f0ad08f480879fffd565a60a1d69a5f0283194b414e952d9ca587c947ecc92a3
-AUX chronyd.conf 584 RMD160 53355fefd2cede585ee91f30fa624a2a157052c6 SHA1 a900bef7a884c4efe702584eaab43ca93761c0d7 SHA256 2fd6d1104f423e271592f773f43a19174d0fafe287fd1dbeb0b3a5be456b6525
-AUX chronyd.rc 1562 RMD160 43630070dd1571faecc1933b3bd6b5490b76d903 SHA1 1abf6e6d3cb4b2b33c3c291cd4f9efb0df8a47a4 SHA256 e6577a8475aaf71a7dc0fa5c0d2e8271ee71b9302c33e6ffaf3a9c60c8c7bfd5
+AUX chronyd.conf 378 RMD160 929862983d9ac346506d074fd4d8d14452ce451a SHA1 4efc8a4259e54df7df3be8a1c848891c7bfd11bf SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99
+AUX chronyd.rc 1702 RMD160 b3ba4c5869ad2710e5d212ca7786bbed2d27dcdc SHA1 66f9506fcfda318757fabbf3a99e6fff960d41e5 SHA256 5cabd9ff35006233f43ef33a8b1a03e96ee78b269eba5e0efedf4327fa64662d
 DIST chrony-1.23.tar.gz 321015 RMD160 6f92aeac15d252821ff72a02f340fc0e562eddc1 SHA1 f0c6b32099329f358dbdb4f62753d2c7cbc13c79 SHA256 889f292458ccb3f20ae4f5872110d776a639f1cda2d1df694eb88a14726832c5
 EBUILD chrony-1.23.ebuild 1856 RMD160 9d0b47e1d365290eadc462fec6dc609b4c585223 SHA1 ce67919c45e510eaca10cf5ad7a01b8631ac585a SHA256 f65036a24acf5862f97fdd25ef09445e4f09fe6126bcf6ea0b66262c85c74d1c
-MISC ChangeLog 5847 RMD160 c5703bf4f41e88c9c218f9eca9bdc9c8ef05b004 SHA1 3a096e56277f17c723c669e94121d538f4a8b19e SHA256 6b16e525465d21973a093c94ec17f80b6337a5a31bf801f0e395d905a3414f3f
+MISC ChangeLog 5984 RMD160 193f5d196b4f5c7082e2a4419da053654587ee0a SHA1 cbbf94ed7625bd5d18284de865c7cc64405f78e2 SHA256 6213a871a489a2315936ade4f346700b2f454703264bf71d09aa3f38c1546864
 MISC metadata.xml 1028 RMD160 0b2a82de3f3f7f586ffba067114005b5398e78fc SHA1 68914908720affa4f5a0aa7bfc3f2e0d1474c9dd SHA256 abc23a3b826bff26c757496fbe12dc5a40bc50dffb634629c94c9dd6136ab81e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrlVBQACgkQV3J2n04EauzmJACeIXF1zqNp9ezGkOsiF1+C3vt/
-UtUAoMmiMiR08iEEaRuw5n0Hxo363N7k
-=knrX
------END PGP SIGNATURE-----
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
index 560825c2c82b..fc43a95c40fe 100644
--- a/net-misc/chrony/files/chronyd.conf
+++ b/net-misc/chrony/files/chronyd.conf
@@ -10,9 +10,3 @@ CFGFILE="/etc/chrony/chrony.conf"
 # the gain or loss rate across system reboots and shutdowns.
 
 ARGS=""
-
-# devfs creates the device for RTC if it's compiled into kernel
-test -c /dev/rtc && {
-       grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
-}
-grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
diff --git a/net-misc/chrony/files/chronyd.rc b/net-misc/chrony/files/chronyd.rc
index 49d7526bb587..c6b28a488d6b 100644
--- a/net-misc/chrony/files/chronyd.rc
+++ b/net-misc/chrony/files/chronyd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.8 2007/03/22 14:32:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.9 2009/11/16 14:28:14 cla Exp $
 
 depend() {
 	need net
@@ -30,6 +30,11 @@ checkconfig() {
 		# know if it might be handy
 		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
 	fi
+
+	if [ -c /dev/rtc ]; then
+		grep -q 'rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+	fi
+	grep -q 'dumponexit' "${CFGFILE}" && ARGS="${ARGS} -r"
 	return 0
 }