Author: lslezak Date: Wed Apr 30 10:55:15 2008 New Revision: 47193 URL: http://svn.opensuse.org/viewcvs/yast?rev=47193&view=rev Log: - save non-PCI and non-USB sound cards to MODULES_LOADED_ON_BOOT sysconfig variable (bnc#331659) - remove empty 'options snd' config line when there is no sound card configured - 2.16.10 Modified: trunk/sound/VERSION trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/wizards.ycp trunk/sound/sound/src/write_routines.ycp Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=47193&r1=47192&r2=47193&view=diff ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Wed Apr 30 10:55:15 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=47193&r1=47192&r2=47193&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Wed Apr 30 10:55:15 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 30 10:48:36 CEST 2008 - lslezak@suse.cz + +- save non-PCI and non-USB sound cards to MODULES_LOADED_ON_BOOT + sysconfig variable (bnc#331659) +- remove empty 'options snd' config line when there is no sound + card configured +- 2.16.10 + +------------------------------------------------------------------- Fri Apr 25 08:54:59 CEST 2008 - lslezak@suse.cz - do not write 'index' option, write 'slots' option of 'snd' driver Modified: trunk/sound/sound/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/wizards.ycp?rev=47193&r1=47192&r2=47193&view=diff ============================================================================== --- trunk/sound/sound/src/wizards.ycp (original) +++ trunk/sound/sound/src/wizards.ycp Wed Apr 30 10:55:15 2008 @@ -104,6 +104,7 @@ removed_info["bus_hwcfg"] = removed_card["bus_hwcfg"]:""; removed_info["sysfs_bus_id"] = removed_card["sysfs_bus_id"]:""; removed_info["unique_key"] = removed_card["unique_key"]:""; + removed_info["module"] = removed_card["module"]:""; if (!contains(Sound::removed_info, removed_info)) { Modified: trunk/sound/sound/src/write_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/write_routines.ycp?rev=47193&r1=47192&r2=47193&view=diff ============================================================================== --- trunk/sound/sound/src/write_routines.ycp (original) +++ trunk/sound/sound/src/write_routines.ycp Wed Apr 30 10:55:15 2008 @@ -76,8 +76,9 @@ boolean ret = true; if (haskey (entry, "alias")) { + string module_name = entry["module"]:"" ; // this is a hack for snd-aoa driver, additional modules are needed (#217300) - if (entry["module"]:"" == "snd-aoa") + if (module_name == "snd-aoa") { // write the extra module (snd-aoa-i2sbus) to /etc/init.d/sound, add "00" suffix to the alias path extra_alias = add(.modprobe_sound.alias, (entry["alias"]:"off") + "00"); @@ -94,8 +95,36 @@ string modcomment = createAliasComment(entry["model"]: "", entry["unique_key"]:""); - ret = ret && SCR::Write(mod_alias, entry["module"]:"off"); + ret = ret && SCR::Write(mod_alias, module_name); ret = ret && SCR::Write(mod_alias_comment, modcomment); + + // load the module automatically on boot + if (entry["bus"]:"" != "pci" && entry["bus"]:"" != "usb" && module_name != "") + { + y2milestone("The soundcard is not attached to PCI or USB"); + + string on_boot_sysconfig = (string)SCR::Read(.sysconfig.kernel.MODULES_LOADED_ON_BOOT); + y2milestone("/etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT: %1", on_boot_sysconfig); + + list<string> on_boot_modules = splitstring(on_boot_sysconfig, " "); + on_boot_modules = filter(string mod, on_boot_modules, {return mod != nil && mod != "";}); + y2milestone("Load modules: %1", on_boot_modules); + + // add the module to sysconfig if it is missing + if (!contains(on_boot_modules, module_name)) + { + y2milestone("Adding %1 to MODULES_LOADED_ON_BOOT", module_name); + if (on_boot_sysconfig != "") + { + on_boot_sysconfig = on_boot_sysconfig + " "; + } + + on_boot_sysconfig = on_boot_sysconfig + module_name; + y2milestone("New MODULES_LOADED_ON_BOOT value: %1", on_boot_sysconfig); + + ret = ret && SCR::Write(.sysconfig.kernel.MODULES_LOADED_ON_BOOT, on_boot_sysconfig); + } + } } return ret; } @@ -130,10 +159,60 @@ ); string slot_option = mergestring(drivers, ","); - y2milestone("Writing slots option: %1", slot_option); - // write 'snd' options - SCR::Write( add(.modprobe_sound.options, "snd"), $[ "slots" : slot_option ]); + // write 'snd' options or remove the option line if there is no sound card + if (slot_option != "") + { + y2milestone("Writing slots option: %1", slot_option); + SCR::Write(add(.modprobe_sound.options, "snd"), $[ "slots" : slot_option ]); + } + else + { + y2milestone("Removing slots option"); + SCR::Write(add(.modprobe_sound.options, "snd"), nil); + } + } + + void RemovedUnusuedModulesFromSysconfig() + { + // remove unused modules from MODULES_LOADED_ON_BOOT + string on_boot_sysconfig = (string)SCR::Read(.sysconfig.kernel.MODULES_LOADED_ON_BOOT); + y2milestone("/etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT: %1", on_boot_sysconfig); + + list<string> on_boot_modules = splitstring(on_boot_sysconfig, " "); + on_boot_modules = filter(string mod, on_boot_modules, {return mod != nil && mod != "";}); + y2debug("Module list: %1", on_boot_modules); + + list<string> removed_modules = toset(maplist(map card, Sound::removed_info, + {return card["module"]:"";})); + removed_modules = filter(string mod, removed_modules, {return mod != nil && mod != "";}); + + boolean modified = false; + foreach(string removed_module, removed_modules, + { + // remove the module from sysconfig if it is there + if (contains(on_boot_modules, removed_module)) + { + y2milestone("Removing %1 from MODULES_LOADED_ON_BOOT", removed_module); + + // remove the module + on_boot_modules = filter(string mod, on_boot_modules, {return mod != removed_module;}); + modified = true; + } + } + ); + + // write the change + if (modified) + { + on_boot_sysconfig = mergestring(on_boot_modules, " "); + y2milestone("New MODULES_LOADED_ON_BOOT value: %1", on_boot_sysconfig); + SCR::Write(.sysconfig.kernel.MODULES_LOADED_ON_BOOT, on_boot_sysconfig); + } + else + { + y2milestone("Nothing removed from MODULES_LOADED_ON_BOOT"); + } } /** @@ -142,8 +221,8 @@ * @param save_info save info * @return void */ - define void SaveModulesOptions(list save_info) ``{ + y2milestone("SaveModulesOptions: %1", save_info); path mod_options = .modprobe_sound.options; @@ -164,6 +243,10 @@ SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/sound"); } + // must be called before SaveOneModulesEntry() + // to write the module back if it is used by another configured card!! + RemovedUnusuedModulesFromSysconfig(); + foreach(string op, configured_options, { if (!contains(mods, op)) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org