Author: fehr Date: Thu Oct 27 12:52:28 2011 New Revision: 66619 URL: http://svn.opensuse.org/viewcvs/yast?rev=66619&view=rev Log: rename boot.iscsid -> boot.iscsid-early Modified: trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/iscsi-client_finish.ycp trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=66619&r1=66618&r2=66619&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Oct 27 12:52:28 2011 @@ -104,10 +104,10 @@ global void SetStartService(boolean status) { y2milestone("Set status of iscsid to %1", status); if (status == true) { - Service::Enable("boot.iscsid"); + Service::Enable("boot.iscsid-early"); Service::Enable("iscsid"); } else { - Service::Disable("boot.iscsid"); + Service::Disable("boot.iscsid-early"); Service::Disable("iscsid"); } } Modified: trunk/iscsi-client/src/iscsi-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/iscsi-client_finish.ycp?rev=66619&r1=66618&r2=66619&view=diff ============================================================================== --- trunk/iscsi-client/src/iscsi-client_finish.ycp (original) +++ trunk/iscsi-client/src/iscsi-client_finish.ycp Thu Oct 27 12:52:28 2011 @@ -49,7 +49,7 @@ // write open-iscsi database of automatic connected targets WFM::Execute (.local.bash,"test -d /etc/iscsi/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/iscsi' && cp -a /etc/iscsi/* '" + String::Quote(Installation::destdir) + "/etc/iscsi/'"); if ( size(IscsiClientLib::sessions)>0 ){ - Service::Enable("boot.iscsid"); + Service::Enable("boot.iscsid-early"); Service::Enable("iscsid"); y2milestone("iscsid service enabled"); } Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out?rev=66619&r1=66618&r2=66619&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out Thu Oct 27 12:52:28 2011 @@ -2,14 +2,14 @@ Read .target.stat "/etc/init.d/iscsid" $["isreg":true] Execute .target.bash "/sbin/chkconfig -l iscsid | /usr/bin/grep -q '[0-6]:on'" 0 Return true -Read .target.stat "/etc/init.d/boot.iscsid" $["isreg":true] -Read .target.stat "/etc/init.d/boot.iscsid" $["isreg":true] -Read .target.stat "/etc/init.d/boot.iscsid" $["isreg":true] -Read .init.scripts.runlevel "boot.iscsid" $["boot.iscsid":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "boot.iscsid" $["boot.iscsid":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] +Read .init.scripts.runlevel "boot.iscsid-early" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "boot.iscsid-early" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] Read .target.stat "/etc/init.d/iscsid" $["isreg":true] Read .target.stat "/etc/init.d/iscsid" $["isreg":true] Read .target.stat "/etc/init.d/iscsid" $["isreg":true] -Read .init.scripts.runlevel "iscsid" $["boot.iscsid":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "iscsid" $["boot.iscsid":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] +Read .init.scripts.runlevel "iscsid" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "iscsid" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] Return nil Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp?rev=66619&r1=66618&r2=66619&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Thu Oct 27 12:52:28 2011 @@ -9,8 +9,8 @@ "init" :$[ "scripts" :$[ "exists" : true, - "runlevel" : $[ "iscsid":$["start":["3","5"], "stop":["3", "5"]], "boot.iscsid":$["start":["B"], "stop":[]] ], - "comment" : $["iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.iscsid":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]], + "runlevel" : $[ "iscsid":$["start":["3","5"], "stop":["3", "5"]], "boot.iscsid-early":$["start":["B"], "stop":[]] ], + "comment" : $["iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]], ] ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org