Author: locilka Date: Fri Feb 1 16:08:42 2008 New Revision: 44105 URL: http://svn.opensuse.org/viewcvs/yast?rev=44105&view=rev Log: - Added new InstExtensionImage module for integration of modular inst-sys images on-the-fly (FATE #302955). Added: trunk/installation/src/modules/InstExtensionImage.ycp Modified: trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44105&r1=44104&r2=44105&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Feb 1 16:08:42 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 16:08:26 CET 2008 - locilka@suse.cz + +- Added new InstExtensionImage module for integration of modular + inst-sys images on-the-fly (FATE #302955). + +------------------------------------------------------------------- Thu Jan 31 19:05:49 CET 2008 - aschnell@suse.de - reflect init-script rename from suse-blinux to sbl Added: trunk/installation/src/modules/InstExtensionImage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstExtensionImage.ycp?rev=44105&view=auto ============================================================================== --- trunk/installation/src/modules/InstExtensionImage.ycp (added) +++ trunk/installation/src/modules/InstExtensionImage.ycp Fri Feb 1 16:08:42 2008 @@ -0,0 +1,257 @@ +/** + * File: modules/InstExtensionImage.ycp + * Package: Installation + * Summary: Functionality downloading and merging extending + * images for the inst-sys + * Authors: Lukas Ocilka + * + * $Id:$ + * + * This module provides functions that download inst-sys extension images + * (localization, fonts, ...) and merge them to the current int-sys. + * This enables inst-sys to be modular even for running YaST. + * See FATE #302955: 'Split translations out of installation system'. + */ + +{ + + textdomain "installation"; + module "InstExtensionImage"; + + import "Linuxrc"; + import "URL"; + + /*** + * + * Paths where to download inst-sys extension images are taken + * from '/etc/install.inf'. An extension image contains the + * directory structure and files as it was in inst-sys but + * it is a squashfs image of it. + * + * Inst-sys URL might be absolute or 'relative' to repo URL, + * but only if instsys=... parameter wasn't explicitely defined. + * + * When instsys=... parameter _is not_ used: + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: boot/<arch>/root + * (<arch> is for instance "i386", "x86_64", "ppc") + * or + * * RepoURL: nfs://server/repo/url/?device=eth0 + * * InstsysURL: boot/<arch>/root + * + * When instsys=... parameter _is_ used: + * * RepoURL: nfs://server/repo/url/ + * * InstsysURL: http://server/inst-sys/url/ + * or + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: nfs://server/inst-sys/url/?device=eth0 + * + * Files to download are in the same level (directory) with + * inst-sys: + * + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: boot/<arch>/root + * -> cd:/boot/<arch>/$extension_file + * + * * RepoURL: nfs://server/repo/url/?device=eth0 + * * InstsysURL: http://server/inst-sys/url/?device=eth0 + * -> http://server/inst-sys/$extension_file?device=eth0 + * + * These files are always squashfs images that need to be: + * + * * Downloaded: /lbin/wget -v $url $local_filename_path + * * Downloaded file needs to be checked against a SHA1 + * hash defined in /content file + * * Mounted (-o loop) to a directory. + * * Directory needs to be merged into inst-sys by using + * `/lbin/lndir /` + * + * This module remembers downloading a file so it does not + * download any file twice. + * + */ + + // nfs://.../, cd:/, http://.../any/ + // always ends with a slash "/" + string base_url = ""; + + // if there are any params $url?param1=xx¶m2=... + // always only params + string base_url_params = ""; + + boolean initialized = false; + + boolean IsURLRelative (string url) { + if (url == nil) + return nil; + + // "http://..." -> not-relative + // "cd:/" -> not relative + // "boot/i386/root -> relative + return ! regexpmatch (url, "^[[:alpha:]]+:/"); + } + + /** + * Merges two different URLs, repspectively their parameters + * to one string with parameters. See the example. + * + * @param string base URL with params + * @param string URL with modifications (added or changed params) + * @return string merged params + * + * @example + * MergeURLsParams ( + * "http://server.net/dir/?param1=x¶m2=y", + * "http://server.net/dir/?param2=z¶m3=a", + * // param2 from the first URL has been replaced by tho one from the second URL + * ) -> "param1=x¶m2=z¶m3=a" + */ + string MergeURLsParams (string base_url, string url_with_modifs) { + if (base_url == nil || url_with_modifs == nil) { + y2error ("Wrong params: %1 or %2", base_url, url_with_modifs); + return nil; + } + + // base URL params + integer base_params_pos = search (base_url, "?"); + string base_params = ""; + + if (base_params_pos != nil && base_params_pos >= 0) { + base_params = substring (base_url, (base_params_pos + 1)); + } + + // URL params with modifications + integer modif_params_pos = search (url_with_modifs, "?"); + string modif_params = ""; + + if (modif_params_pos != nil && modif_params_pos >= 0) { + modif_params = substring (url_with_modifs, (modif_params_pos + 1)); + } + + // Nothing to merge + if (base_params == "") + return modif_params; + if (modif_params == "") + return base_params; + + map base_params_map = URL::MakeMapFromParams (base_params); + map modif_params_map = URL::MakeMapFromParams (modif_params); + map final_params_map = (map ) union (base_params_map, modif_params_map); + + return URL::MakeParamsFromMap (final_params_map); + } + + /** + * Removes the last url item. + * + * @example + * CutLastDirOrFile ("http://server/some/dir/") -> "http://server/some/" + * CutLastDirOrFile ("http://server/some/dir") -> "http://server/some/" + */ + string CutLastDirOrFile (string url) { + if (url == nil || url == "" || url == "/" || ! regexpmatch (url, "/")) { + y2error (-1, "Wrong URL: %1", url); + return ""; + } + + // final "/" is needed for regexp + if (! regexpmatch (url, "/$")) { + url = url + "/"; + } + + return regexpsub (url, "^(.*)/[^/]+/$", "\\1/"); + } + + /** + * Merges two URLs into one and removes parameters from both. + * If the second URL is strictly relative, e.g., "boot/i386/root", + * it is merged with the first one, otherwise the second one is + * returned (with params cut). + * + * @param string base URL + * @param string modif URL (relative or absolute) + * @return string merged URL + * + * @example + * MergeURLs ( + * "nfs://server.name/11-repo/?device=eth0&xxx=zzz", + * "boot/i386/root?device=eth1&aaa=bbb" + * ) -> "nfs://server.name/11-repo/boot/i386/" + * MergeURLs ( + * "nfs://server.name/11-repo/?device=eth0&xxx=zzz", + * "nfs://server2.net/boot/i386/root?device=eth1&aaa=bbb" + * ) -> "nfs://server2.net/boot/i386/" + */ + string MergeURLs (string url_base, string url_with_modifs) { + if (url_base == nil || url_with_modifs == nil) { + y2error ("Wrong URLs: %1 or %2", url_base, url_with_modifs); + return nil; + } + + // relative (to base URL) or absolute URL + integer url_with_modifs_pos = search (url_with_modifs, "?"); + string url_with_modifs_onlyurl = url_with_modifs; + + if (url_with_modifs_pos != nil && url_with_modifs_pos >= 0) { + url_with_modifs_onlyurl = substring (url_with_modifs, 0, url_with_modifs_pos); + } + + // Modif URL is not relative, not using the base URL at all + if (! IsURLRelative (url_with_modifs_onlyurl)) { + return CutLastDirOrFile (url_with_modifs_onlyurl); + } + + // base URL + integer url_base_pos = search (url_base, "?"); + string url_base_onlyurl = url_base; + + if (url_base_pos != nil && url_base_pos >= 0) { + url_base_onlyurl = substring (url_base, 0, url_base_pos); + } + + if (! regexpmatch (url_base_onlyurl, "/$")) { + url_base_onlyurl = url_base_onlyurl + "/"; + } + + return CutLastDirOrFile (url_base_onlyurl + url_with_modifs_onlyurl); + } + + /** + * Every global function should call LazyInit in the beginning. + */ + void LazyInit () { + // already initialized + if (initialized) + return; + + y2milestone ("Initializing..."); + initialized = true; + + // base repo URL + string repo_url = Linuxrc::InstallInf ("RepoURL"); + // inst-sys URL + string inst_sys_url = Linuxrc::InstallInf ("InstsysURL"); + + // non-relative inst-sys, repo is not taken into account + if (! IsURLRelative (inst_sys_url)) { + repo_url = ""; + } + + // final base URL (last file/dir already removed) + base_url = MergeURLs (repo_url, inst_sys_url); + y2milestone ("Base URL: %1", base_url); + + // final params + base_url_params = MergeURLsParams (repo_url, inst_sys_url); + y2milestone ("Base URL params: %1", base_url_params); + } + + // Already downloaded (and mounted and merged) files + list <string> already_downloaded_files = []; + + // Just for testing + global void RemoveThisFunction () { + LazyInit(); + } +/* EOF */ +} Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=44105&r1=44104&r2=44105&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Feb 1 16:08:42 2008 @@ -3,18 +3,23 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite -# Mode::live_installation -BuildRequires: yast2 >= 2.15.38 + +# URL::MakeParamsFromMap and URL::MakeMapFromParams +BuildRequires: yast2 >= 2.16.25 Requires: autoyast2-installation -# Progress::NewProgressIcons -# Icon YCP module -Requires: yast2 >= 2.16.16 + +# URL::MakeParamsFromMap and URL::MakeMapFromParams +Requires: yast2 >= 2.16.25 + # Required in in the first stage, after # switching to the installed system, bugzilla #249679 + Requires: yast2-bootloader # Newly created RPM + Requires: yast2-country-data >= 2.16.3 + # New System-selection data and API DefaultDesktop module # New API in ProductLicense Requires: yast2-packager >= 2.16.18 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org