Author: lslezak Date: Thu Mar 26 12:55:40 2009 New Revision: 56425 URL: http://svn.opensuse.org/viewcvs/yast?rev=56425&view=rev Log: - Use /etc/modprobe.d/50-sound.conf config file instead of /etc/modprobe.d/sound (bnc#485942) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/agents/modprobe_sound.scr trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/read_routines.ycp trunk/sound/sound/src/sound_write.ycp trunk/sound/sound/src/write_routines.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Mar 26 12:55:40 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 26 12:54:41 CET 2009 - lslezak@suse.cz + +- Use /etc/modprobe.d/50-sound.conf config file instead of + /etc/modprobe.d/sound (bnc#485942) + +------------------------------------------------------------------- Thu Feb 26 12:49:21 CET 2009 - lslezak@suse.cz - set 100% volume for snd-hda-intel driver (bnc#477853), Modified: trunk/sound/sound/agents/modprobe_sound.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/agents/modprobe_sound.scr?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/sound/agents/modprobe_sound.scr (original) +++ trunk/sound/sound/agents/modprobe_sound.scr Thu Mar 26 12:55:40 2009 @@ -26,5 +26,5 @@ .modprobe_sound `ag_modules( - `ModulesConf("/etc/modprobe.d/sound") + `ModulesConf("/etc/modprobe.d/50-sound.conf") ) Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Thu Mar 26 12:55:40 2009 @@ -148,7 +148,7 @@ /** * This is true, if sound data were read from /etc/modprobe.conf - * On write, they shoud be removed and written only to /etc/modprobe.d/sound + * On write, they shoud be removed and written only to /etc/modprobe.d/50-sound.conf */ global boolean used_modprobe_conf = false; Modified: trunk/sound/sound/src/read_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/read_routines.ycp?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/sound/src/read_routines.ycp (original) +++ trunk/sound/sound/src/read_routines.ycp Thu Mar 26 12:55:40 2009 @@ -151,8 +151,8 @@ /* path mod_path = .modprobe_sound; - // read from /etc/modprobe/conf if /etc/modprobe.d/sound is not present - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") == -1) + // read from /etc/modprobe/conf if /etc/modprobe.d/50-sound.conf is not present + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") == -1) { mod_path = .modules; Sound::used_modprobe_conf = true; @@ -284,14 +284,14 @@ define list<map> read_save_info () ``{ list<map> saved = []; - // First, read from /etc/modprobe.d/sound - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >= 0) + // First, read from /etc/modprobe.d/50-sound.conf + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >= 0) { saved = read_modprobe (.modprobe_sound); } else { - y2milestone("/etc/modprobe.d/sound doesn't exist"); + y2milestone("/etc/modprobe.d/50-sound.conf doesn't exist"); // try /etc/modprobe.conf... if (SCR::Read(.target.size, "/etc/modprobe.conf") >= 0) Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Thu Mar 26 12:55:40 2009 @@ -236,7 +236,7 @@ } } - // save config to /etc/modprobe.d/sound + // save config to /etc/modprobe.d/50-sound.conf SaveModulesEntry(save_info, []); sleep(10); Modified: trunk/sound/sound/src/write_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/write_routines.ycp?rev=56425&r1=56424&r2=56425&view=diff ============================================================================== --- trunk/sound/sound/src/write_routines.ycp (original) +++ trunk/sound/sound/src/write_routines.ycp Thu Mar 26 12:55:40 2009 @@ -238,14 +238,14 @@ // remove the options for unused modules list<string> configured_options = []; - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 ) { configured_options = SCR::Dir(.modprobe_sound.options); } else { // the file doesn't exist, create an empty file - SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/sound"); + SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/50-sound.conf"); } // must be called before SaveOneModulesEntry() @@ -311,7 +311,7 @@ * @param als list with old aliases */ define void removeOldEntries(list als) ``{ - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 ) { maplist(string e, (list<string>) als, ``{ if (is_snd_alias(e) || @@ -329,7 +329,7 @@ */ define void RemoveOldConfiguration () ``{ - y2milestone ("removing old sound configuration from /etc/modprobe.conf (it was already saved to /etc/modprobe.d/sound)"); + y2milestone ("removing old sound configuration from /etc/modprobe.conf (it was already saved to /etc/modprobe.d/50-sound.conf)"); path mod = .modules; path mod_alias = .modules.alias; @@ -395,7 +395,7 @@ } /** - * Saves all '/etc/modprobe.d/sound' entries + * Saves all '/etc/modprobe.d/50-sound.conf' entries * @param save_info cards save info * @param system sytem dependent part * @return map return struct: $["return": boolean, "err_msg": string] @@ -411,7 +411,7 @@ list als=[]; string err_msg = ""; - if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 && contains(SCR::Dir(mod), "alias")) + if (SCR::Read(.target.size, "/etc/modprobe.d/50-sound.conf") >=0 && contains(SCR::Dir(mod), "alias")) { als = (list)SCR::Read(mod_alias); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org