Author: ug Date: Wed Jun 3 12:28:05 2009 New Revision: 57414 URL: http://svn.opensuse.org/viewcvs/yast?rev=57414&view=rev Log: CIFS support added Modified: trunk/autoinstallation/doc/Installation.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/doc/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Installation.xml?rev=57414&r1=57413&r2=57414&view=diff ============================================================================== --- trunk/autoinstallation/doc/Installation.xml (original) +++ trunk/autoinstallation/doc/Installation.xml Wed Jun 3 12:28:05 2009 @@ -392,6 +392,10 @@ <entry>autoyast=slp (since openSUSE 11.2, not SLES 11)</entry> <entry>Query the location of the profile from an SLP server (service:autoyast:...)</entry> </row> + <row> + <entry>autoyast=cifs://<server>/<path> (since openSUSE 11.2, not SLES 11)</entry> + <entry>Looks for control file on <server> with CIFS</entry> + </row> </tbody> </tgroup> </table> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=57414&r1=57413&r2=57414&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jun 3 12:28:05 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 3 12:27:36 CEST 2009 - ug@suse.de + +- CIFS support added + +------------------------------------------------------------------- Tue May 19 16:29:54 CEST 2009 - ug@suse.de - old <general> cloning code dropped Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.ycp?rev=57414&r1=57413&r2=57414&view=diff ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Wed Jun 3 12:28:05 2009 @@ -193,6 +193,37 @@ WFM::Execute(.local.umount, mount_point); } + else if (Scheme == "cifs") // CIFS + { + if (!(boolean)SCR::Execute(.target.mount, + [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro" )) + { + y2warning("Mount failed"); + // autoyast tried to mount a NFS directory which failed + GET_error = sformat(_("Mounting %1 failed."), "//" + Host + dirname(Path) ); + return (false); + } + + string copyCmd = "/bin/cp " + mount_point + "/" + basename(Path) + + " " + Localfile; + y2milestone("Copy Command: %1", copyCmd); + if (WFM::Execute (.local.bash, copyCmd ) == 0) + { + GET_error = ""; + ok = true; + } + else + { + // autoyast tried to copy a file via NFS which failed + GET_error = sformat(_("Remote file %1 cannot be retrieved"), mount_point + "/"+ basename(Path) ); + y2error("remote file %1 can't be retrieved", mount_point + "/" + + basename(Path)); + + } + + WFM::Execute(.local.umount, mount_point); + + } else if (Scheme == "floppy" || Scheme == "usb") { if (StorageDevices::FloppyReady() && Scheme == "floppy") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org