Author: gs Date: Tue Aug 5 18:16:24 2008 New Revision: 49734 URL: http://svn.opensuse.org/viewcvs/yast?rev=49734&view=rev Log: check for auditd and apparmor Modified: trunk/auditd/src/Auditd.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49734&r1=49733&r2=49734&view=diff ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Tue Aug 5 18:16:24 2008 @@ -299,23 +299,27 @@ string caption = _("Initializing auditd Configuration"); // Set the right number of stages - integer steps = 2; + integer steps = 3; integer sl = 500; sleep(sl); // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ + /* Progress stage 1/4 */ _("Read the configuration for auditd"), - /* Progress stage 2/3 */ - _("Read the rules file") - /* Progress stage 3/3 */ + /* Progress stage 2/4 */ + _("Read the rules file"), + /* Progress stage 3/4 */ + _("Check status of auditd") + /* Progress stage 3/4 */ ], [ /* Progress step 1/3 */ _("Reading the configuration..."), /* Progress step 2/3 */ _("Reading the rules file..."), + /* Progress step 3/3 */ + _("Cecking status..." ), Message::Finished() ], "" @@ -348,6 +352,13 @@ if(false) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); + Progress::NextStage(); + integer exitcode = Service::Status( "auditd" ); + y2milestone( "Auditd running: %1", (exitcode == 0 )?"yes":"no" ); + + exitcode = (integer)SCR::Execute(.target.bash, "rcapparmor status" ); + y2milestone( "Apparmor loaded: %1", (exitcode == 0 )?"yes":"no" ); + if(PollAbort()) return false; modified = false; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org