Author: lslezak Date: Wed Apr 25 13:00:06 2012 New Revision: 68023 URL: http://svn.opensuse.org/viewcvs/yast?rev=68023&view=rev Log: - path to asound.state has been changed (now stored in /var/lib/alsa instead of /etc) Modified: trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/sound_write.ycp Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=68023&r1=68022&r2=68023&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Wed Apr 25 13:00:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 25 10:55:40 UTC 2012 - lslezak@suse.cz + +- path to asound.state has been changed (now stored in /var/lib/alsa + instead of /etc) + +------------------------------------------------------------------- Tue Apr 24 14:16:09 UTC 2012 - lslezak@suse.cz - reimplemented driver reloading ("rcalsasound reload" does not Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=68023&r1=68022&r2=68023&view=diff ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Wed Apr 25 13:00:06 2012 @@ -204,6 +204,13 @@ include "sound/read_routines.ycp"; include "sound/routines.ycp"; + // returns path to the asound.state file + global define string asound_state() + { + return "/var/lib/alsa/asound.state"; + } + + // ----------- function definitions: /* tiwai: /usr/src/linux/Documentation/sound/alsa/Joystick.txt Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?rev=68023&r1=68022&r2=68023&view=diff ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Wed Apr 25 13:00:06 2012 @@ -85,7 +85,7 @@ // log mixer settings y2milestone("Mixer (%1): %2", when, SCR::Execute(.target.bash_output, "/usr/bin/amixer")); y2milestone("volume_settings: %1", Sound::volume_settings); - y2milestone("asound size: %1", SCR::Read(.target.size, "/etc/asound.state")); + y2milestone("asound size: %1", SCR::Read(.target.size, Sound::asound_state())); } define boolean install_packages(list<string> modules) @@ -279,7 +279,7 @@ Progress::NextStage(); // initialize mixer settings - if (Mode::installation() || SCR::Read(.target.size, "/etc/asound.state") == -1 || Sound::write_only) + if (Mode::installation() || SCR::Read(.target.size, Sound::asound_state()) == -1 || Sound::write_only) { integer i = 0; maplist (map e, (list<map>) save_info, ``{ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org