[yast-commit] r66615 - in /trunk/iscsi-client: package/ src/ testsuite/tests/ - YaST Commits

27 Oct 2011

Author: fehr
Date: Thu Oct 27 12:17:53 2011
New Revision: 66615
URL: http://svn.opensuse.org/viewcvs/yast?rev=66615&view=rev
Log:
adapt to changed name of start scripts open-iscsi -> iscsid (bnc#661401)
Modified:
    trunk/iscsi-client/package/yast2-iscsi-client.changes
    trunk/iscsi-client/src/IscsiClientLib.ycp
    trunk/iscsi-client/src/inst_iscsi-client.ycp
    trunk/iscsi-client/src/iscsi-client_finish.ycp
    trunk/iscsi-client/src/widgets.ycp
    trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out
    trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp
Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-...
==============================================================================

--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Oct 27 12:17:53 2011
@@ -1,7 +1,13 @@
 -------------------------------------------------------------------
+Thu Oct 27 11:41:58 CEST 2011 - fehr@suse.de
+
+- adapt to changed name of start scripts open-iscsi -> iscsid 
+  (bnc#661401)
+
+-------------------------------------------------------------------
 Wed Oct 26 15:26:38 CEST 2011 - fehr@suse.de
-- adapt to changed output if iscsi_offload script (bnc#725833)
+- adapt to changed output of iscsi_offload script (bnc#725833)
-------------------------------------------------------------------
 Thu Oct 20 14:57:42 CEST 2011 - fehr@suse.de
Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.y...
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Oct 27 12:17:53 2011
@@ -18,7 +18,7 @@
 map<string,string> iface_file = $[];
 list<string> iface_eth = [];
-// status of rcopen-iscsi service
+// status of rciscsid service
 boolean serviceStatus = false;
 // main configuration file (/etc/iscsi/iscsid.conf)
 map<string, any> config = $[];
@@ -95,20 +95,20 @@
// get accessor for service status
 global boolean GetStartService() {
- boolean status = Service::Enabled("open-iscsi");
- y2milestone("Status of open-iscsi %1", status);
+ boolean status = Service::Enabled("iscsid");
+ y2milestone("Status of iscsid %1", status);
  return status;
 }
// set accessor for service status
 global void SetStartService(boolean status) {
- y2milestone("Set status of open-iscsi to %1", status);
+ y2milestone("Set status of iscsid to %1", status);
  if (status == true) {
-    Service::Enable("boot.open-iscsi");
-    Service::Enable("open-iscsi");
+    Service::Enable("boot.iscsid");
+    Service::Enable("iscsid");
  } else {
-    Service::Disable("boot.open-iscsi");
-    Service::Disable("open-iscsi");
+    Service::Disable("boot.iscsid");
+    Service::Disable("iscsid");
  }
 }
@@ -330,7 +330,7 @@
   y2milestone("Initiatorname %1 written", initiatorname);
  }
  // reload service when initiatorname is changed to re-read new value (bnc#482429)
- Service::Reload("open-iscsi");
+ Service::Reload("iscsid");
  return ret;
 }
@@ -518,7 +518,7 @@
 }
-// get status of open-iscsi
+// get status of iscsid
 global boolean getServiceStatus(){
  boolean ret = true;
  if (Stage::initial()){
@@ -527,15 +527,15 @@
   startIScsid();
} else {
-  if (Service::Status("open-iscsi") == 0) serviceStatus=true;
+  if (Service::Status("iscsid") == 0) serviceStatus=true;
   y2milestone("Service status = %1", serviceStatus);
   // if not enabled, start it manually
-  if (!serviceStatus) Service::Start("open-iscsi");
+  if (!serviceStatus) Service::Start("iscsid");
  }
  return ret;
 }
-// set startup status of open-iscsi
+// set startup status of iscsid
 global boolean setServiceStatus(){
  boolean ret = true;
 // if disabled and no connected targets - stop it
@@ -544,10 +544,10 @@
     readSessions();
     if (size(sessions)==0) {
    	 y2milestone("No active sessions - stopping service");
-		 Service::Stop("open-iscsi");
+		 Service::Stop("iscsid");
    	}
    }
- y2milestone("Status service for open-iscsi: %1", ret);
+ y2milestone("Status service for iscsid: %1", ret);
  return ret;
 }
Modified: trunk/iscsi-client/src/inst_iscsi-client.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/inst_iscsi-clien...
==============================================================================
--- trunk/iscsi-client/src/inst_iscsi-client.ycp (original)
+++ trunk/iscsi-client/src/inst_iscsi-client.ycp Thu Oct 27 12:17:53 2011
@@ -33,7 +33,7 @@
 /* main ui function */
 any ret = nil;
-y2milestone("start open-iscsi");
+y2milestone("start iscsid");
 SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi");
 // check initiator name, create if not exists
 //WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + String::Quote(Installation::destdir) + "/etc/iscsi/");
Modified: trunk/iscsi-client/src/iscsi-client_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/iscsi-client_fin...
==============================================================================
--- trunk/iscsi-client/src/iscsi-client_finish.ycp (original)
+++ trunk/iscsi-client/src/iscsi-client_finish.ycp Thu Oct 27 12:17:53 2011
@@ -49,9 +49,9 @@
   // 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.open-iscsi");
-	 Service::Enable("open-iscsi");
-	y2milestone("open-iscsi service enabled");
+	 Service::Enable("boot.iscsid");
+	 Service::Enable("iscsid");
+	y2milestone("iscsid service enabled");
    }
 }
 else
Modified: trunk/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=...
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Thu Oct 27 12:17:53 2011
@@ -296,7 +296,7 @@
     SCR::Execute(.target.bash, "killproc /sbin/iscsid");
     IscsiClientLib::startIScsid();
    }
-		else SCR::Execute(.target.bash, "rcopen-iscsi restart");
+		else SCR::Execute(.target.bash, "rciscsid restart");
    y2milestone("write initiatorname %1", IscsiClientLib::initiatorname);
  }
  if ((string)UI::QueryWidget(`offload_card, `Value) != IscsiClientLib::GetOffloadCard()){
Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetS...
==============================================================================
--- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out (original)
+++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out Thu Oct 27 12:17:53 2011
@@ -1,15 +1,15 @@
 Read	.target.tmpdir "/tmp"
-Read	.target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Execute	.target.bash "/sbin/chkconfig -l open-iscsi | /usr/bin/grep -q '[0-6]:on'" 0
+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.open-iscsi" $["isreg":true]
-Read	.target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true]
-Read	.target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true]
-Read	.init.scripts.runlevel "boot.open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "boot.open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["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/open-iscsi" $["isreg":true]
-Read	.target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Read	.target.stat "/etc/init.d/open-iscsi" $["isreg":true]
-Read	.init.scripts.runlevel "open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]]
-Read	.init.scripts.comment "open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["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" $["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/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":[]]]
 Return	nil
Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetS...
==============================================================================
--- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp (original)
+++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Thu Oct 27 12:17:53 2011
@@ -9,8 +9,8 @@
         "init" :$[
          "scripts" :$[
           "exists" : true,
-	       "runlevel" : $[ "open-iscsi":$["start":["3","5"], "stop":["3", "5"]], "boot.open-iscsi":$["start":["B"], "stop":[]] ],
-	       "comment" : $["open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.open-iscsi":$["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":$["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":[]]],
          ]
         ]
         ];
-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    