Author: ug
Date: Mon Feb 15 15:48:39 2010
New Revision: 60816
URL: http://svn.opensuse.org/viewcvs/yast?rev=60816&view=rev
Log:
image installation enhanced + UI added
Modified:
trunk/autoinstallation/package/autoyast2.changes
trunk/autoinstallation/src/clients/inst_autoimage.ycp
trunk/autoinstallation/src/clients/software_auto.ycp
trunk/autoinstallation/src/include/xml.ycp
trunk/autoinstallation/src/modules/AutoinstImage.ycp
trunk/autoinstallation/src/modules/AutoinstSoftware.ycp
Modified: trunk/autoinstallation/package/autoyast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/package/autoyast2.changes (original)
+++ trunk/autoinstallation/package/autoyast2.changes Mon Feb 15 15:48:39 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Feb 15 15:48:05 CET 2010 - ug@suse.de
+
+- image installation enhanced + UI added
+
+-------------------------------------------------------------------
Thu Jan 28 13:23:03 CET 2010 - ug@suse.de
- you can choose a different inst-source in the UI then the one
Modified: trunk/autoinstallation/src/clients/inst_autoimage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autoimage.ycp?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/src/clients/inst_autoimage.ycp (original)
+++ trunk/autoinstallation/src/clients/inst_autoimage.ycp Mon Feb 15 15:48:39 2010
@@ -17,6 +17,9 @@
import "AutoinstImage";
import "AutoinstSoftware";
import "AutoinstScripts";
+import "AutoinstConfig";
+
+include "autoinstall/io.ycp";
AutoinstScripts::Write("postpartitioning-scripts", false);
@@ -56,8 +59,14 @@
// return `abort;
//}
-AutoinstImage::getScript();
-AutoinstImage::runScript();
+while( !AutoinstImage::getScript() ) {
+ Report::Error( sformat( _("fetching image-script failed:\n%1"), GET_error) );
+}
+
+while( AutoinstImage::runScript() != 0 ) {
+ string output = (string)SCR::Read (.target.string, "/tmp/ayast_image.log");
+ Report::Error( sformat( _("running image-script failed:\n%1"), output ) );
+}
Progress::Finish();
Modified: trunk/autoinstallation/src/clients/software_auto.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/software_auto.ycp?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/src/clients/software_auto.ycp (original)
+++ trunk/autoinstallation/src/clients/software_auto.ycp Mon Feb 15 15:48:39 2010
@@ -65,8 +65,8 @@
term contents = `VBox(
`HBox(
`VBox(
- `TextEntry(`id(`location), _("Location of the installation source"), mainRepo),
- `CheckBox(`id(`localSource), `opt(`notify), _("The inst-source of this system"), mainRepo == "" )
+ `TextEntry(`id(`location), `opt(`notify), _("Location of the installation source (like http://myhost/11.3/DVD1/)"), mainRepo),
+ `CheckBox(`id(`localSource), `opt(`notify), _("The inst-source of this system (you can't create images if you choose this)"), mainRepo == "" )
)
),
`HBox(
@@ -79,6 +79,11 @@
boolean okay = false;
do {
any ret = nil;
+ if( size( (string)UI::QueryWidget(`id(`location), `Value)) > 0 ) {
+ UI::ChangeWidget(`id(`localSource) , `Enabled, false);
+ } else {
+ UI::ChangeWidget(`id(`localSource) , `Enabled, true);
+ }
ret = UI::UserInput();
if( ret == `ok ) {
if( (boolean)UI::QueryWidget(`id(`localSource), `Value) ) {
Modified: trunk/autoinstallation/src/include/xml.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml.ycp?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/src/include/xml.ycp (original)
+++ trunk/autoinstallation/src/include/xml.ycp Mon Feb 15 15:48:39 2010
@@ -99,7 +99,7 @@
"net-udev":"rule"
];
- doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url", "location"];
+ doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url", "location", "script_source"];
// doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd";
doc["rootElement"] = "profile";
doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns";
Modified: trunk/autoinstallation/src/modules/AutoinstImage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstImage.ycp?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoinstImage.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoinstImage.ycp Mon Feb 15 15:48:39 2010
@@ -36,8 +36,8 @@
return ret;
}
- global define boolean runScript() {
- SCR::Execute(.target.bash, "/bin/sh /tmp/image.sh" );
- return true;
+ global define integer runScript() {
+ string params = mergestring( AutoinstSoftware::image["script_params"]:[], " " );
+ return (integer)SCR::Execute(.target.bash, sformat( "/bin/sh -x /tmp/image.sh %1 > /tmp/ayast_image.log 2>&1",params) );
}
}
Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=60816&r1=60815&r2=60816&view=diff
==============================================================================
--- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original)
+++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Mon Feb 15 15:48:39 2010
@@ -23,6 +23,10 @@
import "ProductControl";
import "Storage";
import "Mode";
+ import "Misc";
+ import "Directory";
+
+ include "autoinstall/io.ycp";
// All shared data are in yast2.rpm to break cyclic dependencies
import "AutoinstData";
@@ -32,6 +36,7 @@
global map Software = $[];
global map image = $[];
+ global string image_arch = "";
// patterns
global list<string> patterns = [];
@@ -54,6 +59,8 @@
global list > all_xpatterns = [];
global string instsource = "";
+ global string isolinuxcfg = "";
+
/**
* Function sets internal variable, which indicates, that any
@@ -162,7 +169,7 @@
modified = true;
*/
image = settings["image"]:$[];
- if( size(image) > 0 )
+ if( image["image_location"]:"" != "" && image["image_name"]:"" != "" )
imaging=true;
return true;
@@ -181,6 +188,206 @@
return;
}
+ define string GetArchOfELF (string filename)
+ {
+ map bash_out = (map) SCR::Execute (.target.bash_output, Directory::ybindir +
+ "/elf-arch " + filename);
+ if (bash_out["exit"]:1 != 0)
+ return "unknown";
+ return deletechars (bash_out["stdout"]:"unknown", "\n");
+ }
+
+
+ global define void createImage( string targetdir ) {
+ string rootdir = (string)SCR::Read(.target.tmpdir);
+ string zypperCall = "";
+ string outputRedirect = " 2>&1 >> /tmp/ay_image.log";
+ image["script_location"] = image["script_location"]:"file:///var/adm/autoinstall/fetch_image.sh";
+ image["script_params"] = image["script_params"]:[ image["image_location"]:""+"/"+image["image_name"]:"image"+".tar.gz" ];
+
+ SCR::Execute (.target.bash, "rm -f /tmp/ay_image.log" );
+
+ // bind-mount devices
+ SCR::Execute (.target.mkdir, rootdir+"/dev" );
+ integer returnCode = (integer)SCR::Execute (.target.bash, sformat("touch /%1/dev/null", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("touch /%1/dev/zero", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("mount -o bind /dev/zero /%1/dev/zero", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("mount -o bind /dev/null /%1/dev/null", rootdir));
+
+ // Add Source:
+ // zypper --root /space/tmp/tmproot/ ar ftp://10.10.0.100/install/SLP/openSUSE-11.2/i386/DVD1/ main
+ zypperCall = sformat("ZYPP_READONLY_HACK=1 zypper --root %1 --gpg-auto-import-keys --non-interactive ar %2 main-source %3", rootdir, instsource, outputRedirect );
+ y2milestone("running %1", zypperCall );
+ returnCode = (integer)SCR::Execute (.target.bash, zypperCall);
+ if( returnCode != 0 && returnCode != 4 ) {
+ // 4 means "already exists"
+ Popup::Error( sformat( _("Adding repo %1 failed"), instsource) );
+ }
+
+ // Add add-ons
+ map addOnExport = (map)WFM::CallFunction("add-on_auto", ["Export"]);
+ list<map> addOns = addOnExport["add_on_products"]:[];
+ foreach( map addOn, addOns, ``{
+ zypperCall = sformat("ZYPP_READONLY_HACK=1 zypper --root %1 --gpg-auto-import-keys --non-interactive ar %2 %3 %4",
+ rootdir, addOn["media_url"]:"", addOn["product"]:"", outputRedirect );
+ returnCode = (integer)SCR::Execute (.target.bash, zypperCall);
+ if( returnCode != 0 && returnCode != 4 ) {
+ Popup::Error( sformat( _("Adding repo %1 failed"), addOn["product"]:"") );
+ }
+ });
+
+ // Install
+ zypperCall = sformat("ZYPP_READONLY_HACK=1 zypper --root %1 --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses ", rootdir);
+
+ string pattern = mergestring(patterns, " ");
+ Popup::ShowFeedback( "Creating Image - installing patterns", "");
+ y2milestone("installing %1", pattern);
+ returnCode = (integer)SCR::Execute (.target.bash, zypperCall+"-t pattern " + pattern + outputRedirect);
+ Popup::ClearFeedback();
+ if( returnCode != 0 ) {
+ Popup::Error( _("Image creation failed while pattern installation. Please check /tmp/ay_image.log") );
+ }
+
+ if( size(PackageAI::toinstall) > 0 ) {
+ string package = mergestring( PackageAI::toinstall, " ");
+ Popup::ShowFeedback( _("Creating Image - installing packages"), "");
+ returnCode = (integer)SCR::Execute (.target.bash, zypperCall+" " package + outputRedirect);
+ Popup::ClearFeedback();
+ if( returnCode != 0 ) {
+ Popup::Error( _("Image creation failed while package installation. Please check /tmp/ay_image.log") );
+ }
+ }
+
+ image_arch = GetArchOfELF( sformat("%1/bin/bash",rootdir) );
+ y2milestone("Image architecture = %1", image_arch);
+ if( targetdir == "" ) {
+ Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
+ targetdir = UI::AskForExistingDirectory ( "/", _("Store image to ...") );
+ }
+
+ // umount devices
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/dev/null", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/dev/zero", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("umount /%1/proc", rootdir));
+ returnCode = (integer)SCR::Execute (.target.bash, sformat("rm -rf /%1/dev", rootdir));
+
+ // Compress image:
+ // tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
+ string tarCommand = sformat("tar cfvz %4/%3.tar.gz --exclude=\"./proc*\" --exclude=\"/%3.tar.gz\" -C %1 . %2", rootdir, outputRedirect, image["image_name"]:"", targetdir);
+ y2milestone("running %1", tarCommand);
+ Popup::Message( sformat( _("You can do changes to the image now in %1.\nIf you press the ok-button, the image will be compressed and can't be changed anymore."), rootdir ) );
+ Popup::ShowFeedback( "Compressing Image ...", "" );
+ returnCode = (integer)SCR::Execute (.target.bash, tarCommand);
+ Popup::ClearFeedback();
+ if( returnCode != 0 ) {
+ Popup::Error( sformat( _("Image compressing failed in '%1'. Please check /tmp/ay_image.log"), rootdir ) );
+ }
+ Popup::Message( _("Image created successfully") );
+
+ }
+
+ global define boolean copyFiles4ISO( string target ) {
+ boolean ret = true;
+ string copy = Misc::SysconfigRead( .sysconfig.autoinstall.COPY_FOR_ISO,
+ "/,/boot/,/boot/__ARCH__/,/boot/__ARCH__/loader/,/media.1/,/suse/setup/descr/");
+ list<string> copyList = splitstring(copy,",");
+
+ foreach( string source, copyList, ``{
+ if( issubstring( source, "__ARCH__" ) )
+ source = regexpsub( source, "(.*)__ARCH__(.*)", sformat("\\1%1\\2", image_arch) );
+ if( substring( source, size(source)-1 ) == "/" ) {
+ // copy a directory (ends with / in directory.yast)
+ SCR::Execute (.target.mkdir, target+"/"+source );
+ if( !GetURL( instsource+"/"+source+"directory.yast", "/tmp/directory.yast" ) ) {
+ Popup::Error( sformat(_("can not get the directory.yast file at `%1`.\nYou can create that file with 'ls -F > directory.yast' if it's missing."), instsource+"/"+source));
+ ret = false;
+ break;
+ }
+ // directory.yast is our filelist
+ string files = (string)SCR::Read(.target.string, "/tmp/directory.yast");
+ list<string> filesInDir = splitstring( files, "\n" );
+ foreach( string file, filesInDir, ``{
+ // don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
+ y2milestone("will get %1 from %2 to %3", file, instsource+"/"+source, target );
+ if( size(file) > 0 && substring( file, size(file)-1 ) != "/" )
+ if( !GetURL( instsource+"/"+source+file, target+"/"+source+"/"+file ) ) {
+ Popup::Error( sformat(_("can not read '%1'. ISO creation failed"), instsource+"/"+source+file ) );
+ ret = false;
+ break;
+ }
+ });
+ } else {
+ // copy a file
+ if( !GetURL( instsource+"/"+source, target+"/"+source ) ) {
+ Popup::Error( sformat(_("can not read '%1'. ISO creation failed"), instsource+"/"+source) );
+ ret = false;
+ break;
+ }
+ }
+ });
+ // lets always copy an optional(!) driverupdate file. It's very unlikely that it's in directory.yast
+ GetURL( instsource+"/driverupdate", target+"/driverupdate" );
+ SCR::Execute (.target.bash, sformat("cp /var/adm/autoinstall/scripts/fetch_image.sh %1/",target) );
+ return ret;
+ }
+
+ global define void createISO() {
+ /* we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD */
+ string isodir = "/tmp/ay_iso/";
+ SCR::Execute (.target.bash, sformat("rm -rf %1", isodir) );
+ SCR::Execute (.target.mkdir, isodir );
+ string outputRedirect = " 2>&1 >> /tmp/ay_image.log";
+ integer returnCode = 0;
+ createImage( isodir );
+
+ Popup::ShowFeedback( _("Preparing ISO Filestructure ..."), "" );
+ copyFiles4ISO( isodir );
+ Popup::ClearFeedback();
+
+ // prepare and save autoinst.xml
+ image["image_location"] = "file:///";
+ image["script_params"] = [ image["image_location"]:"" + "/" + image["image_name"]:"" + ".tar.gz" ];
+ image["script_location"] = "file:///fetch_image.sh";
+ Profile::Save( sformat("%1/autoinst.xml", isodir) );
+
+ // prepare and save isolinux.cfg boot menu of the media
+ isolinuxcfg = (string)SCR::Read(.target.string, sformat("%1/boot/%2/loader/isolinux.cfg", isodir, image_arch));
+ list<string> lines = splitstring( isolinuxcfg, "\n" );
+ lines = maplist( string l, lines, {
+ if( issubstring( l, " append " ) )
+ l = l + " autoyast=file:///autoinst.xml";
+ return l;
+ });
+ isolinuxcfg = mergestring( lines, "\n" );
+
+ UI::OpenDialog(
+ `opt( `decorated ),
+ `VBox(
+ `HBox( `VSpacing(14),
+ `MultiLineEdit(`id(`isolinuxcfg), _("boot config for the DVD"), isolinuxcfg )
+ ),
+ `PushButton( `id( `create_image ), `opt( `default, `hstretch ), _("Ok") ),
+ `Label( sformat( _("You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\nIf you press the ok-button, the iso will be created."), isodir) )
+ )
+ );
+ UI::UserInput();
+ isolinuxcfg = (string)UI::QueryWidget(`isolinuxcfg, `Value);
+ UI::CloseDialog();
+ SCR::Write(.target.string, sformat("%1/boot/%2/loader/isolinux.cfg", isodir, image_arch), isolinuxcfg);
+
+ // create the actual ISO file
+ Popup::ShowFeedback( _("Creating ISO File ..."), "" );
+ string cmd = sformat("mkisofs -o /tmp/%1.iso -R -b boot/%3/loader/isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table %2",image["image_name"]:"",isodir, image_arch);
+ y2milestone("executing %1", cmd + outputRedirect);
+ returnCode = (integer)SCR::Execute (.target.bash, cmd);
+ Popup::ClearFeedback();
+ if( returnCode != 0 ) {
+ Popup::Error( sformat("ISO creation failed in '%1'. Please check /tmp/ay_image.log", isodir ) );
+ } else {
+ Popup::Message( sformat(_("ISO successfully created at %1"), "/tmp/"+image["image_name"]:""+".iso" ) );
+ }
+ }
+
/**
* Export data
* @return dumped settings (later acceptable by Import())
@@ -205,6 +412,8 @@
s["instsource"] = instsource;
+ s["image"] = image;
+
return (s);
}
@@ -426,7 +635,8 @@
// SCR::Execute(.target.mkdir, tmproot + "/root");
// Pkg::TargetInit( tmproot + "/root", true);
- Pkg::TargetInit( "/", true);
+// Pkg::TargetInit( "/", true);
+ Pkg::TargetInit( (string)SCR::Read(.target.tmpdir), true );
y2milestone("SourceStartCache: %1", Pkg::SourceStartCache(false));
return;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
