Author: lslezak Date: Thu Mar 26 08:24:53 2009 New Revision: 56404 URL: http://svn.opensuse.org/viewcvs/yast?rev=56404&view=rev Log: - Use /etc/modprobe.d/50-tv.conf config file instead of /etc/modprobe.d/tv (bnc#485942) - 2.18.1 Modified: trunk/tv/VERSION trunk/tv/agents/modprobe_tv.scr 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=56404&r1=56403&r2=56404&view=diff ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Thu Mar 26 08:24:53 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/tv/agents/modprobe_tv.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/agents/modprobe_tv.scr?rev=56404&r1=56403&r2=56404&view=diff ============================================================================== --- trunk/tv/agents/modprobe_tv.scr (original) +++ trunk/tv/agents/modprobe_tv.scr Thu Mar 26 08:24:53 2009 @@ -26,6 +26,6 @@ .modprobe_tv `ag_modules( - `ModulesConf("/etc/modprobe.d/tv") + `ModulesConf("/etc/modprobe.d/50-tv.conf") // `ModulesConf("/etc/modprobe.conf") ) Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=56404&r1=56403&r2=56404&view=diff ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Thu Mar 26 08:24:53 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 26 08:20:36 CET 2009 - lslezak@suse.cz + +- Use /etc/modprobe.d/50-tv.conf config file instead of + /etc/modprobe.d/tv (bnc#485942) +- 2.18.1 + +------------------------------------------------------------------- Wed Jan 14 17:09:48 CET 2009 - ro@suse.de - re-add yast2-sound to buildrequires Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=56404&r1=56403&r2=56404&view=diff ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Thu Mar 26 08:24:53 2009 @@ -163,7 +163,7 @@ /** * This is true, if tv data were read from /etc/modprobe.conf - * On write, they shoud be removed and written only to /etc/modprobe.d/tv + * On write, they shoud be removed and written only to /etc/modprobe.d/50-tv.conf */ global boolean used_modprobe_conf = false; @@ -684,7 +684,7 @@ /** * Returns a list of all char-major-81-* in modprobe config file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list List [ "char-major-81-0", "char-major-81-3" ] or so... */ define list<string> GetMajor81Aliases (path mod_path) ``{ @@ -700,7 +700,7 @@ /** * Returns a list of all char-major-212-* in modprobe config file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list List [ "char-major-212-3" ] or so... */ define list<string> GetMajorInstalls(path mod_path) ``{ @@ -718,7 +718,7 @@ /** * Read parameters of one module. - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @param module_name Name of the module * @return map Map with parameters * @example @@ -786,16 +786,16 @@ /** * Reads saved TV cards data from given file - * @param mod_path path to agent (using modprobe.conf or modprobe.d/tv) + * @param mod_path path to agent (using modprobe.conf or modprobe.d/50-tv.conf) * @return list of TV cards */ define list read_modprobe (path mod_path) { if (mod_path == .modprobe_tv && - SCR::Read (.target.size, "/etc/modprobe.d/tv") == -1) + SCR::Read (.target.size, "/etc/modprobe.d/50-tv.conf") == -1) { - y2milestone ("creating /etc/modprobe.d/tv..."); - SCR::Execute (.target.bash, "/bin/touch /etc/modprobe.d/tv"); + y2milestone ("creating /etc/modprobe.d/50-tv.conf..."); + SCR::Execute (.target.bash, "/bin/touch /etc/modprobe.d/50-tv.conf"); return []; } @@ -807,7 +807,7 @@ list<string> tv_aliases = GetMajor81Aliases (mod_path); list<string> tv_installs = GetMajorInstalls(mod_path); - // the parameters read from modprobe.d/tv + // the parameters read from modprobe.d/50-tv.conf // $[ "module" : $[ parameter_name: $[ 0: nil, 1: "3", 2: "2" ] ] ] // no_of_the_card ----^-------^-------^ map modules_parameters = $[]; @@ -1666,7 +1666,7 @@ return ret; } - // initialize the blacklists from /etc/modprobe.d/blacklist file + // initialize the blacklists from /etc/modprobe.d/50-blacklist.conf file void LoadBlackList() { if (blacklisted_aliases == nil) @@ -1820,7 +1820,7 @@ */ define boolean WriteSettings() ``{ // common settings - y2debug ("Writing char-major-81 (videodev) to /etc/modprobe.d/tv"); + 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) @@ -1832,7 +1832,7 @@ }); if (used_modprobe_conf) { - y2milestone ("removing old tv configuration from /etc/modprobe.conf (it will be saved to /etc/modprobe.d/tv)"); + y2milestone ("removing old tv configuration from /etc/modprobe.conf (it will be saved to /etc/modprobe.d/50-tv.conf)"); // remove aliases from old config file foreach (string alias, GetMajor81Aliases (.modules), { SCR::Write (add (.modules.alias, alias) , nil); @@ -1867,7 +1867,7 @@ if (module_name == "") return; if (contains (SCR::Dir (.modprobe_tv.options), module_name)) { - y2milestone ("Deleting module %1 from /etc/modprobe.d/tv", + y2milestone ("Deleting module %1 from /etc/modprobe.d/50-tv.conf", module_name); // ... delete module's options from modprobe file SCR::Write (add (.modprobe_tv.options, module_name), nil); @@ -1949,7 +1949,7 @@ alias = sformat("char-major-212-%1", 64 * dvb_card_no + 3); } - y2milestone ("Writing alias %2 %1 to /etc/modprobe.d/tv", + y2milestone ("Writing alias %2 %1 to /etc/modprobe.d/50-tv.conf", module_names, alias); // modprobe comment @@ -2014,7 +2014,7 @@ ); // write comment with unique key and the card name - y2debug ("Writing comment to alias %1 in /etc/modprobe.d/tv", + y2debug ("Writing comment to alias %1 in /etc/modprobe.d/50-tv.conf", alias); path modpath = (size(module_names) > 1) ? .install : .alias; @@ -2037,7 +2037,7 @@ { // Error message popup, %1 is file name Report::Error (sformat (_("Unable to write parameters -to %1."), "/etc/modprobe.d/tv")); +to %1."), "/etc/modprobe.d/50-tv.conf")); result = false; } @@ -2054,7 +2054,7 @@ { // Error message popup, %1 is file name Report::Error (sformat (_("Unable to write %1."), - "/etc/modprobe.d/tv")); + "/etc/modprobe.d/50-tv.conf")); result = false; } Modified: trunk/tv/yast2-tv.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/yast2-tv.spec.in?rev=56404&r1=56403&r2=56404&view=diff ============================================================================== --- trunk/tv/yast2-tv.spec.in (original) +++ trunk/tv/yast2-tv.spec.in Thu Mar 26 08:24:53 2009 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-sound yast2-testsuite # .modprobe_blacklist agent Requires: yast2-core >= 2.16.19 @@ -30,6 +30,12 @@ @CLEAN@ +%post +# rename the config file to the new modprobe schema +if test -e /etc/modprobe.d/tv; then + mv -f /etc/modprobe.d/tv /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