[yast-commit] r44304 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp src/iscsi-client_finish.ycp

Author: mzugec Date: Fri Feb 8 17:04:16 2008 New Revision: 44304 URL: http://svn.opensuse.org/viewcvs/yast?rev=44304&view=rev Log: space in InitiatorName (#359967) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/iscsi-client_finish.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=44304&r1=44303&r2=44304&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Fri Feb 8 17:04:16 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 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=44304&r1=44303&r2=44304&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Fri Feb 8 17:04:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 8 17:03:25 CET 2008 - mzugec@suse.cz + +- space in InitiatorName (#359967) +- 2.16.3 + +------------------------------------------------------------------- Tue Nov 20 16:08:50 CET 2007 - mzugec@suse.cz - moved some functions to IscsiClientLib Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=44304&r1=44303&r2=44304&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Fri Feb 8 17:04:16 2008 @@ -233,7 +233,7 @@ y2milestone("%1 file exists, create backup", file); SCR::Execute(.target.bash, sformat("mv %1 /etc/iscsi/initiatorname.yastbackup", file)); } - ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1", new_value)); + ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1\n", new_value)); SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]); if (ret){ initiatorname = new_value; @@ -254,7 +254,7 @@ } else { y2milestone("InitiatorNmae does not exist - generate it"); 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){ initiatorname=output["stdout"]:""; } else ret = false; @@ -440,7 +440,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 checkInitiatorName(); // start daemon before 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=44304&r1=44303&r2=44304&view=diff ============================================================================== --- trunk/iscsi-client/src/iscsi-client_finish.ycp (original) +++ trunk/iscsi-client/src/iscsi-client_finish.ycp Fri Feb 8 17:04:16 2008 @@ -45,7 +45,7 @@ else if (func == "Write") { // write open-iscsi database of automatic connected targets - WFM::Execute (.local.bash,"test -d /var/lib/open-iscsi/ && /bin/cp -a /var/lib/open-iscsi/* " + String::Quote(Installation::destdir) + "/var/lib/open-iscsi/"); +// WFM::Execute (.local.bash,"test -d /var/lib/open-iscsi/ && /bin/cp -a /var/lib/open-iscsi/* " + String::Quote(Installation::destdir) + "/var/lib/open-iscsi/"); WFM::Execute (.local.bash,"test -d /etc/iscsi/ && /bin/cp -a /etc/iscsi/* " + String::Quote(Installation::destdir) + "/etc/iscsi/"); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org