Author: locilka Date: Tue Jul 15 10:04:07 2008 New Revision: 49084 URL: http://svn.opensuse.org/viewcvs/yast?rev=49084&view=rev Log: Checking whether the xset exists before executing it Modified: trunk/installation/src/include/inst_inc_all.ycp Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_all.ycp?rev=49084&r1=49083&r2=49084&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Tue Jul 15 10:04:07 2008 @@ -53,9 +53,11 @@ void SetGlobalInstallationFeatures () { // FATE #304395: Disabling (or handling) screensaver during installation // Disabling screen-saver on startup - y2milestone ("Disabling Energy Star (DPMS) features"); - // DPMS off values, disable DPMS, disable screen-saver - WFM::Execute (.local.bash, "/usr/bin/xset dpms 0 0 0; /usr/bin/xset -dpms; /usr/bin/xset s 0 0"); + if (WFM::Read (.local.size, "/usr/bin/xset") != -1) { + y2milestone ("Disabling Energy Star (DPMS) features"); + // DPMS off values, disable DPMS, disable screen-saver + WFM::Execute (.local.bash, "/usr/bin/xset dpms 0 0 0; /usr/bin/xset -dpms; /usr/bin/xset s 0 0"); + } } void FinishInstallation (symbol ret) { @@ -67,9 +69,11 @@ } else { // FATE #304395: Disabling (or handling) screensaver during installation // Enabling screen-saver on exit - y2milestone ("Enabling Energy Star (DPMS) features"); - // default DPMS values, enable DPMS, enable screen-saver - WFM::Execute (.local.bash, "/usr/bin/xset dpms 1200 1800 2400; /usr/bin/xset +dpms; /usr/bin/xset s default"); + if (WFM::Read (.local.size, "/usr/bin/xset") != -1) { + y2milestone ("Enabling Energy Star (DPMS) features"); + // default DPMS values, enable DPMS, enable screen-saver + WFM::Execute (.local.bash, "/usr/bin/xset dpms 1200 1800 2400; /usr/bin/xset +dpms; /usr/bin/xset s default"); + } // TRANSLATORS: busy message UI::OpenDialog (`Label(_("Finishing the installation..."))); // #2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org