Author: lslezak
Date: Fri Mar 7 17:58:45 2008
New Revision: 45301
URL: http://svn.opensuse.org/viewcvs/yast?rev=45301&view=rev
Log:
- fixed path in the slp.reg file (add "/CD1") (#365187)
- 2.16.0
Modified:
trunk/instserver/VERSION
trunk/instserver/package/yast2-instserver.changes
trunk/instserver/src/Instserver.ycp
Modified: trunk/instserver/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=45301&r1=45300&r2=45301&view=diff
==============================================================================
--- trunk/instserver/VERSION (original)
+++ trunk/instserver/VERSION Fri Mar 7 17:58:45 2008
@@ -1 +1 @@
-2.15.4
+2.16.0
Modified: trunk/instserver/package/yast2-instserver.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instserver.changes?rev=45301&r1=45300&r2=45301&view=diff
==============================================================================
--- trunk/instserver/package/yast2-instserver.changes (original)
+++ trunk/instserver/package/yast2-instserver.changes Fri Mar 7 17:58:45 2008
@@ -2,6 +2,8 @@
Fri Mar 7 17:53:45 CET 2008 - lslezak@suse.cz
- check the network service status at startup (#308662)
+- fixed path in the slp.reg file (add "/CD1") (#365187)
+- 2.16.0
-------------------------------------------------------------------
Mon Dec 10 15:41:41 CET 2007 - lslezak@suse.cz
Modified: trunk/instserver/src/Instserver.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?rev=45301&r1=45300&r2=45301&view=diff
==============================================================================
--- trunk/instserver/src/Instserver.ycp (original)
+++ trunk/instserver/src/Instserver.ycp Fri Mar 7 17:58:45 2008
@@ -529,19 +529,19 @@
serv = sformat("service:install.suse:nfs://%1/%2/%3%4,en,65535",
ip,
ServerSettings["directory"]:"", cm["name"]:"",
- (cm["dir-type"]:`onedir == `onedir ) ? "":"/CD1" );
+ "/CD1" );
}
else if (ServerSettings["service"]:`none == `ftp)
{
serv = sformat("service:install.suse:ftp://%1/%2%3,en,65535", ip,
- cm["name"]:"", (cm["dir-type"]:`onedir == `onedir ) ? "":"/CD1");
+ cm["name"]:"", "/CD1");
}
else if (ServerSettings["service"]:`none == `http)
{
serv = sformat("service:install.suse:http://%1/%2/%3%4,en,65535",
ip,
ServerSettings["alias"]:"", cm["name"]:"",
- (cm["dir-type"]:`onedir == `onedir ) ? "":"/CD1");
+ "/CD1");
}
map