[yast-commit] r44298 - in /branches/SuSE-SLE-10-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp

Author: mzugec Date: Fri Feb 8 16:55:12 2008 New Revision: 44298 URL: http://svn.opensuse.org/viewcvs/yast?rev=44298&view=rev Log: space in InitiatorName (#359967) Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION?rev=44298&r1=44297&r2=44298&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION Fri Feb 8 16:55:12 2008 @@ -1 +1 @@ -2.14.39 +2.14.40 Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=44298&r1=44297&r2=44298&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Fri Feb 8 16:55:12 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 8 17:54:14 CET 2008 - mzugec@suse.de + +- space in InitiatorName (#359967) +- 2.14.40 + +------------------------------------------------------------------- Tue Jan 29 21:08:49 CET 2008 - mzugec@suse.de - adapt for upstream-style iscsiadm output (without recordID) Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp?rev=44298&r1=44297&r2=44298&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp Fri Feb 8 16:55:12 2008 @@ -296,12 +296,13 @@ y2milestone("%1 not exist, create", file); map output = (map)SCR::Execute (.target.bash_output, - "/sbin/iscsi-iname -p iqn.`date +%Y-%m`.de.suse:01", $[]); + "/sbin/iscsi-iname -p iqn.`date +%Y-%m`.de.suse:01 | tr -d '\n'", $[]); if (size(output["stderr"]:"")==0){ +y2internal("initiatorname %1", output); initiatorname=output["stdout"]:""; } else ret = false; } - ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1", initiatorname)); + ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1\n", initiatorname)); SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]); } else { initiatorname=((map)SCR::Execute(.target.bash_output, sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; @@ -603,7 +604,7 @@ initiatorname = ay_settings["initiatorname"]:""; if (size(initiatorname)>0){ string file="/etc/iscsi/initiatorname.iscsi"; - SCR::Write (.target.string, file, sformat("InitiatorName=%1", initiatorname)); + SCR::Write (.target.string, file, sformat("InitiatorName=%1\n", initiatorname)); SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]); } else IscsiClient::checkInitiatorName(); // start daemon before -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org