Author: juhliarik Date: Wed Jun 18 10:00:54 2008 New Revision: 48375 URL: http://svn.opensuse.org/viewcvs/yast?rev=48375&view=rev Log: - fixed problems with CIFS (bnc #307307, #307336) M kdump/src/uifunctions.ycp * added check for installed cifs-mount package * added fix for adding directory without starting "/" Modified: trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=48375&r1=48374&r2=48375&view=diff ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Wed Jun 18 10:00:54 2008 @@ -348,6 +348,9 @@ } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { result = "cifs://"; + if (findfirstof(KDUMP_SAVE_TARGET["dir"]:"", "/") != 0 ) + KDUMP_SAVE_TARGET["dir"]="/"+KDUMP_SAVE_TARGET["dir"]:""; + if (KDUMP_SAVE_TARGET["user_name"]:nil == "") { result = result+KDUMP_SAVE_TARGET["server"]:nil+"/"+KDUMP_SAVE_TARGET["share"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; } else { @@ -355,7 +358,9 @@ if (KDUMP_SAVE_TARGET["password"]:nil != "") result = result + ":" + KDUMP_SAVE_TARGET["password"]:nil; - result = result + "@"+ KDUMP_SAVE_TARGET["server"]:nil+"/"+KDUMP_SAVE_TARGET["share"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + + result = result + "@"+ KDUMP_SAVE_TARGET["server"]:nil+"/"+KDUMP_SAVE_TARGET["share"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + } } @@ -504,6 +509,15 @@ } } else if (radiobut == "cifs") { + + // fix for bnc #307307 module should check if cifs tools are installed when requested + if (!Package::Installed("cifs-mount")) + { + y2milestone("SMB/CIFS share cannot be mounted, installing missing 'cifs-mount' package..."); + // install cifs-mount package + PackageSystem::CheckAndInstallPackages(["cifs-mount"]); + } + value = tostring(UI::QueryWidget(`id ("server"), `Value)); if ((value == nil) || (value == "")) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org