Author: mzugec Date: Mon Dec 1 13:48:01 2008 New Revision: 53767 URL: http://svn.opensuse.org/viewcvs/yast?rev=53767&view=rev Log: use startup onboot instead of automatic (bnc#449108) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=53767&r1=53766&r2=53767&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Mon Dec 1 13:48:01 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=53767&r1=53766&r2=53767&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon Dec 1 13:48:01 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 1 13:44:58 CET 2008 - mzugec@suse.cz + +- use startup onboot instead of automatic (bnc#449108) +- 2.17.5 + +------------------------------------------------------------------- Tue Nov 18 15:37:55 CET 2008 - ug@suse.de - rnc file added Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=53767&r1=53766&r2=53767&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon Dec 1 13:48:01 2008 @@ -314,7 +314,7 @@ return ret; } -// get (manual/automatic) status of target connecting +// get (manual/onboot) status of target connecting global string getStartupStatus(list<string> record){ string status = ""; y2milestone("Getting status of record %1", record); @@ -360,7 +360,7 @@ return ret; } -// change startup status (manual/automatic) for target +// change startup status (manual/onboot) for target global boolean setStartupStatus(list<string> record, string status){ y2milestone("Set startup status for %1 to %2", record, status); boolean ret = true; @@ -395,9 +395,9 @@ // log on into target SCR::Execute(.target.bash, sformat("iscsiadm -m node -T %1 -p %2:%3 --login ", b["node.name"]:"", b["node.conn[0].address"]:"", b["node.conn[0].port"]:"3260")); - // set startup status to automatic - y2milestone("set startup status to automatic"); - setStartupStatus(curr_rec, "automatic"); + // set startup status to onboot + y2milestone("set startup status to onboot"); + setStartupStatus(curr_rec, "onboot"); } else y2error("Already connected, no autoLogOn needed"); } else y2error("node.name or node.conn[0].address are not available. Couldn't do autoLogOn"); } @@ -434,7 +434,7 @@ y2internal("output %1", output); // if (output["exit"]:-1==0){ // set startup status to auto by default (bnc#400610) - if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic"); + if (!Mode::autoinst()) setStartupStatus(curr_rec, "onboot"); return true; /* } else { Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=53767&r1=53766&r2=53767&view=diff ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Mon Dec 1 13:48:01 2008 @@ -142,15 +142,16 @@ } else Popup::Error(_("No record found.")); break; case(`toggle): - // change manual/automatic status of connected target + // change manual/onboot status of connected target + // don't use automatic anymore (replaced by onboot) (bnc#449108) record = getRecord(); if (size( record )>0){ y2milestone("toggle record %1", record); string startup = IscsiClientLib::getStartupStatus(record); if (size(startup)>0){ if (startup == "manual"){ - y2milestone("Change status for %1 to %2", record, "automatic"); - IscsiClientLib::setStartupStatus(record, "automatic"); + y2milestone("Change status for %1 to %2", record, "onboot"); + IscsiClientLib::setStartupStatus(record, "onboot"); } else { y2milestone("Change status for %1 to %2", record, "manual"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org