fix autoinst scheme with usb (if not mounted) (bnc#817871)

yast · Apr 30, 2013 · 65a22c3 · 65a22c3
1 parent d4b07ba
commit 65a22c3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/include/io.ycp b/src/include/io.ycp
@@ -62,6 +62,7 @@
         map toks =  AutoinstConfig::urltok;
         toks["scheme"] = Scheme;
         toks["host"]   = Host;
+	y2milestone( "Scheme:%1 Host:%2 Path:%3 Localfile:%4", Scheme, Host, Path, Localfile);
         if (regexpsub(Path, "(.*)//(.*)", "\\1\/\\2")!= nil)
         {
             Path = regexpsub(Path, "(.*)//(.*)", "\\1\/\\2");
@@ -314,9 +315,11 @@
                 }
                 foreach( string Host, deviceList, ``{
                     y2milestone("looking for profile on %1", Host);
-		    mount_point = Storage::DeviceMounted("/dev/"+Host);
+		    string mp = Storage::DeviceMounted("/dev/"+Host);
 		    boolean already_mounted = !isempty(mount_point);
-                    y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point);
+		    if( already_mounted )
+			mount_point=mp;
+                    y2milestone("already mounted=%1 mountpoint=%2 mp=%3",already_mounted,mount_point,mp);
                     if( ! already_mounted &&
                         !(boolean)SCR::Execute(.target.mount, [sformat("/dev/%1", Host),
                                         mount_point], "-o noatime") ) {