Author: lslezak Date: Tue Oct 4 15:16:40 2011 New Revision: 66234 URL: http://svn.opensuse.org/viewcvs/yast?rev=66234&view=rev Log: - do not write "options i2c-algo-bit bit_test=1" line to /etc/modprobe.d/50-tv.conf file, remove the option during upgrade (bnc#712023) - 2.21.4 Modified: trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp trunk/tv/yast2-tv.spec.in Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=66234&r1=66233&r2=66234&view=diff ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Tue Oct 4 15:16:40 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=66234&r1=66233&r2=66234&view=diff ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Tue Oct 4 15:16:40 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 4 13:13:35 UTC 2011 - lslezak@suse.cz + +- do not write "options i2c-algo-bit bit_test=1" line to + /etc/modprobe.d/50-tv.conf file, remove the option during upgrade + (bnc#712023) +- 2.21.4 + +------------------------------------------------------------------- Thu Sep 22 14:31:32 CEST 2011 - visnov@suse.cz - Set dialog title Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=66234&r1=66233&r2=66234&view=diff ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Tue Oct 4 15:16:40 2011 @@ -1816,9 +1816,6 @@ y2debug ("Writing char-major-81 (videodev) to /etc/modprobe.d/50-tv.conf"); SCR::Write (.modprobe_tv.alias."char-major-81", "videodev"); - // fix of bug #18033: (slow initialization on some machines) - SCR::Write (add(.modprobe_tv.options,"i2c-algo-bit"),$["bit_test":"1"]); - // reset the old settings (all char-major-81-* aliases) foreach (string alias, GetMajor81Aliases (.modprobe_tv), { SCR::Write ( add (.modprobe_tv.alias, alias) , nil); Modified: trunk/tv/yast2-tv.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/yast2-tv.spec.in?rev=66234&r1=66233&r2=66234&view=diff ============================================================================== --- trunk/tv/yast2-tv.spec.in (original) +++ trunk/tv/yast2-tv.spec.in Tue Oct 4 15:16:40 2011 @@ -16,6 +16,7 @@ Obsoletes: yast2-lib-hardware Provides: yast2-trans-tv Obsoletes: yast2-trans-tv +PreRequires: sed BuildArchitectures: noarch @@ -38,6 +39,12 @@ mv -f /etc/modprobe.d/tv /etc/modprobe.d/50-tv.conf fi +# comment out bit_test option (bnc#712023) +if test -e /etc/modprobe.d/50-tv.conf; then + sed -i -e 's/^\([ \t]*options[ \t]*i2c-algo-bit[ \t]*bit_test=1\)/# \1/' /etc/modprobe.d/50-tv.conf +fi + + %files %defattr(-,root,root) %dir @yncludedir@/tv -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org