April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56886 - in /branches/SuSE-Code-11-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/Bootloader.ycp
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 15:35:52 2009 New Revision: 56886 URL: http://svn.opensuse.org/viewcvs/yast?rev=56886&view=rev Log: added fix for problem with Live USB stick installation from SUSEStudio bnc#449785 Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-Branch/bootloader/VERSION Tue Apr 21 15:35:52 2009 @@ -1 +1 @@ -2.17.58 +2.17.59 Modified: branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes Tue Apr 21 15:35:52 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:52:59 CEST 2009 - juhliarik(a)suse.cz + +- added fix for problem with creating USB Live installation in + SUSEStudio +- 2.17.59 + +------------------------------------------------------------------- Thu Feb 12 14:57:16 CET 2009 - juhliarik(a)suse.de - added fix for problem with missing error message about using boot Modified: branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp Tue Apr 21 15:35:52 2009 @@ -622,11 +622,12 @@ y2milestone ("Writing bootloader configuration during installation"); boolean ret = true; - // read current settings... - ret = blRead (true, false); - if (! Mode::live_installation()) { + // bnc#449785 - Installing of GRUB fails when using live installer from a USB stick + // read current settings... + ret = blRead (true, false); + // delete duplicated sections DelDuplicatedSections(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56885 - in /trunk/bootloader: ./ src/clients/ src/zipl/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 15:06:11 2009 New Revision: 56885 URL: http://svn.opensuse.org/viewcvs/yast?rev=56885&view=rev Log: update svn ignore Modified: trunk/bootloader/ (props changed) trunk/bootloader/src/clients/ (props changed) trunk/bootloader/src/zipl/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56884 - in /trunk/repair: ./ doc/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 15:04:09 2009 New Revision: 56884 URL: http://svn.opensuse.org/viewcvs/yast?rev=56884&view=rev Log: properly edit svn ignore Modified: trunk/repair/ (props changed) trunk/repair/doc/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56883 - in /trunk/repair: ./ data/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 14:59:54 2009 New Revision: 56883 URL: http://svn.opensuse.org/viewcvs/yast?rev=56883&view=rev Log: fix changes, remove cvsignore Removed: trunk/repair/.cvsignore trunk/repair/data/.cvsignore trunk/repair/doc/.cvsignore trunk/repair/doc/autodocs/.cvsignore trunk/repair/package/.cvsignore trunk/repair/src/.cvsignore trunk/repair/testsuite/.cvsignore trunk/repair/testsuite/tests/.cvsignore Modified: trunk/repair/package/yast2-repair.changes Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Tue Apr 21 14:59:54 2009 @@ -4,6 +4,7 @@ - update minimal version for bootloaders - correctly mount root if selected only bootloader check (bnc #408733) +- correct run direct mount from DVD menu (bnc #450944) - 2.18.1 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56882 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:54:31 2009 New Revision: 56882 URL: http://svn.opensuse.org/viewcvs/yast?rev=56882&view=rev Log: - cleanup Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:54:31 2009 @@ -39,7 +39,7 @@ list<list> ModToInitrdLx = []; list<list> ModToInitrd = []; - list controllers = []; // set by "Probe" + list<map> controllers = []; // set by "Probe" /** @@ -48,7 +48,7 @@ * * @returns integer number of controllers, 0 = none found */ -global define integer Probe () +global integer Probe() { y2milestone( "StorageControllers::Probe()" ); @@ -68,7 +68,7 @@ // return true if all necessary modules were actually loaded // return false if loading failed or was not necessary at all -define boolean startController (map controller) +boolean StartController(map controller) { // check module information // skip controller if no module info available @@ -200,14 +200,14 @@ HwStatus::Set (unique_key, one_module_failed?`no:`yes); - return (!one_module_failed); + return !one_module_failed; } // local function to go through list of resources (list of maps) // checking if '"active":true' is set. -define boolean anyActive (list<map> resources) +boolean AnyActive(list<map> resources) { boolean active = size(resources)==0; @@ -224,7 +224,7 @@ * Start storage related USB and FireWire stuff * */ -global define void StartHotplugStorage () +global void StartHotplugStorage() { import "Hotplug"; @@ -249,8 +249,6 @@ // load sbp2 ModuleLoading::Load ("sbp2", "", "", "SBP2 Protocol", Linuxrc::manual (), true); } - - return; } /** @@ -261,7 +259,7 @@ // O: list of [ loaded modules, module argument ] */ -global define void Initialize() +global void Initialize() { moduleNames = []; moduleArgs = []; @@ -298,8 +296,8 @@ // the controller is disabled in BIOS // this is done by checking for an active IO or memory resource - if( !(anyActive (controller["resource", "io"]:[]) - || anyActive (controller["resource", "mem"]:[]))) + if( !(AnyActive (controller["resource", "io"]:[]) + || AnyActive (controller["resource", "mem"]:[]))) { y2milestone( "Initialize controller %1 disabled in BIOS", controller["device"]:"" ); @@ -309,7 +307,7 @@ } } - module_loaded = startController(controller) || module_loaded; + module_loaded = StartController(controller) || module_loaded; } // while (controller) y2milestone( "Initialize module_loaded %1", module_loaded ); @@ -363,16 +361,13 @@ StartHotplugStorage(); - y2milestone("Initialize all controllers initialized module_loaded:%1", - module_loaded ); + y2milestone("Initialize all controllers initialized module_loaded:%1", module_loaded); + StorageDevices::InitDone(); if( module_loaded ) Storage::ReReadTargetMap(); y2milestone( "Initialize calling EnablePopup()" ); StorageClients::EnablePopup(); - - return; - -}; // Initialize () +}; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56881 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:45:34 2009 New Revision: 56881 URL: http://svn.opensuse.org/viewcvs/yast?rev=56881&view=rev Log: - removed use of ModulesConf module (might break support for parport zip drives) (see bnc #485992) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Apr 21 14:45:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 14:43:05 CEST 2009 - aschnell(a)suse.de + +- removed use of ModulesConf module (might break support for + parport zip drives) (see bnc #485992) + +------------------------------------------------------------------- Mon Apr 20 12:31:55 CEST 2009 - aschnell(a)suse.de - fixed generation of disk_* files (bnc #492452) Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:45:34 2009 @@ -15,8 +15,6 @@ module "StorageControllers"; import "Arch"; - import "Mode"; - import "ModulesConf"; import "ModuleLoading"; import "HwStatus"; import "Initrd"; @@ -43,20 +41,6 @@ list controllers = []; // set by "Probe" - // remember postinstall modules (like imm and ppa) - // which must be installed *last* - - list postinstall_names = [ "imm", "ppa" ]; - - // postinstall modules information - // list of [ boolean modprobe, - // string module_name, - // string module_arg, - // string vendor, - // string device] - - list<list> postinstall_info = []; - /** * Probe storage controllers @@ -80,63 +64,6 @@ } - -// -------------------------------------------------------------- - -// parportInitialize - -define void parportInitialize () - ``{ - // post-load parport module - if ((size (postinstall_info) == 0) || Mode::test ()) - { - return; - } - - boolean parport_loaded = false; - boolean parport_pc_loaded = false; - - foreach (list postlist, postinstall_info, - ``{ - boolean post_modprobe = postlist[0]:false; - string post_name = postlist[1]:""; - string post_arg = postlist[2]:""; - string post_vendor = postlist[3]:""; - string post_device = postlist[4]:""; - if (!parport_loaded) - { - if( `ok == ModuleLoading::Load( "parport", "", post_vendor, - post_device, Linuxrc::manual (), true )) - { - ModulesConf::ModuleArgs ("parport", ""); - parport_loaded = true; - } - } - if( !parport_pc_loaded) - { - if( `ok == ModuleLoading::Load( "parport_pc", "", post_vendor, - post_device, Linuxrc::manual (), true )) - { - ModulesConf::ModuleArgs ("parport_pc", ""); - parport_pc_loaded = true; - } - } - - if( `ok == ModuleLoading::Load( post_name, post_arg, post_vendor, - post_device, Linuxrc::manual (), post_modprobe)) - { - ModulesConf::ModuleArgs (post_name, post_arg); - Kernel::AddModuleToLoad(post_name); - - moduleNames = add( moduleNames, post_name ); - moduleArgs = add( moduleArgs, post_arg ); - y2milestone( "moduleNames %1", moduleNames ); - y2milestone( "moduleArgs %1", moduleArgs ); - } - }); - return; - } - // start a controller (by loading its module) // return true if all necessary modules were actually loaded // return false if loading failed or was not necessary at all @@ -205,23 +132,6 @@ string module_name = module_entry[0]:""; string module_args = module_entry[1]:""; - // remember postinstall modules - - if( contains( postinstall_names, module_name) ) - { - y2milestone("startController name: %1 args: %2", module_name, module_args); - - list vendor_device = - ModuleLoading::prepareVendorDeviceInfo(controller); - - // save data for parportInitialize - postinstall_info = - add( postinstall_info, - [module_modprobe, module_name, module_args, - vendor_device[0]:"", vendor_device[1]:""]); - } - else - { // load module if not yet loaded if( !contains (moduleNames, module_name) ) { @@ -267,7 +177,6 @@ y2milestone( "startController ModToInitrdLx %1", ModToInitrdLx ); } } // not yet loaded - } // not postinstall // break out of module load loop if one module failed @@ -445,10 +354,6 @@ Initrd::AddModule( s[0]:"", s[1]:"" ); }); - y2milestone( "Initialize postinstall_info %1", postinstall_info ); - - parportInitialize (); - // load all raid personalities SCR::Execute(.target.modprobe, "raid0", "" ); SCR::Execute(.target.modprobe, "raid1", "" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56880 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:40:35 2009 New Revision: 56880 URL: http://svn.opensuse.org/viewcvs/yast?rev=56880&view=rev Log: - removed unused s390 dasd code Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:40:35 2009 @@ -41,8 +41,6 @@ list<list> ModToInitrdLx = []; list<list> ModToInitrd = []; - global string dasdParam = ""; - list controllers = []; // set by "Probe" // remember postinstall modules (like imm and ppa) @@ -59,143 +57,6 @@ list<list> postinstall_info = []; - // -------------------------------------------------------------- - - -define list GetDasdList() - ``{ - list ret = []; - list<map> dasd = (list<map>) SCR::Read(.proc.dasddev); - y2milestone( "dasd=%1", dasd ); - foreach( map entry, dasd, - ``{ - term a = `item( `id(entry["name"]:"") ); - a = add( a, entry["name"]:"" ); - a = add( a, entry["address"]:"" ); - a = add( a, entry["state"]:"" ); - ret = add( ret, a ); - }); - return( ret ); - } - -define string S390DasdParams() - ``{ - SCR::UnmountAgent (.proc.modules); - map mod = (map)SCR::Read(.proc.modules); - boolean mod_loaded = haskey(mod, "dasd_mod"); - y2milestone( "mod %1", mod ); - string param = (string)SCR::Read(.etc.install_inf.DASD_Parameter); - if( param==nil ) - { - param = ""; - } - y2milestone( "param %1 size:%2", param, size(param) ); - boolean do_load = !mod_loaded || size(param)==0; - if( do_load ) - { - string okb = Label::AcceptButton(); - // button text - string loadb = _("&Load Module"); - // popup text - string text = sformat( -_("Here, enter the parameters with which to load -the dasd module, such as dasd=FD00-FD0F,FD40. -Press \"%1\" to load the -module. -If the table shows the correct DASDs available, -press \"%2\". -"), deletechars(loadb,"&"), deletechars(okb,"&") ); - - list cont = GetDasdList(); - UI::OpenDialog( - `opt(`decorated), - `HBox( - `HSpacing(1), - `VBox( - `VSpacing(0.5), - // heading text - `Left(`Heading(_("DASD Module Parameter Setting"))), - `VSpacing(0.2), - `Left(`Label(text)), - `VSpacing(0.2), - `HBox( - // label text - `Left(`TextEntry(`id(`param), _("&DASD Parameter"), - param )), - `VSpacing(1), - `Bottom(`PushButton(`id(`load), loadb )) - ), - `VSpacing(1), - `HBox( - `Table( `id(`dd_table), - // heading text - `header( _("DASD Name"), - // heading text - _("DASD Address"), - // heading text - _("Status") ), - cont ), - `VSpacing(10) - ), - `VSpacing(1), - `HBox( - `HStretch(), - `PushButton(`id(`abort), Label::AbortButton() ), - `HStretch(), - `PushButton(`id(`accept), Label::AcceptButton() ), - `HStretch() - ), - `VSpacing(0.5) - ), - `HSpacing(1) - )); - UI::SetFocus(`id(`param)); - symbol ret = `none; - do - { - ret = (symbol)UI::UserInput(); - y2milestone( "ret = %1", ret ); - if( ret == `load ) - { - if( mod_loaded ) - { - SCR::Execute( .target.bash, - "/sbin/rmmod dasd_eckd_mod dasd_fba_mod dasd_mod" ); - } - param = (string)UI::QueryWidget( `id(`param), `Value ); - y2milestone( "param %1", param ); - boolean ret = (boolean)SCR::Execute(.target.modprobe, "dasd_mod", param ); - mod_loaded = true; - y2milestone( "ret=%1", ret ); - if( !ret ) - { - // popup text - Popup::Error( sformat(_("Error loading module dasd with -parameter: %1"), param )); - } - SCR::Execute(.target.modprobe, "dasd_eckd_mod", "" ); - SCR::Execute(.target.modprobe, "dasd_fba_mod", "" ); - cont = GetDasdList(); - UI::ChangeWidget( `id(`dd_table), `Items, cont ); - } - else if( ret == `accept && size(cont)==0 ) - { - ret = `continue; - } - if( (ret == `accept||ret == `abort) && size(cont)==0 ) - { - // popup text - Popup::Error( _("There are no DASD devices active. -It is not possible to install without -active DASD devices.")); - } - } - while( ret != `accept && ret != `abort ); - UI::CloseDialog(); - } - y2milestone( "ret %1", param ); - return( param ); - } /** * Probe storage controllers -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56879 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: locilka Date: Tue Apr 21 14:10:30 2009 New Revision: 56879 URL: http://svn.opensuse.org/viewcvs/yast?rev=56879&view=rev Log: - Using new function GetCachedFileFromSource from AddOnProduct to avoid from a 'jukebox' issues when more different physical media used during installation (bnc #486785). Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Tue Apr 21 14:10:30 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz + +- Using new function GetCachedFileFromSource from AddOnProduct + to avoid from a 'jukebox' issues when more different physical + media used during installation (bnc #486785). + +------------------------------------------------------------------- Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz - Not checking signatures for add_on_products(.xml) file(s), the Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp Tue Apr 21 14:10:30 2009 @@ -100,6 +100,91 @@ // if true, both are skipped at once without asking global boolean skip_add_ons = false; +/** + * @struct $["src_id|media|filename" : "/path/to/the/file"] + */ +map <string, string> source_file_cache = $[]; + +string filecachedir = sformat ("%1/AddOns_CacheDir/", Directory::tmpdir); + +integer filecachecounter = -1; + +/** + * Downloads a requested file, caches it and returns path to that cached file. + * If a file is alerady cached, just returns the path to a cached file. + * Parameter 'sod' defines whether a file is 'signed' (file + file.asc) or 'digested' + * (file digest mentioned in signed content file). + * + * @param integer src_id + * @param integer media + * @param string filename + * @param string sod ("signed" or "digested") + * @param boolean optional (false if mandatory) + * @return string path to a cached file + * + * @example: + * // content file is usually signed with content.asc + * AddOnProduct::GetCachedFileFromSource (8, 1, "/content", "signed", false); + * // the other files are usually digested in content file + * AddOnProduct::GetCachedFileFromSource (8, 1, "/images/images.xml", "digested", true); + */ +global string GetCachedFileFromSource (integer src_id, integer media, string filename, string sod, boolean optional) { + // BNC #486785: Jukebox when using more physical media-based Add-Ons at once + string file_ID = sformat ("%1|%2|%3", src_id, media, filename); + + string provided_file = source_file_cache[file_ID]:""; + + if (provided_file != nil && provided_file != "") { + // Checking whether the cached file exists + if (FileUtils::Exists (provided_file)) { + y2milestone ("File %1 found in cache: %2", file_ID, provided_file); + + return provided_file; + } else { + y2warning ("Cached file %1 not accessible!", provided_file); + source_file_cache = remove (source_file_cache, file_ID); + } + } + + if (optional == nil) optional = true; + + if (sod == "signed") { + provided_file = Pkg::SourceProvideSignedFile (src_id, media, filename, optional); + } else if (sod == "digested") { + provided_file = Pkg::SourceProvideDigestedFile (src_id, media, filename, optional); + } else { + y2error ("Unknown SoD: %1. It can be only 'signed' or 'digested'", sod); + provided_file = nil; + } + + // A file has been found, caching... + if (provided_file != nil) { + filecachecounter = filecachecounter + 1; + + // Where the file is finally cached + string cached_file = sformat ("%1%2", filecachedir, filecachecounter); + + string cmd = sformat ( + "/bin/mkdir -p '%1'; /bin/cp '%2' '%3'", + String::Quote (filecachedir), String::Quote (provided_file), String::Quote (cached_file) + ); + map cmd_run = (map) SCR::Execute (.target.bash_output, cmd); + + // Unable to cache a file, the original file will be returned + if (cmd_run["exit"]:-1 != 0) { + y2warning ("Error caching file: %1: %2", cmd, cmd_run); + } else { + y2milestone ("File %1 cached as %2", file_ID, cached_file); + // Writes entry into cache database + source_file_cache[file_ID] = cached_file; + // Path to a cached file will be returned + provided_file = cached_file; + } + } + + return provided_file; +} + // Which part installation.xml will be used string _inst_mode = "installation"; @@ -420,7 +505,7 @@ } boolean IntegrateY2Update (integer src_id) { - string binaries = Pkg::SourceProvideDigestedFile (src_id, 1, "/y2update.tgz", true /* optional */); + string binaries = GetCachedFileFromSource (src_id, 1, "/y2update.tgz", "digested", true /* optional */); // File /y2update.tgz exists if (binaries != nil) { @@ -603,7 +688,7 @@ y2milestone ("Using cached contentfile %1", contentfile); } else { y2milestone ("Checking contentfile from repository"); - string sourcefile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true); + string sourcefile = GetCachedFileFromSource (src_id, 1, "/content", "signed", true); if (sourcefile == nil) { y2warning ("Cannot obtain content file!"); return nil; @@ -692,7 +777,7 @@ symbol ret = nil; - string control = Pkg::SourceProvideDigestedFile (src_id, 1, "/installation.xml", true /* optional */); + string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); if (control != nil) { y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); @@ -841,7 +926,7 @@ */ void HandleProductPATTERNS (integer srcid) { // FATE #302398: PATTERNS keyword in content file - string content_file = Pkg::SourceProvideSignedFile (srcid, 1, "/content", true); + string content_file = GetCachedFileFromSource (srcid, 1, "/content", "signed", true); if (content_file == nil) { y2warning ("Add-On %1 doesn't have a content file", srcid); @@ -860,7 +945,7 @@ y2milestone ("Integrating repository %1", srcid); // Updating inst-sys - string y2update = Pkg::SourceProvideDigestedFile (srcid, 1, "/y2update.tgz", true /* optional */); + string y2update = GetCachedFileFromSource (srcid, 1, "/y2update.tgz", "digested", true /* optional */); if (y2update == nil) { y2milestone ("No YaST update found on the media"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56878 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: locilka Date: Tue Apr 21 14:10:17 2009 New Revision: 56878 URL: http://svn.opensuse.org/viewcvs/yast?rev=56878&view=rev Log: - Using new function GetCachedFileFromSource from AddOnProduct to avoid from a 'jukebox' issues when more different physical media used during installation (bnc #486785). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 21 14:10:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz + +- Using new function GetCachedFileFromSource from AddOnProduct + to avoid from a 'jukebox' issues when more different physical + media used during installation (bnc #486785). + +------------------------------------------------------------------- Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz - Not checking signatures for add_on_products(.xml) file(s), the Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Tue Apr 21 14:10:17 2009 @@ -100,6 +100,91 @@ // if true, both are skipped at once without asking global boolean skip_add_ons = false; +/** + * @struct $["src_id|media|filename" : "/path/to/the/file"] + */ +map <string, string> source_file_cache = $[]; + +string filecachedir = sformat ("%1/AddOns_CacheDir/", Directory::tmpdir); + +integer filecachecounter = -1; + +/** + * Downloads a requested file, caches it and returns path to that cached file. + * If a file is alerady cached, just returns the path to a cached file. + * Parameter 'sod' defines whether a file is 'signed' (file + file.asc) or 'digested' + * (file digest mentioned in signed content file). + * + * @param integer src_id + * @param integer media + * @param string filename + * @param string sod ("signed" or "digested") + * @param boolean optional (false if mandatory) + * @return string path to a cached file + * + * @example: + * // content file is usually signed with content.asc + * AddOnProduct::GetCachedFileFromSource (8, 1, "/content", "signed", false); + * // the other files are usually digested in content file + * AddOnProduct::GetCachedFileFromSource (8, 1, "/images/images.xml", "digested", true); + */ +global string GetCachedFileFromSource (integer src_id, integer media, string filename, string sod, boolean optional) { + // BNC #486785: Jukebox when using more physical media-based Add-Ons at once + string file_ID = sformat ("%1|%2|%3", src_id, media, filename); + + string provided_file = source_file_cache[file_ID]:""; + + if (provided_file != nil && provided_file != "") { + // Checking whether the cached file exists + if (FileUtils::Exists (provided_file)) { + y2milestone ("File %1 found in cache: %2", file_ID, provided_file); + + return provided_file; + } else { + y2warning ("Cached file %1 not accessible!", provided_file); + source_file_cache = remove (source_file_cache, file_ID); + } + } + + if (optional == nil) optional = true; + + if (sod == "signed") { + provided_file = Pkg::SourceProvideSignedFile (src_id, media, filename, optional); + } else if (sod == "digested") { + provided_file = Pkg::SourceProvideDigestedFile (src_id, media, filename, optional); + } else { + y2error ("Unknown SoD: %1. It can be only 'signed' or 'digested'", sod); + provided_file = nil; + } + + // A file has been found, caching... + if (provided_file != nil) { + filecachecounter = filecachecounter + 1; + + // Where the file is finally cached + string cached_file = sformat ("%1%2", filecachedir, filecachecounter); + + string cmd = sformat ( + "/bin/mkdir -p '%1'; /bin/cp '%2' '%3'", + String::Quote (filecachedir), String::Quote (provided_file), String::Quote (cached_file) + ); + map cmd_run = (map) SCR::Execute (.target.bash_output, cmd); + + // Unable to cache a file, the original file will be returned + if (cmd_run["exit"]:-1 != 0) { + y2warning ("Error caching file: %1: %2", cmd, cmd_run); + } else { + y2milestone ("File %1 cached as %2", file_ID, cached_file); + // Writes entry into cache database + source_file_cache[file_ID] = cached_file; + // Path to a cached file will be returned + provided_file = cached_file; + } + } + + return provided_file; +} + // Which part installation.xml will be used string _inst_mode = "installation"; @@ -420,7 +505,7 @@ } boolean IntegrateY2Update (integer src_id) { - string binaries = Pkg::SourceProvideDigestedFile (src_id, 1, "/y2update.tgz", true /* optional */); + string binaries = GetCachedFileFromSource (src_id, 1, "/y2update.tgz", "digested", true /* optional */); // File /y2update.tgz exists if (binaries != nil) { @@ -603,7 +688,7 @@ y2milestone ("Using cached contentfile %1", contentfile); } else { y2milestone ("Checking contentfile from repository"); - string sourcefile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true); + string sourcefile = GetCachedFileFromSource (src_id, 1, "/content", "signed", true); if (sourcefile == nil) { y2warning ("Cannot obtain content file!"); return nil; @@ -692,7 +777,7 @@ symbol ret = nil; - string control = Pkg::SourceProvideDigestedFile (src_id, 1, "/installation.xml", true /* optional */); + string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); if (control != nil) { y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); @@ -841,7 +926,7 @@ */ void HandleProductPATTERNS (integer srcid) { // FATE #302398: PATTERNS keyword in content file - string content_file = Pkg::SourceProvideSignedFile (srcid, 1, "/content", true); + string content_file = GetCachedFileFromSource (srcid, 1, "/content", "signed", true); if (content_file == nil) { y2warning ("Add-On %1 doesn't have a content file", srcid); @@ -860,7 +945,7 @@ y2milestone ("Integrating repository %1", srcid); // Updating inst-sys - string y2update = Pkg::SourceProvideDigestedFile (srcid, 1, "/y2update.tgz", true /* optional */); + string y2update = GetCachedFileFromSource (srcid, 1, "/y2update.tgz", "digested", true /* optional */); if (y2update == nil) { y2milestone ("No YaST update found on the media"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56877 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 13:57:50 2009 New Revision: 56877 URL: http://svn.opensuse.org/viewcvs/yast?rev=56877&view=rev Log: - some cleanup Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 13:57:50 2009 @@ -43,9 +43,6 @@ global string dasdParam = ""; - // -------------------------------------------------------------- - // local values - list controllers = []; // set by "Probe" // remember postinstall modules (like imm and ppa) @@ -207,7 +204,7 @@ * @returns integer number of controllers, 0 = none found */ global define integer Probe () - ``{ +{ y2milestone( "StorageControllers::Probe()" ); // probe 'storage' list @@ -219,7 +216,7 @@ y2milestone("no controllers"); } return size (controllers); - } +} @@ -284,7 +281,7 @@ // return false if loading failed or was not necessary at all define boolean startController (map controller) - ``{ +{ // check module information // skip controller if no module info available @@ -434,14 +431,14 @@ HwStatus::Set (unique_key, one_module_failed?`no:`yes); return (!one_module_failed); - } +} // local function to go through list of resources (list of maps) // checking if '"active":true' is set. define boolean anyActive (list<map> resources) -``{ +{ boolean active = size(resources)==0; foreach (map res, resources, @@ -458,7 +455,7 @@ * */ global define void StartHotplugStorage () - ``{ +{ import "Hotplug"; // If USB capable, there might be an usb storage device (i.e. ZIP) @@ -495,12 +492,10 @@ */ global define void Initialize() - ``{ +{ moduleNames = []; moduleArgs = []; - map controller = $[]; integer cindex = 0; - list ioresources = []; boolean module_loaded = false; ModToInitrd = []; @@ -513,7 +508,7 @@ // use while(), continue not allowed in foreach() while( !Arch::s390() && cindex < size(controllers) ) { - controller = controllers[cindex]:$[]; + map controller = controllers[cindex]:$[]; y2milestone( "Initialize controller %1", controller ); if( size(controller["requires"]:[])>0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0