Mailinglist Archive: yast-commit (545 mails)

[ug@xxxxxxxxxxxxxxxx]

Author: ug
Date: Thu Jan 14 15:05:42 2010
New Revision: 60364

URL: http://svn.opensuse.org/viewcvs/yast?rev=60364&view=rev
Log:
autoyast=label://LABEL/PATH implemented

Modified:
    trunk/autoinstallation/package/autoyast2.changes
    trunk/autoinstallation/src/modules/ProfileLocation.ycp

Modified: trunk/autoinstallation/package/autoyast2.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=60364&r1=60363&r2=60364&view=diff
==============================================================================
--- trunk/autoinstallation/package/autoyast2.changes (original)
+++ trunk/autoinstallation/package/autoyast2.changes Thu Jan 14 15:05:42 2010
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Jan 14 15:05:16 CET 2010 - ug@xxxxxxx
+
+- autoyast=label://LABEL/PATH implemented
+
+-------------------------------------------------------------------
 Wed Dec 23 11:30:12 CET 2009 - ug@xxxxxxx
 
 - merged the code for autoyast=device and autoyast=usb to reduce

Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/ProfileLocation.ycp?rev=60364&r1=60363&r2=60364&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original)
+++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Thu Jan 14 15:05:42 
2010
@@ -76,6 +76,24 @@
             y2milestone("relurl for profile changed to: 
%1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, 
AutoinstConfig::filepath);
             SCR::Write ( .etc.install_inf.ayrelurl, 
sformat("%1://%2/%3",AutoinstConfig::scheme, AutoinstConfig::host, 
AutoinstConfig::filepath) );
             SCR::Write (.etc.install_inf, nil);
+        } else if( AutoinstConfig::scheme == "label" ) {
+            y2milestone("searching label");
+            foreach( string device, map v, Storage::GetTargetMap(), ``{
+                y2milestone("looking on %1", device);
+                foreach( map p, v["partitions"]:[],  ``{
+                    if( p["label"]:"" == AutoinstConfig::host ) {
+                        AutoinstConfig::scheme = "device";
+                        AutoinstConfig::host   = substring( p["device"]:device 
, 5 );
+                        y2milestone("found on %1", AutoinstConfig::host);
+                        break;
+                    }
+                    y2milestone("not found on %1", p["device"]:"hm?");
+                });
+                if( AutoinstConfig::scheme == "device" )
+                    break;
+            });
+            if( AutoinstConfig::scheme == "label" )
+                Popup::Error( _("label not found while looking for autoyast 
profile") );
         }
         string filename = basename(AutoinstConfig::filepath);
 
@@ -83,6 +101,7 @@
         if ( filename != "" )
         {
             y2milestone("File=%1", filename);
+            y2milestone("Get %1://%2/%3 to %4", AutoinstConfig::scheme, 
AutoinstConfig::host, AutoinstConfig::filepath, localfile);
             ret = Get(AutoinstConfig::scheme,
                     AutoinstConfig::host,
                     AutoinstConfig::filepath,

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx