Add /etc/conf.d/nvidia-persistenced too.

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 34 insertions, 11 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 7298be1d7cd4..bbd0ed08a2e5 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.575 2014/09/19 21:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.576 2014/09/19 22:09:28 jer Exp $
+
+*nvidia-drivers-343.22-r2 (19 Sep 2014)
+
+  19 Sep 2014; Jeroen Roovers <jer@gentoo.org>
+  -nvidia-drivers-343.22-r1.ebuild, +nvidia-drivers-343.22-r2.ebuild,
+  +files/nvidia-persistenced.conf, files/nvidia-persistenced.init:
+  Add /etc/conf.d/nvidia-persistenced too.
 
 *nvidia-drivers-343.22-r1 (19 Sep 2014)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index fc74b0b02d3a..ac91a58f7cb2 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -10,7 +10,8 @@ AUX nvidia-drivers-331.13-pax-usercopy.patch 2127 SHA256 669ffcab77432f116c2b9bc
 AUX nvidia-drivers-pax-const.patch 833 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0 WHIRLPOOL 1b2d737ee7ccee831c85bd8af9605c0633fd025bb209e6d76c13f49a5664aa490bd5b6ce48855e541fe87380cd7b723162e1965b803e1ed630f239bf4dbd0d19
 AUX nvidia-drivers-pax-usercopy.patch 2350 SHA256 56980f43db38d582bc6a9bfd881973fce6e3e056b77ce4f4005bdcf79526a863 SHA512 54a1354ba008d014a608044610027b4d808120f8e77cc7d5ac855c3dcf4f487b0a4c0870ae4e727db0643cb56ee21513b803976e9a30c6838adf2f5414232804 WHIRLPOOL 78ac54bfe52cc3b6dfa28e17020991dfb7056984d667b0fefa41d23372b03e1a8e6d66c74e1dee234733d5b2b36e2c0813f507a89716ae2d8f1f6db917fdf01d
 AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b
-AUX nvidia-persistenced.init 607 SHA256 8d9e7b84af8c74bf5cd0ed1cfab860d8365ce13d36f8e5d7ad2f1c78a7c0c432 SHA512 bd72c6fa001c1ed316b8d90d20295398b4646726905aaa5b269bcd4f53934b4804e7e9e4221c014451e664fa40beb739f84bf7693b75f71f3406d39024ed817b WHIRLPOOL 9c1fbbad3ce73958ac61c4830f2f4e18d19930c83e6c2a94173bf62223a99137e0dea50958d0ee291879ea372a786b2c33210342075cda643adb40eb14344bf4
+AUX nvidia-persistenced.conf 256 SHA256 07bab3a9e70725ef82bea08f4139a90eb62c6cf8e77a6047072f7a756c567d97 SHA512 e87ca6f91d4993c8efd72fe8e3acd4b62928750a0d1b92a1cb4b9c891fbba9fb9beeac4b410627f13158a8cbfaf282a6c1f2f074e15dafae3cf3f2db037ce168 WHIRLPOOL 40489e6fef42a38c97199deeec1dd21d5ebb69c38d4d25765dc9786185198b382d94e42940d5f634546c3fd1d0ac0498802fad69d6a371fbca23f43937aed02b
+AUX nvidia-persistenced.init 778 SHA256 b2a0a60b76090a78deddd7cdc323dcc1717530b0e7a3b51c069127ba3fe015b9 SHA512 6ed419ba17a1d273ca9024e74ebc24135e5cbc041f15019ec1266a48d69c206a7b2792bccdd623db3c65a8192d893f27e8b1593d79bdac7cb5fcd255b81c217b WHIRLPOOL 46113daf493157c6fc97511094f6d2032a65485145d372ac27c3120aebfe1d4051c9ec7122eba373db2eb57a7a227f671fa84c7603f05c823bb977f2dc9910c4
 AUX nvidia-smi.init 664 SHA256 c996033b81cc1512d8370d62575a0ea0c694f6e1b91cc948b4529625130601a7 SHA512 f7cc27d6cce7c13adecb0b927680979ca6a398bc742a93492ab7f85702e4442d8fc00c476f381a0177ae031a9ae45c5cbb6777f20c545d5cd695150f9551a4ce WHIRLPOOL 66bf1a70fa0038a54ca9254cd5543f61bdc69a4c070544660f4ef9b2a004d28f1defdb26b1bc102b1eabd24e679f36fec14c9b313fba4b54c7a9a51a73ca021e
 AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14
 AUX nvidia-uvm.conf 82 SHA256 4407c7ceed58ead98492560c07fc44d4285a70ed5165407f1b959e46d6e6d081 SHA512 cbdb946934a0b7c7d0fab0937ead0a161ff20238e0b53f9e05ea18a4fa0507df8d37594bd13402e3ec2001d488daeb2bec718d612f68202768d62a3cec97aacb WHIRLPOOL a79d65d67b0ff446bb2c65f5f3ec16ffaf0268ab0abbc137b413168aa7f5e617e502eaaf00fd21a149778bdd134da532b25bb066fc70bfa601caa97397aaf424
@@ -56,16 +57,16 @@ EBUILD nvidia-drivers-334.21-r3.ebuild 13265 SHA256 fc05447975d06771e47ffa420dae
 EBUILD nvidia-drivers-337.25.ebuild 13268 SHA256 c3ebd456f9ad1ed91c699e1628b6c8cd85468099771afaca3957f512c8a9e2a4 SHA512 fdd60e6ccee344037ca31cf5ce952f4382ca70ad78288076af03799bfb3e070693dfb58f60e1e3918341909638312b2465dff4b6fb83d60cf9d7d075474a82ad WHIRLPOOL 2c3ec9ddafb5e3bedaee1d0448ba9843ddcd2488c5ef5c9d02deef673a50ab1668efe8f6ffbf6997051e2efc26928c76c84de49cc2399566b0725b582185c270
 EBUILD nvidia-drivers-340.32.ebuild 13450 SHA256 51e426c87989a76b875fa520389203dd974940a292cacd5cc5397e4bed3a6c5f SHA512 5ba04720f2ee8a205540365fd837579a7830af1a4c52f531eb8d5085b92c77cfb97f9cb9f8d57c21ab05e4a3fe626a0929815668c185ad2577138f152e00edf1 WHIRLPOOL 3e08bbdb7b1f9e35c59fe501ff3076f66dd30eb4e24ff6ccb7263087fd62baf746c2505362ee6b392750c493f6faa2184aa69275a774e718c4ebbe78cdeb8d37
 EBUILD nvidia-drivers-343.13-r1.ebuild 13455 SHA256 57967c90cebcd645d974c6574b850d5b4f707ddef5b28916855def8286793c96 SHA512 537ff9111e90b1284dadd5a5cec22d60a2beadbca20a5f332fa397dbc9411215ad2d936a1ac2c13e27bb7c16923e09c0267fa199350977685ce0d883b2eeef40 WHIRLPOOL 7ba269a20ec52ec35056f00cfd90ec4f98893ec93f06e9b2aa05f2e9d648065f33126dc633dc71beab8706bbd9e5dc07819edbc9462bd9fbc3bae5a724448175
-EBUILD nvidia-drivers-343.22-r1.ebuild 13525 SHA256 971053845260886bf82af33138e56e88f9501ac5b55ba5dea30b60d83351fe7e SHA512 a39be215f3bddb7c545a0e1d2d097729f705baf361d060c052f12f358d54a65f8d774362ece7001708619c819b212ccf94639cdbb0bf59b55c8844d93c4c6b93 WHIRLPOOL d6b0ec1f24946fb5fd5e70bc5032ab2ef6755bfa1b504b8fce9400618e25514e49c3d74d9f80f1cc1dd3369d6fd770bbedcfeca2060ab05143c9ac63520fc1a5
+EBUILD nvidia-drivers-343.22-r2.ebuild 13595 SHA256 6dd8175af6e0ef847e4a9ef2909bf7c5c90a6f4f736a62baa574f3c22d2faad0 SHA512 aef253e7b8f96c628c298cda87e16362f18e830b446f0ce24ff34a7e0988c1c53afa95ce971fd19c7aec06f5f66b8dd59b1311080d2e1941f55fc4d14c4051e7 WHIRLPOOL 5896c1b8c432bfdf5d9565834f28a3e56101f8559592bc79e847faf483f3ae80a7600105e0c5b1c414e29eec45149039229abe53a47cc335c6faccfab5f2254e
 EBUILD nvidia-drivers-343.22.ebuild 13452 SHA256 394ac032a4ba81e3684176201fdc3aaea60931636f0a86551478393f7f0b8247 SHA512 0a5c18bdd03ed97153de3d13bf7fc6269342a388f2aa2d82d5b976da6c3330c0ffc5fbb411bb895885b69e323680ee3885bd662dc2269f7486618feb8709bf4a WHIRLPOOL d613a84f281839d84683eda76313f632d2dd107c9ec9c0a847c1f5d8aa73d128cc0779267863d657cd9f9ffb1ad7ea03eaebc7a2202a04fc6b4975df776c62c7
 EBUILD nvidia-drivers-96.43.23.ebuild 14866 SHA256 c55816dd14847c8a211368805f92779628340bfa28ab198f0f8d2487d0df9fbf SHA512 cc79ee87dbf72c81e1267b10ade0bd4300a1bf84bfeb184e8cede0fe0861f57edee59b782329da791a4d066dfcc925c5087cb180c5dea603b9e1d5abf43a5695 WHIRLPOOL 7e4727e6b4a6b3845c97240a252fc4e784dd85ed7f22773ab54cd21a9cd78bc88f0948f6a7ba885042a4c1635942a3933281a7805335d25620decad7589e59b8
-MISC ChangeLog 11740 SHA256 20b74e3e48332a89848509d56d8b16c62a5acc1af74a332b29f9cbddfd37a8d2 SHA512 633cef39692dbdfe2101482073c96df031fdeca44bd1058a95dd5c26ab240b3347296fd1f78ca54344ad7a9dc8aa9338f644fe2e82e355dca5b8579f8257e77d WHIRLPOOL 7a12b774eda74413fa3d01dac012d69aecb59383781941467266bd28630c596495853135bee1192d2df191794c85b7978cf2d1428200626492c5bb42ec0dcb98
+MISC ChangeLog 12009 SHA256 1d7959c77a6dd3532634668ba49eced4559c8d4c15282b2e5c0dc85f6e506898 SHA512 bee56cbc30d63dd8ed9e5baaa672e9340ba6ab4cf5f88b52a454474dad3cb248bc04028890030551c6aeeb47019884d00c542ab9c9b7f0c96d6d2f348cd8c2e2 WHIRLPOOL 671ae86f3c23c6b4b9cf1743da41e2a19588f0be29a852bb2fb5c424f76fa59d16b92146ddf15d3a8de73a5ee10b8072d14778a36cf4e46c026508e2dd3a5ddc
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 591 SHA256 1b2f8667e5aae901fd45390fe287245faf07dfaed57f7243037c290c01db3e4a SHA512 8a4d1e029a0c7633244a1853fc26b2ea31608aa13f947bb453d99bfe8e0937d46e8abe4c0704382a992a486d92f66bfd5cce7406a0f129ac97ef1fc0b602e5df WHIRLPOOL 3061925c0c8172c1bab032bc79d664668921682e5bac4b926b17ee5d15357a6eec959c7f8618a97fe3e181ab1229baf500400aa4ba3480d3373dbdc3185b9d80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQcphEACgkQVWmRsqeSphOstQCfVjkCR8BlbeW0tXCswbudSpUT
-Em0An0hNwO5kKXl2eU7U7kjQbRfno9d1
-=qS1r
+iEYEAREIAAYFAlQcqZkACgkQVWmRsqeSphO5OgCcC/2wbmzAy+koLKQTgcY+ZWP0
+aDsAnjBRps8iqbzSc7hc8aF9Zq3YDVY+
+=gDaj
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
new file mode 100644
index 000000000000..7b4e77fcb50d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.conf
@@ -0,0 +1,8 @@
+# run-time configuration file for /etc/init.d/nvidia-persistenced
+
+# NVPD_USER: The user nvidia-persistenced is intended to run for
+NVPD_USER="jeroen"
+
+# ARGS: Additional arguments to set the default persistence mode
+# (see nvidia-persistenced(1))
+ARGS=""
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
index af9127ff506a..e712514adfb1 100755
--- a/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
+++ b/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init
@@ -1,14 +1,20 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init,v 1.1 2014/09/19 21:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-persistenced.init,v 1.2 2014/09/19 22:09:28 jer Exp $
 
 pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid"
 
 start() {
-	ebegin "Starting nvidia-persistenced"
+	if ! [ "${NVPD_USER}x" = x ]; then
+		ebegin "Starting nvidia-persistenced for ${NVPD_USER}"
+		NVPD_USER_ARG="--user ${NVPD_USER}"
+	else
+		ebegin "Starting nvidia-persistenced"
+	fi
 	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--background --exec /opt/bin/nvidia-persistenced --
+		--background --exec /opt/bin/nvidia-persistenced \
+		-- ${NVPD_USER_ARG} ${ARGS}
 	eend $?	
 }
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild
index afe3d51ca7f8..31940019fab2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r1.ebuild,v 1.1 2014/09/19 21:54:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.22-r2.ebuild,v 1.1 2014/09/19 22:09:28 jer Exp $
 
 EAPI=5
 
@@ -328,6 +328,7 @@ src_install() {
 		doman nvidia-modprobe.1.gz
 		doman nvidia-persistenced.1.gz
 		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
 		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
 	fi