February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55635 - /tags/branch-Code-11-2_17_71/network/
by mzugec＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: mzugec Date: Fri Feb 20 12:12:26 2009 New Revision: 55635 URL: http://svn.opensuse.org/viewcvs/yast?rev=55635&view=rev Log: Created tag branch-Code-11-2_17_71 for network Added: tags/branch-Code-11-2_17_71/network/ - copied from r55634, branches/SuSE-Code-11-Branch/network/ -- 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] r55634 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: mzugec Date: Fri Feb 20 12:12:14 2009 New Revision: 55634 URL: http://svn.opensuse.org/viewcvs/yast?rev=55634&view=rev Log: fixed configuration of OSA Layer2 during installation (bnc#476253) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Fri Feb 20 12:12:14 2009 @@ -1 +1 @@ -2.17.70 +2.17.71 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Fri Feb 20 12:12:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 20 12:10:24 CET 2009 - mzugec(a)suse.cz + +- fixed configuration of OSA Layer2 during installation (bnc#476253) +- 2.17.71 + +------------------------------------------------------------------- Wed Feb 18 18:00:09 CET 2009 - mzugec(a)suse.cz - fixed dialogs workflow for s390 (bnc#476490) Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Fri Feb 20 12:12:14 2009 @@ -96,13 +96,14 @@ ReadInstallInfItem(install_inf, "module", "Alias"); ReadInstallInfItem(install_inf, "proxy", "Proxy"); // ReadInstallInfItem(install_inf, "options", "Options"); + // OSAHwAddr parameter s390 ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); - ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); +// ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); ReadInstallInfItem(install_inf, "WESSID", "WlanESSID"); ReadInstallInfItem(install_inf, "WAuth", "WlanAuth"); @@ -257,8 +258,8 @@ network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) - network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + if (size(InstallInf["hwaddr"]:"")>0) + network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["hwaddr"]:""); if (network_disk) -- 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] r55633 - in /trunk/storage/storage/src: include/auto_part_functions.ycp testsuite/tests/size_calculations.ycp
by aschnell＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: aschnell Date: Fri Feb 20 11:38:14 2009 New Revision: 55633 URL: http://svn.opensuse.org/viewcvs/yast?rev=55633&view=rev Log: - removed unused code Removed: trunk/storage/storage/src/testsuite/tests/size_calculations.ycp Modified: trunk/storage/storage/src/include/auto_part_functions.ycp Modified: trunk/storage/storage/src/include/auto_part_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_functions.ycp (original) +++ trunk/storage/storage/src/include/auto_part_functions.ycp Fri Feb 20 11:38:14 2009 @@ -438,9 +438,4 @@ return [0, 0]; }; -define integer calculate_needed_swap () - ``{ - return 1024*1024*Partitions::SwapSizeMb( 0 ); - }; - } -- 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] r55632 - /trunk/storage/storage/src/include/auto_part_ui.ycp
by aschnell＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: aschnell Date: Fri Feb 20 11:19:44 2009 New Revision: 55632 URL: http://svn.opensuse.org/viewcvs/yast?rev=55632&view=rev Log: - removed unused code Modified: trunk/storage/storage/src/include/auto_part_ui.ycp Modified: trunk/storage/storage/src/include/auto_part_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_ui.ycp (original) +++ trunk/storage/storage/src/include/auto_part_ui.ycp Fri Feb 20 11:19:44 2009 @@ -15,9 +15,7 @@ * * defined functions global define display_error_box (string reason) ``{ - global define warn_not_bootable () ``{ global define partition_text (integer nr, map pentry) ``{ - global define ask_free_space () global define construct_partition_dialog () global define open_auto_dialog (string targetname, term targetbox) ``{ global define create_resize_dialog (list partitions) ``{ @@ -42,15 +40,6 @@ Popup::Message(text); }; -define void warn_not_bootable () ``{ - // This is a warning message that pops up when the selection does not - // include a bootable disk region (< 1024 cylinders). - Report::Warning(sformat(_("With the current partitioning, your %2 installation -cannot be booted directly, because your /boot partition -is above cylinder %1. -"), Partitions::BootCyl(), Product::name) ); - }; - // Return a text that describes a partition @@ -71,12 +60,6 @@ pentry["fstype"]:"", pentry["device"]:"", pentry["label"]:"" ); }; -define boolean ask_free_space () ``{ - // we found an unassigned partition which is large enough for a minimal installation - return Popup::YesNo(sformat(_("There is free space on the selected disk. -Use this for %1? -"),Product::name)); - }; define map construct_partition_dialog( list<map> partitions, string ptype, integer bps ) -- 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] r55631 - /tags/branch-Code-11-2_17_15/product-creator/
by jsuchome＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: jsuchome Date: Fri Feb 20 10:04:46 2009 New Revision: 55631 URL: http://svn.opensuse.org/viewcvs/yast?rev=55631&view=rev Log: Created tag branch-Code-11-2_17_15 for product-creator Added: tags/branch-Code-11-2_17_15/product-creator/ - copied from r55630, branches/SuSE-Code-11-Branch/product-creator/ -- 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] r55630 - in /branches/SuSE-Code-11-Branch/product-creator: ./ package/ src/ src/data/kiwi_templates/iso/ src/data/kiwi_templates/xen/
by jsuchome＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: jsuchome Date: Fri Feb 20 10:04:27 2009 New Revision: 55630 URL: http://svn.opensuse.org/viewcvs/yast?rev=55630&view=rev Log: - Image Creator: use SLES11 as a default target in template (bnc#477645) - 2.17.15 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/xen/config.xml branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Fri Feb 20 10:04:27 2009 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Feb 20 10:04:27 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 19 15:46:59 CET 2009 - jsuchome(a)suse.cz + +- Image Creator: use SLES11 as a default target in template + (bnc#477645) +- 2.17.15 + +------------------------------------------------------------------- Fri Jan 30 09:21:09 CET 2009 - lslezak(a)suse.cz - unload all sources after changing a configuration to reset the Modified: branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/iso/config.xml Fri Feb 20 10:04:27 2009 @@ -6,11 +6,11 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.0" flags="unified">iso</type> - <type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type> - <type boot="usbboot/suse-11.0" filesystem="ext3">usb</type> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> - <type boot="oemboot/suse-11.0" filesystem="ext3" flags="unified">oem</type> + <type primary="true" boot="isoboot/suse-SLES11" flags="compressed">iso</type> + <type boot="vmxboot/suse-SLES11" filesystem="ext3" format="vmdk">vmx</type> + <type boot="usbboot/suse-SLES11" filesystem="ext3">usb</type> + <type boot="xenboot/suse-SLES11" filesystem="ext3">xen</type> + <type boot="oemboot/suse-SLES11" filesystem="ext3" flags="unified">oem</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> @@ -23,823 +23,13 @@ <user name="root" pwd="" home="/root"/> </users> <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> - <package name="yast2-live-installer"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="udev"/> - <package name="aaa_base"/> - <package name="tar"/> - <package name="patch"/> - <package name="zypper"/> -  - <package name="3ddiag"/> - <package name="915resolution"/> - <package name="ConsoleKit"/> - <package name="ConsoleKit-x11"/> - <package name="DirectFB"/> - <package name="IlmBase"/> - <package name="LibVNCServer"/> - <package name="Mesa"/> - <package name="MozillaFirefox"/> - <package name="NetworkManager"/> - <package name="NetworkManager-glib"/> - <package name="NetworkManager-kde"/> - <package name="OpenEXR"/> - <package name="OpenOffice_org"/> - <package name="OpenOffice_org-Quickstarter"/> - <package name="OpenOffice_org-branding-openSUSE"/> - <package name="OpenOffice_org-calc"/> - <package name="OpenOffice_org-draw"/> - <package name="OpenOffice_org-icon-themes"/> - <package name="OpenOffice_org-impress"/> - <package name="OpenOffice_org-kde"/> - <package name="OpenOffice_org-templates-labels-a4"/> - <package name="OpenOffice_org-templates-labels-letter"/> - <package name="OpenOffice_org-writer"/> - <package name="PolicyKit"/> - <package name="PolicyKit-doc"/> - <package name="PolicyKit-kde"/> - <package name="SDL"/> - <package name="SuSEfirewall2"/> - <package name="a2ps"/> - <package name="aaa_base"/> - <package name="aalib"/> - <package name="acl"/> - <package name="acpid"/> - <package name="adaptec-firmware"/> - <package name="akonadi-runtime"/> - <package name="alsa"/> - <package name="alsa-oss"/> - <package name="alsa-utils"/> - <package name="amarok"/> - <package name="amarok-libvisual"/> - <package name="amarok-yauap"/> - <package name="apparmor-parser"/> - <package name="apparmor-profiles"/> - <package name="apparmor-utils"/> - <package name="aspell"/> - <package name="aspell-en"/> - <package name="atk"/> - <package name="atmel-firmware"/> - <package name="attr"/> - <package name="audiofile"/> - <package name="audit"/> - <package name="audit-libs"/> - <package name="autofs"/> - <package name="autoyast2-installation"/> - <package name="avahi"/> - <package name="b43-fwcutter"/> - <package name="bash"/> - <package name="bash-doc"/> - <package name="bc"/> - <package name="bind-libs"/> - <package name="bind-utils"/> - <package name="binutils"/> - <package name="blktrace"/> - <package name="bluez-firmware"/> - <package name="bluez-libs"/> - <package name="bluez-utils"/> - <package name="bootsplash"/> - <package name="bootsplash-branding-openSUSE"/> - <package name="branding-openSUSE"/> - <package name="bundle-lang-common-en"/> - <package name="bundle-lang-kde-en"/> - <package name="bzip2"/> - <package name="cabextract"/> - <package name="cairo"/> - <package name="cdparanoia"/> - <package name="cdrdao"/> - <package name="cdrkit-cdrtools-compat"/> - <package name="check"/> - <package name="checkmedia"/> - <package name="chmlib"/> - <package name="cifs-mount"/> - <package name="clucene-core"/> - <package name="compiz"/> - <package name="compiz-fusion-plugins-main"/> - <package name="compiz-kde4"/> - <package name="compiz-manager"/> - <package name="compizconfig-settings-manager"/> - <package name="coreutils"/> - <package name="cpio"/> - <package name="cpp"/> - <package name="cpp43"/> - <package name="cracklib"/> - <package name="cracklib-dict-full"/> - <package name="cron"/> - <package name="cryptsetup"/> - <package name="cups"/> - <package name="cups-client"/> - <package name="cups-libs"/> - <package name="curl"/> - <package name="cyrus-sasl"/> - <package name="cyrus-sasl-crammd5"/> - <package name="cyrus-sasl-digestmd5"/> - <package name="cyrus-sasl-plain"/> - <package name="cyrus-sasl-saslauthd"/> - <package name="db-utils"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> - <package name="dbus-1-qt3"/> - <package name="dbus-1-x11"/> - <package name="dcraw"/> - <package name="ddrescue"/> - <package name="dejavu"/> - <package name="deltarpm"/> - <package name="desktop-data-openSUSE"/> - <package name="desktop-file-utils"/> - <package name="device-mapper"/> - <package name="dhcp"/> - <package name="dhcp-client"/> - <package name="dhcpcd"/> - <package name="dialog"/> - <package name="diffutils"/> - <package name="digikam"/> - <package name="digikamimageplugins"/> - <package name="dirmngr"/> - <package name="dmraid"/> - <package name="dosfstools"/> - <package name="dvb"/> - <package name="dvd+rw-tools"/> - <package name="e2fsprogs"/> - <package name="eject"/> - <package name="enchant"/> - <package name="ethtool"/> - <package name="expat"/> - <package name="extragear-plasma"/> - <package name="fam"/> - <package name="fbset"/> - <package name="fftw3"/> - <package name="file"/> - <package name="filesystem"/> - <package name="fillup"/> - <package name="findutils"/> - <package name="fontconfig"/> - <package name="fonts-config"/> - <package name="foomatic-filters"/> - <package name="freeglut"/> - <package name="freetype2"/> - <package name="fuse"/> - <package name="gawk"/> - <package name="gconf2"/> - <package name="gconf2-branding-openSUSE"/> - <package name="gdb"/> - <package name="gdbm"/> - <package name="genisoimage"/> - <package name="gettext-runtime"/> - <package name="gfxboot"/> - <package name="gfxboot-branding-openSUSE"/> - <package name="ggz"/> - <package name="ggz-client-libs"/> - <package name="ghostscript-fonts-std"/> - <package name="ghostscript-library"/> - <package name="ghostscript-omni"/> - <package name="ghostscript-x11"/> - <package name="giflib"/> - <package name="glib2"/> - <package name="glib2-branding-openSUSE"/> - <package name="glibc"/> - <package name="glibc-locale"/> - <package name="glitz"/> - <package name="gmp"/> - <package name="gnokii"/> - <package name="gnome-keyring"/> - <package name="gnome-vfs2"/> - <package name="gnutls"/> - <package name="gpart"/> - <package name="gpg2"/> - <package name="gpgme"/> - <package name="gpm"/> - <package name="grep"/> - <package name="groff"/> - <package name="grub"/> - <package name="gstreamer-0_10"/> - <package name="gstreamer-0_10-plugins-base"/> - <package name="gstreamer-0_10-plugins-good"/> - <package name="gtk2"/> - <package name="gtk2-branding-openSUSE"/> - <package name="gtk2-engines"/> - <package name="gtk2-theme-openSUSE"/> - <package name="gvfs"/> - <package name="gvfs-backends"/> - <package name="gvfs-fuse"/> - <package name="gzip"/> - <package name="hal"/> - <package name="hal-palm"/> - <package name="hal-resmgr"/> - <package name="hdparm"/> - <package name="hicolor-icon-theme"/> - <package name="hunspell"/> - <package name="hunspell-tools"/> - <package name="hwinfo"/> - <package name="icedax"/> - <package name="icewm"/> - <package name="icewm-lite"/> - <package name="ifnteuro"/> - <package name="ifplugd"/> - <package name="imlib2"/> - <package name="imlib2-loaders"/> - <package name="info"/> - <package name="info2html"/> - <package name="input-utils"/> - <package name="insserv"/> - <package name="iproute2"/> - <package name="iptables"/> - <package name="iputils"/> - <package name="ipw-firmware"/> - <package name="irda"/> - <package name="iwl3945-ucode"/> - <package name="iwl4965-ucode"/> - <package name="jfsutils"/> - <package name="jpackage-utils"/> - <package name="jpeg"/> - <package name="k3b"/> - <package name="kaffeine"/> - <package name="kbd"/> - <package name="kde4-akregator"/> - <package name="kde4-ark"/> - <package name="kde4-dolphin"/> - <package name="kde4-filesystem"/> - <package name="kde4-gwenview"/> - <package name="kde4-kaddressbook"/> - <package name="kde4-kcalc"/> - <package name="kde4-kcm_gtk"/> - <package name="kde4-kcolorchooser"/> - <package name="kde4-kdm"/> - <package name="kde4-kdm-branding-openSUSE"/> - <package name="kde4-kdnssd"/> - <package name="kde4-keditbookmarks"/> - <package name="kde4-kfind"/> - <package name="kde4-kgamma"/> - <package name="kde4-kget"/> - <package name="kde4-kgpg"/> - <package name="kde4-kio_audiocd"/> - <package name="kde4-kio_iso"/> - <package name="kde4-kio_kamera"/> - <package name="kde4-kio_sysinfo"/> - <package name="kde4-kio_sysinfo-branding-openSUSE"/> - <package name="kde4-kmahjongg"/> - <package name="kde4-kmail"/> - <package name="kde4-kmines"/> - <package name="kde4-kmix"/> - <package name="kde4-knewsticker"/> - <package name="kde4-knotes"/> - <package name="kde4-konqueror"/> - <package name="kde4-konqueror-plugins"/> - <package name="kde4-konsole"/> - <package name="kde4-kontact"/> - <package name="kde4-kopete"/> - <package name="kde4-korganizer"/> - <package name="kde4-kpat"/> - <package name="kde4-kpilot"/> - <package name="kde4-krdc"/> - <package name="kde4-kreversi"/> - <package name="kde4-krfb"/> - <package name="kde4-kscd"/> - <package name="kde4-ksnapshot"/> - <package name="kde4-ksudoku"/> - <package name="kde4-kwalletmanager"/> - <package name="kde4-kwin"/> - <package name="kde4-kwrite"/> - <package name="kde4-okular"/> - <package name="kde4-opensuse-updater"/> - <package name="kdeartwork4-screensaver"/> - <package name="kdebase3-runtime"/> - <package name="kdebase4"/> - <package name="kdebase4-libkonq"/> - <package name="kdebase4-nsplugin"/> - <package name="kdebase4-openSUSE"/> - <package name="kdebase4-openSUSE-lang"/> - <package name="kdebase4-runtime"/> - <package name="kdebase4-session"/> - <package name="kdebase4-workspace"/> - <package name="kdebase4-workspace-branding-openSUSE"/> - <package name="kdebase4-workspace-plasmoids"/> - <package name="kdebluetooth"/> - <package name="kdegames4"/> - <package name="kdegames4-carddecks-default"/> - <package name="kdelibs3"/> - <package name="kdelibs3-default-style"/> - <package name="kdelibs4"/> - <package name="kdelibs4-core"/> - <package name="kdemultimedia4"/> - <package name="kdepim3"/> - <package name="kdepim4"/> - <package name="kdepim4-wizards"/> - <package name="kdepimlibs4"/> - <package name="kdetv"/> - <package name="kernel-default"/> - <package name="keyutils-libs"/> - <package name="kinternet"/> - <package name="kipi-plugins"/> - <package name="klogd"/> - <package name="konversation"/> - <package name="kpartx"/> - <package name="kpowersave"/> - <package name="krb5"/> - <package name="krb5-client"/> - <package name="krecord"/> - <package name="kscpm"/> - <package name="ktorrent"/> - <package name="ldapcpplib"/> - <package name="less"/> - <package name="libFLAC++6"/> - <package name="libFLAC8"/> - <package name="libacl"/> - <package name="libaio"/> - <package name="libakonadi4"/> - <package name="libakonadiprotocolinternals0"/> - <package name="libao"/> - <package name="libapparmor1"/> - <package name="libarchive2"/> - <package name="libart_lgpl"/> - <package name="libasound2"/> - <package name="libatk-1_0-0"/> - <package name="libattr"/> - <package name="libavahi-client3"/> - <package name="libavahi-common3"/> - <package name="libavahi-core5"/> - <package name="libavahi-glib1"/> - <package name="libblkid1"/> - <package name="libblocxx6"/> - <package name="libbonobo"/> - <package name="libbz2-1"/> - <package name="libcap2"/> - <package name="libcdio7"/> - <package name="libcom_err2"/> - <package name="libcompizconfig"/> - <package name="libcurl4"/> - <package name="libdaemon0"/> - <package name="libdb-4_5"/> - <package name="libdbus-1-qt3-0"/> - <package name="libdjvulibre15"/> - <package name="libdns_sd"/> - <package name="libdrm"/> - <package name="libdvdread3"/> - <package name="libenchant1"/> - <package name="libesd0"/> - <package name="libevent"/> - <package name="libexif"/> - <package name="libexiv2-2"/> - <package name="libexpat1"/> - <package name="libext2fs2"/> - <package name="libfuse2"/> - <package name="libgcc43"/> - <package name="libgcrypt11"/> - <package name="libggz2"/> - <package name="libgimpprint"/> - <package name="libgio-2_0-0"/> - <package name="libgio-fam"/> - <package name="libglade2"/> - <package name="libglib-2_0-0"/> - <package name="libgmodule-2_0-0"/> - <package name="libgnome"/> - <package name="libgnutls-extra26"/> - <package name="libgnutls26"/> - <package name="libgobject-2_0-0"/> - <package name="libgpg-error0"/> - <package name="libgpgme11"/> - <package name="libgphoto2"/> - <package name="libgpod-tools"/> - <package name="libgpod3"/> - <package name="libgsf-1-114"/> - <package name="libgssglue1"/> - <package name="libgstinterfaces-0_10-0"/> - <package name="libgstreamer-0_10-0"/> - <package name="libgthread-2_0-0"/> - <package name="libgvfscommon0"/> - <package name="libical0"/> - <package name="libicu"/> - <package name="libidl"/> - <package name="libidn"/> - <package name="libjasper"/> - <package name="libjpeg"/> - <package name="libkcal"/> - <package name="libkcal2"/> - <package name="libkcddb4"/> - <package name="libkcompactdisc4"/> - <package name="libkdcraw3"/> - <package name="libkde4"/> - <package name="libkdecore4"/> - <package name="libkdegames4"/> - <package name="libkdepim4"/> - <package name="libkdepimlibs4"/> - <package name="libkexiv2-3"/> - <package name="libkipi0"/> - <package name="libkonq4"/> - <package name="libksba"/> - <package name="libktnef1"/> - <package name="liblazy1"/> - <package name="liblcms1"/> - <package name="libltdl-3"/> - <package name="libmng"/> - <package name="libmpcdec5"/> - <package name="libmpfr1"/> - <package name="libmtp7"/> - <package name="libmusicbrainz4"/> - <package name="libncurses5"/> - <package name="libneon27"/> - <package name="libnetpbm10"/> - <package name="libnjb"/> - <package name="libnjb5"/> - <package name="libnl"/> - <package name="libnscd"/> - <package name="libofa0"/> - <package name="libogg0"/> - <package name="liboil"/> - <package name="libopenct1"/> - <package name="libopensc2"/> - <package name="libopenssl0_9_8"/> - <package name="libpcap"/> - <package name="libpisock9"/> - <package name="libpng12-0"/> - <package name="libpoppler-qt4-3"/> - <package name="libpoppler3"/> - <package name="libqca2"/> - <package name="libqimageblitz4"/> - <package name="libqt4"/> - <package name="libqt4-qt3support"/> - <package name="libqt4-sql"/> - <package name="libqt4-x11"/> - <package name="libraptor1"/> - <package name="librasqal0"/> - <package name="libreadline5"/> - <package name="libredland0"/> - <package name="libreiserfs"/> - <package name="librpcsecgss"/> - <package name="libsamplerate"/> - <package name="libsmbclient0"/> - <package name="libsmbios-bin"/> - <package name="libsmbios-libs"/> - <package name="libsndfile"/> - <package name="libsoprano4"/> - <package name="libsoup"/> - <package name="libsoup-2_4-1"/> - <package name="libspeex"/> - <package name="libsqlite3-0"/> - <package name="libstdc++43"/> - <package name="libstrigi0"/> - <package name="libtalloc1"/> - <package name="libtasn1"/> - <package name="libtasn1-3"/> - <package name="libtdb0"/> - <package name="libtheora0"/> - <package name="libthinkfinger"/> - <package name="libtiff3"/> - <package name="libtunepimp"/> - <package name="libtunepimp5"/> - <package name="libusb"/> - <package name="libuuid1"/> - <package name="libvisual"/> - <package name="libvisual-plugins"/> - <package name="libvolume_id"/> - <package name="libvorbis"/> - <package name="libwavpack1"/> - <package name="libwbclient0"/> - <package name="libwpd-0_8-8"/> - <package name="libwpg-0_1-1"/> - <package name="libwps-0_1-1"/> - <package name="libx86"/> - <package name="libxcrypt"/> - <package name="libxklavier"/> - <package name="libxklavier12"/> - <package name="libxml2"/> - <package name="libxslt"/> - <package name="libzio"/> - <package name="libzip1"/> - <package name="libzypp"/> - <package name="licenses"/> - <package name="lilo"/> - <package name="limal"/> - <package name="limal-perl"/> - <package name="linux-atm-lib"/> - <package name="login"/> - <package name="logrotate"/> - <package name="lomoco"/> - <package name="lukemftp"/> - <package name="lvm2"/> - <package name="lzo"/> - <package name="mailx"/> - <package name="man"/> - <package name="master-boot-code"/> - <package name="mdadm"/> - <package name="memtest86+"/> - <package name="microcode_ctl"/> - <package name="mingetty"/> - <package name="mkinitrd"/> - <package name="module-init-tools"/> - <package name="mozilla-nspr"/> - <package name="mozilla-nss"/> - <package name="mozilla-xulrunner190"/> - <package name="mozilla-xulrunner190-gnomevfs"/> - <package name="mozilla-xulrunner190-translations"/> - <package name="mpt-firmware"/> - <package name="myspell-american"/> - <package name="ncurses-utils"/> - <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-default"/> - <package name="net-tools"/> - <package name="netcat"/> - <package name="netcfg"/> - <package name="netpbm"/> - <package name="nfs-client"/> - <package name="nfsidmap"/> - <package name="nscd"/> - <package name="nss-mdns"/> - <package name="nss_ldap"/> - <package name="ntfs-3g"/> - <package name="ntfsprogs"/> - <package name="ntp"/> - <package name="numlockx"/> - <package name="obex-data-server"/> - <package name="obexftp"/> - <package name="openSUSE-release"/> - <package name="openct"/> - <package name="openldap2-client"/> - <package name="openobex"/> - <package name="opensc"/> - <package name="openslp"/> - <package name="openssh"/> - <package name="openssh-askpass"/> - <package name="openssl"/> - <package name="openssl-certs"/> - <package name="opensuse-codecs-installer"/> - <package name="orbit2"/> - <package name="oxygen-icon-theme"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="pam_krb5"/> - <package name="pam_ldap"/> - <package name="pam_thinkfinger"/> - <package name="pango"/> - <package name="parted"/> - <package name="pciutils"/> - <package name="pciutils-ids"/> - <package name="pcmciautils"/> - <package name="pcre"/> - <package name="pcsc-lite"/> - <package name="perl"/> - <package name="perl-Bootloader"/> - <package name="perl-Config-Crontab"/> - <package name="perl-Crypt-SSLeay"/> - <package name="perl-Crypt-SmbHash"/> - <package name="perl-DBD-SQLite"/> - <package name="perl-DBI"/> - <package name="perl-Digest-MD4"/> - <package name="perl-Digest-SHA1"/> - <package name="perl-File-Tail"/> - <package name="perl-HTML-Parser"/> - <package name="perl-HTML-Tagset"/> - <package name="perl-Net-Daemon"/> - <package name="perl-Parse-RecDescent"/> - <package name="perl-PlRPC"/> - <package name="perl-RPC-XML"/> - <package name="perl-TermReadKey"/> - <package name="perl-TimeDate"/> - <package name="perl-URI"/> - <package name="perl-X500-DN"/> - <package name="perl-XML-Bare"/> - <package name="perl-XML-Parser"/> - <package name="perl-XML-Simple"/> - <package name="perl-XML-Writer"/> - <package name="perl-XML-XPath"/> - <package name="perl-base"/> - <package name="perl-gettext"/> - <package name="perl-libapparmor"/> - <package name="perl-libwww-perl"/> - <package name="permissions"/> - <package name="pinentry"/> - <package name="pinentry-qt"/> - <package name="pkg-config"/> - <package name="plasma-theme-aya"/> - <package name="pm-utils"/> - <package name="pmtools"/> - <package name="poppler-data"/> - <package name="poppler-tools"/> - <package name="popt"/> - <package name="portmap"/> - <package name="postfix"/> - <package name="powersave"/> - <package name="powersave-libs"/> - <package name="ppp"/> - <package name="pptp"/> - <package name="preload"/> - <package name="procps"/> - <package name="psmisc"/> - <package name="pth"/> - <package name="pwdutils"/> - <package name="python"/> - <package name="python-cairo"/> - <package name="python-compizconfig"/> - <package name="python-gobject2"/> - <package name="python-gtk"/> - <package name="python-numeric"/> - <package name="python-xml"/> - <package name="qlogic-firmware"/> - <package name="qt3"/> - <package name="qtcurve-gtk2"/> - <package name="qtcurve-kde"/> - <package name="quota"/> - <package name="recode"/> - <package name="reiserfs"/> - <package name="release-notes-openSUSE"/> - <package name="resmgr"/> - <package name="rpm"/> - <package name="ruby"/> - <package name="satsolver-tools"/> - <package name="sax2"/> - <package name="sax2-gui"/> - <package name="sax2-ident"/> - <package name="sax2-libsax"/> - <package name="sax2-libsax-perl"/> - <package name="sax2-tools"/> - <package name="scpm"/> - <package name="scsi"/> - <package name="sed"/> - <package name="setserial"/> - <package name="shared-mime-info"/> - <package name="siga"/> - <package name="simple-ccsm"/> - <package name="slang"/> - <package name="smpppd"/> - <package name="soprano"/> - <package name="splashy"/> - <package name="sqlite2"/> - <package name="sqlite3"/> - <package name="startup-notification"/> - <package name="strace"/> - <package name="strigi"/> - <package name="sudo"/> - <package name="sumf"/> - <package name="suse-build-key"/> - <package name="suseRegister"/> - <package name="susehelp"/> - <package name="susehelp_en"/> - <package name="suspend"/> - <package name="sysconfig"/> - <package name="sysfsutils"/> - <package name="syslog-ng"/> - <package name="sysvinit"/> - <package name="taglib"/> - <package name="tar"/> - <package name="tcpd"/> - <package name="terminfo-base"/> - <package name="tightvnc"/> - <package name="timezone"/> - <package name="translation-update"/> - <package name="udev"/> - <package name="ulimit"/> - <package name="unzip"/> - <package name="update-alternatives"/> - <package name="utempter"/> - <package name="util-linux"/> - <package name="uuid-runtime"/> - <package name="v4l-conf"/> - <package name="vim"/> - <package name="vim-base"/> - <package name="vorbis-tools"/> - <package name="w3m"/> - <package name="wdiff"/> - <package name="wget"/> - <package name="wireless-tools"/> - <package name="wlan-ng-kmp-default"/> - <package name="wodim"/> - <package name="wpa_supplicant"/> - <package name="wvdial"/> - <package name="wvstreams"/> - <package name="x11-input-fujitsu"/> - <package name="x11-input-synaptics"/> - <package name="x11-input-wacom"/> - <package name="x11-input-wacom-tools"/> - <package name="x11-tools"/> - <package name="xalan-j2"/> - <package name="xaw3d"/> - <package name="xdg-menu"/> - <package name="xdg-utils"/> - <package name="xerces-j2"/> - <package name="xerces-j2-xml-apis"/> - <package name="xfsprogs"/> - <package name="xgl"/> - <package name="xgl-hardware-list"/> - <package name="xine-lib"/> - <package name="xinetd"/> - <package name="xkeyboard-config"/> - <package name="xorg-x11"/> - <package name="xorg-x11-Xvnc"/> - <package name="xorg-x11-driver-input"/> - <package name="xorg-x11-driver-video"/> - <package name="xorg-x11-driver-video-radeonhd"/> - <package name="xorg-x11-driver-video-unichrome"/> - <package name="xorg-x11-driver-virtualbox-ose"/> - <package name="xorg-x11-fonts-core"/> - <package name="xorg-x11-libICE"/> - <package name="xorg-x11-libSM"/> - <package name="xorg-x11-libX11"/> - <package name="xorg-x11-libX11-ccache"/> - <package name="xorg-x11-libXau"/> - <package name="xorg-x11-libXdmcp"/> - <package name="xorg-x11-libXext"/> - <package name="xorg-x11-libXfixes"/> - <package name="xorg-x11-libXmu"/> - <package name="xorg-x11-libXp"/> - <package name="xorg-x11-libXpm"/> - <package name="xorg-x11-libXprintUtil"/> - <package name="xorg-x11-libXrender"/> - <package name="xorg-x11-libXt"/> - <package name="xorg-x11-libXv"/> - <package name="xorg-x11-libfontenc"/> - <package name="xorg-x11-libs"/> - <package name="xorg-x11-libxcb"/> - <package name="xorg-x11-libxkbfile"/> - <package name="xorg-x11-server"/> - <package name="xstroke"/> - <package name="xterm"/> - <package name="xvkbd"/> - <package name="yast2"/> - <package name="yast2-add-on"/> - <package name="yast2-apparmor"/> - <package name="yast2-backup"/> - <package name="yast2-bootloader"/> - <package name="yast2-control-center"/> - <package name="yast2-control-center-qt"/> - <package name="yast2-core"/> - <package name="yast2-country"/> - <package name="yast2-country-data"/> - <package name="yast2-fingerprint-reader"/> - <package name="yast2-firewall"/> - <package name="yast2-hardware-detection"/> - <package name="yast2-inetd"/> - <package name="yast2-installation"/> - <package name="yast2-irda"/> - <package name="yast2-iscsi-client"/> - <package name="yast2-kerberos-client"/> - <package name="yast2-ldap"/> - <package name="yast2-ldap-client"/> - <package name="yast2-libyui"/> - <package name="yast2-mail"/> - <package name="yast2-metapackage-handler"/> - <package name="yast2-mouse"/> - <package name="yast2-ncurses"/> - <package name="yast2-ncurses-pkg"/> - <package name="yast2-network"/> - <package name="yast2-nfs-client"/> - <package name="yast2-nis-client"/> - <package name="yast2-ntp-client"/> - <package name="yast2-online-update"/> - <package name="yast2-online-update-frontend"/> - <package name="yast2-packager"/> - <package name="yast2-pam"/> - <package name="yast2-perl-bindings"/> - <package name="yast2-pkg-bindings"/> - <package name="yast2-printer"/> - <package name="yast2-profile-manager"/> - <package name="yast2-qt"/> - <package name="yast2-qt-pkg"/> - <package name="yast2-registration"/> - <package name="yast2-repair"/> - <package name="yast2-restore"/> - <package name="yast2-runlevel"/> - <package name="yast2-samba-client"/> - <package name="yast2-samba-server"/> - <package name="yast2-scanner"/> - <package name="yast2-security"/> - <package name="yast2-slp"/> - <package name="yast2-sound"/> - <package name="yast2-storage"/> - <package name="yast2-storage-lib"/> - <package name="yast2-sudo"/> - <package name="yast2-support"/> - <package name="yast2-sysconfig"/> - <package name="yast2-theme-openSUSE"/> - <package name="yast2-theme-openSUSE-Oxygen"/> - <package name="yast2-trans-en_US"/> - <package name="yast2-trans-stats"/> - <package name="yast2-transfer"/> - <package name="yast2-tune"/> - <package name="yast2-tv"/> - <package name="yast2-update"/> - <package name="yast2-users"/> - <package name="yast2-x11"/> - <package name="yast2-xml"/> - <package name="yast2-ycp-ui-bindings"/> - <package name="yauap"/> - <package name="yp-tools"/> - <package name="ypbind"/> - <package name="zd1211-firmware"/> - <package name="zisofs-tools"/> - <package name="zlib"/> - <package name="zvbi"/> - <package name="zypper"/> -  + <opensusePattern name="Minimal"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> <package name="glibc-locale"/> <package name="kernel-default"/> <package name="udev"/> - <package name="bundle-lang-common-en"/> </packages> <split> <temporary> Modified: branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/data/kiwi_templates/xen/config.xml Fri Feb 20 10:04:27 2009 @@ -6,7 +6,7 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> + <type boot="xenboot/suse-SLES11" filesystem="ext3">xen</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Fri Feb 20 10:04:27 2009 @@ -22,6 +22,7 @@ import "ProductCreator"; import "SourceDialogs"; import "SourceManager"; + import "String"; import "Summary"; import "URL"; import "Wizard"; @@ -1249,33 +1250,18 @@ ProductCreator::Config["taboo"] = maplist ( map pat, sw_contents["ignore"]:[], ``(pat["name"]:"")); } - map label2boot = $[ - "openSUSE 10.2" : "suse-10.2", - "openSUSE 10.3" : "suse-10.3", "openSUSE 11.0" : "suse-11.0", - "SUSE Linux 10.1" : "suse-10.1", + "openSUSE 11.1" : "suse-11.1", "SUSE Linux Enterprise Server 10" : "suse-SLES10", "SUSE Linux Enterprise Desktop 10" : "suse-SLED10", "SUSE Linux Enterprise Desktop 10 SP2" : "suse-SLED10-SP2", "SUSE Linux Enterprise Server 10 SP2" : "suse-SLES10-SP2", + "SUSE Linux Enterprise Server 11" : "suse-SLES11", + "SUSE Linux Enterprise Desktop 11" : "suse-SLED11", ]; - map distproduct2boot = $[ - "openSUSE-10.2-CD-download" : "suse-10.2", - "openSUSE-10.2-dvd5-download" : "suse-10.2", - "openSUSE-10.3-dvd5-download" : "suse-10.3", - "openSUSE-10.3-CD-download" : "suse-10.3", - "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", - "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", - "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", - "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", - "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1", - "SUSE-Linux-Enterprise-Server-SP2" : "suse-SLES10-SP2", - "SUSE-Linux-Enterprise-Desktop-SP2" : "suse-SLED10-SP2", - ]; - string boot_image = label2boot[content["LABEL"]:""]:""; - if (boot_image == "") - boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; + string contentlabel = String::CutBlanks (content["LABEL"]:""); + string boot_image = label2boot[contentlabel]:""; // guess some default boot image value if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") -- 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] r55629 - in /trunk/product-creator: package/yast2-product-creator.changes src/data/kiwi_templates/iso/config.xml src/data/kiwi_templates/xen/config.xml src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 20 Feb '09

20 Feb '09

Author: jsuchome Date: Fri Feb 20 09:47:53 2009 New Revision: 55629 URL: http://svn.opensuse.org/viewcvs/yast?rev=55629&view=rev Log: - adapted kiwi templates for 11.1 (bnc#477645) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/data/kiwi_templates/xen/config.xml trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Feb 20 09:47:53 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 20 09:46:56 CET 2009 - jsuchome(a)suse.cz + +- adapted kiwi templates for 11.1 (bnc#477645) + +------------------------------------------------------------------- Wed Feb 11 14:48:37 CET 2009 - coolo(a)suse.de - buildrequire yast2-slp to fix build Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Fri Feb 20 09:47:53 2009 @@ -6,11 +6,11 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.0" flags="unified">iso</type> - <type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type> - <type boot="usbboot/suse-11.0" filesystem="ext3">usb</type> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> - <type boot="oemboot/suse-11.0" filesystem="ext3" flags="unified">oem</type> + <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> + <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type> + <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> + <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> Modified: trunk/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/config.xml Fri Feb 20 09:47:53 2009 @@ -6,7 +6,7 @@ <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> + <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> <version>1.0.0</version> <size unit="M">2000</size> <packagemanager>zypper</packagemanager> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Feb 20 09:47:53 2009 @@ -22,6 +22,7 @@ import "ProductCreator"; import "SourceDialogs"; import "SourceManager"; + import "String"; import "Summary"; import "URL"; import "Wizard"; @@ -1249,33 +1250,19 @@ ProductCreator::Config["taboo"] = maplist ( map pat, sw_contents["ignore"]:[], ``(pat["name"]:"")); } - map label2boot = $[ - "openSUSE 10.2" : "suse-10.2", - "openSUSE 10.3" : "suse-10.3", "openSUSE 11.0" : "suse-11.0", - "SUSE Linux 10.1" : "suse-10.1", + "openSUSE 11.1" : "suse-11.1", "SUSE Linux Enterprise Server 10" : "suse-SLES10", "SUSE Linux Enterprise Desktop 10" : "suse-SLED10", "SUSE Linux Enterprise Desktop 10 SP2" : "suse-SLED10-SP2", "SUSE Linux Enterprise Server 10 SP2" : "suse-SLES10-SP2", + "SUSE Linux Enterprise Server 11" : "suse-SLES11", + "SUSE Linux Enterprise Desktop 11" : "suse-SLED11", ]; - map distproduct2boot = $[ - "openSUSE-10.2-CD-download" : "suse-10.2", - "openSUSE-10.2-dvd5-download" : "suse-10.2", - "openSUSE-10.3-dvd5-download" : "suse-10.3", - "openSUSE-10.3-CD-download" : "suse-10.3", - "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", - "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", - "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", - "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", - "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1", - "SUSE-Linux-Enterprise-Server-SP2" : "suse-SLES10-SP2", - "SUSE-Linux-Enterprise-Desktop-SP2" : "suse-SLED10-SP2", - ]; - string boot_image = label2boot[content["LABEL"]:""]:""; - if (boot_image == "") - boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; + string contentlabel = String::CutBlanks (content["LABEL"]:""); + string boot_image = label2boot[contentlabel]:""; +// FIXME this actually is not used at all, only the one from template... :-( // guess some default boot image value if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") -- 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] r55628 - in /trunk/storage/libstorage/src: Dm.cc DmPartCo.cc DmraidCo.cc MdCo.cc PeContainer.cc
by aschnell＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: aschnell Date: Thu Feb 19 19:05:12 2009 New Revision: 55628 URL: http://svn.opensuse.org/viewcvs/yast?rev=55628&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/PeContainer.cc Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Thu Feb 19 19:05:12 2009 @@ -28,7 +28,7 @@ Dm::Dm( const PeContainer& d, const string& tn, unsigned mnum ) : Volume( d ), tname(tn) { - y2milestone( "constructed dm dev table \"%s\" %u", tn.c_str(), mnum ); + y2mil("constructed dm dev table \"" << tn << "\" " << mnum); num_le = 0; stripe = 1; stripe_size = 0; @@ -59,8 +59,8 @@ getDmMajor(); SystemCmd c(DMSETUPBIN " table " + quote(tname)); inactiv = c.retcode()!=0; - y2milestone( "table %s retcode:%d numLines:%u inactive:%d", - tname.c_str(), c.retcode(), c.numLines(), inactiv ); + y2mil("table:" << tname << " retcode:" << c.retcode() << " numLines:" << c.numLines() << + " inactive:" << inactiv); if( c.numLines()>0 ) { string line = *c.getLine(0); @@ -94,8 +94,7 @@ mit->second += le; } else - y2warning( "could not find major/minor pair %s", - majmin.c_str()); + y2war("could not find major/minor pair " << majmin); } else if (target == "snapshot-origin") { @@ -116,7 +115,7 @@ stripe_size /= 2; extractNthWord( 3, line ) >> str; if( str<2 ) - y2warning( "invalid stripe count %u", str ); + y2war("invalid stripe count " << str); else { le = (le+str-1)/str; @@ -132,8 +131,7 @@ mit->second += le; } else - y2warning( "could not find major/minor pair %s", - majmin.c_str()); + y2war("could not find major/minor pair " << majmin); } } } @@ -141,7 +139,7 @@ { if( find( known_types.begin(), known_types.end(), target ) == known_types.end() ) - y2warning( "unknown target type \"%s\"", target.c_str() ); + y2war("unknown target type \"" << target << "\""); extractNthWord( 1, line ) >> le; y2mil( "le:" << le ); le /= 2; @@ -170,8 +168,7 @@ mit->second += le; } else - y2warning( "could not find major/minor pair %s", - majmin.c_str()); + y2war("could not find major/minor pair " << majmin); } } } @@ -266,8 +263,8 @@ ret = mit != pe_map.end(); if( ret ) { - y2mil( "map:" << pe_map ); - y2milestone( "table:%s dev:%s ret:%d", tname.c_str(), dev.c_str(), ret ); + y2mil("map:" << pe_map); + y2mil("table:" << tname << " dev:" << dev << " ret:" << ret); } return( ret ); } @@ -281,7 +278,7 @@ mit!=pe_map.end(); ++mit ) sum += mit->second; if( sum != num_le ) - y2warning( "lv:%s sum:%lu num:%llu", dev.c_str(), sum, num_le ); + y2war("lv:" << dev << " sum:" << sum << " num:" << num_le); else ret = true; return( ret ); @@ -435,7 +432,7 @@ void Dm::activate( bool val ) { - y2milestone( "old active:%d val:%d", active, val ); + y2mil("old active:" << active << " val:" << val); if( active!=val ) { SystemCmd c; @@ -472,7 +469,7 @@ ++it; } if( dev!=ret ) - y2milestone( "dev:%s --> %s", dev.c_str(), ret.c_str() ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -531,7 +528,7 @@ void Dm::getDmMajor() { dm_major = getMajorDevices( "device-mapper" ); - y2milestone( "dm_major:%u", dm_major ); + y2mil("dm_major:" << dm_major); } void Dm::getInfo( DmInfo& tinfo ) const Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Thu Feb 19 19:05:12 2009 @@ -325,7 +325,7 @@ void DmPartCo::handleWholeDevice() { Disk::PartPair pp = disk->partPair( Partition::notDeleted ); - y2milestone( "empty:%d", pp.empty() ); + y2mil("empty:" << pp.empty()); if( pp.empty() ) { DmPart * p = NULL; @@ -423,7 +423,7 @@ int DmPartCo::destroyPartitionTable( const string& new_label ) { - y2milestone( "begin" ); + y2mil("begin"); int ret = disk->destroyPartitionTable( new_label ); if( ret==0 ) { @@ -521,7 +521,7 @@ void DmPartCo::activate_part( bool val ) { - y2milestone( "old active:%d val:%d", active, val ); + y2mil("old active:" << active << " val:" << val); if( active != val ) { SystemCmd c; @@ -558,7 +558,7 @@ int DmPartCo::doCreateLabel() { - y2milestone( "label:%s", labelName().c_str() ); + y2mil("label:" << labelName()); int ret = 0; if( !silent ) { @@ -582,7 +582,7 @@ DmPartCo::removeDmPart() { int ret = 0; - y2milestone( "begin" ); + y2mil("begin"); if( readonly() ) { ret = DMPART_CHANGE_READONLY; @@ -680,7 +680,7 @@ int DmPartCo::commitChanges( CommitStage stage, Volume* vol ) { - y2milestone( "name %s stage %d", name().c_str(), stage ); + y2mil("name:" << name() << " stage:" << stage); int ret = Container::commitChanges( stage, vol ); if( ret==0 && stage==INCREASE ) { @@ -700,7 +700,7 @@ int DmPartCo::commitChanges( CommitStage stage ) { - y2milestone( "name %s stage %d", name().c_str(), stage ); + y2mil("name:" << name() << " stage:" << stage); int ret = 0; if( stage==DECREASE && deleted() ) { Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Thu Feb 19 19:05:12 2009 @@ -33,7 +33,7 @@ void DmraidCo::getRaidData( const string& name ) { - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); SystemCmd c(DMRAIDBIN " -s -c -c -c " + quote(name)); list<string>::const_iterator ci; list<string> sl; @@ -109,7 +109,7 @@ void DmraidCo::activate( bool val ) { - y2milestone( "old active:%d val:%d", active, val ); + y2mil("old active:" << active << " val:" << val); if( active != val ) { SystemCmd c; @@ -189,7 +189,7 @@ int DmraidCo::doRemove() { - y2milestone( "Raid:%s", name().c_str() ); + y2mil("Raid:" << name()); int ret = 0; if( deleted() ) { Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Thu Feb 19 19:05:12 2009 @@ -84,7 +84,7 @@ void MdCo::getMdData() { - y2milestone( "begin" ); + y2mil("begin"); string line; std::ifstream file( "/proc/mdstat" ); classic(file); @@ -156,7 +156,7 @@ void MdCo::getMdData( unsigned num ) { - y2milestone( "num:%u", num ); + y2mil("num:" << num); string line; std::ifstream file( "/proc/mdstat" ); classic(file); @@ -318,7 +318,7 @@ { ret = MD_DEVICE_USED; } - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -326,7 +326,7 @@ MdCo::checkMd( unsigned num ) { int ret = 0; - y2milestone( "num:%u", num ); + y2mil("num:" << num); MdIter i; if( !findMd( num, i ) ) ret = MD_DEVICE_UNKNOWN; @@ -340,7 +340,7 @@ MdCo::extendMd( unsigned num, const string& dev ) { int ret = 0; - y2milestone( "num:%u dev:%s", num, dev.c_str() ); + y2mil("num:" << num << " dev:" << dev); MdIter i; if( readonly() ) { @@ -380,7 +380,7 @@ MdCo::shrinkMd( unsigned num, const string& dev ) { int ret = 0; - y2milestone( "num:%u dev:%s", num, dev.c_str() ); + y2mil("num:" << num << " dev:" << dev); MdIter i; if( readonly() ) { @@ -412,7 +412,7 @@ MdCo::changeMdType( unsigned num, MdType ptype ) { int ret = 0; - y2milestone( "num:%u md_type:%d", num, ptype ); + y2mil("num:" << num << " md_type:" << ptype); MdIter i; if( readonly() ) { @@ -439,7 +439,7 @@ MdCo::changeMdChunk( unsigned num, unsigned long chunk ) { int ret = 0; - y2milestone( "num:%u chunk:%lu", num, chunk ); + y2mil("num:" << num << " chunk:" << chunk); MdIter i; if( readonly() ) { @@ -466,7 +466,7 @@ MdCo::changeMdParity( unsigned num, MdParity ptype ) { int ret = 0; - y2milestone( "num:%u parity:%d", num, ptype ); + y2mil("num:" << num << " parity:" << ptype); MdIter i; if( readonly() ) { @@ -507,7 +507,7 @@ { i->getState(info); } - y2milestone("ret:%d", ret); + y2mil("ret:" << ret); return ret; } @@ -515,7 +515,7 @@ MdCo::removeMd( unsigned num, bool destroySb ) { int ret = 0; - y2milestone( "num:%u", num ); + y2mil("num:" << num); MdIter i; if( readonly() ) { @@ -554,7 +554,7 @@ int MdCo::removeVolume( Volume* v ) { int ret = 0; - y2milestone( "name:%s", v->name().c_str() ); + y2mil("name:" << v->name()); Md * m = dynamic_cast<Md *>(v); if( m != NULL ) ret = removeMd( v->nr() ); @@ -565,7 +565,7 @@ void MdCo::activate( bool val, const string& tmpDir ) { - y2milestone( "old active:%d val:%d tmp:%s", active, val, tmpDir.c_str() ); + y2mil("old active:" << active << " val:" << val << " tmp:" << tmpDir); if( active!=val ) { SystemCmd c; @@ -591,7 +591,7 @@ int MdCo::doCreate( Volume* v ) { - y2milestone( "name:%s", v->name().c_str() ); + y2mil("name:" << v->name()); Md * m = dynamic_cast<Md *>(v); int ret = 0; if( m != NULL ) @@ -643,7 +643,7 @@ int MdCo::doRemove( Volume* v ) { - y2milestone( "name:%s", v->name().c_str() ); + y2mil("name:" << v->name()); Md * m = dynamic_cast<Md *>(v); int ret = 0; if( m != NULL ) Modified: trunk/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContain… ============================================================================== --- trunk/storage/libstorage/src/PeContainer.cc (original) +++ trunk/storage/libstorage/src/PeContainer.cc Thu Feb 19 19:05:12 2009 @@ -37,7 +37,7 @@ PeContainer::setPeSize( unsigned long long peSizeK, bool lvm1 ) { int ret = 0; - y2milestone( "peSize:%llu", peSizeK ); + y2mil("peSize:" << peSizeK); if( pe_size!=peSizeK ) { @@ -162,8 +162,7 @@ if( !added_pv ) plrem.push_back( cur_pv ); } - y2milestone( "ret:%d removed_pe:%lu dev:%s", ret, removed_pe, - cur_pv.device.c_str() ); + y2mil("ret:" << ret << " removed_pe:" << removed_pe << " dev:" << cur_pv.device); return( ret ); } @@ -172,7 +171,7 @@ list<Pv>& pladd, map<string,unsigned long>& pe_map ) { int ret=0; - y2milestone( "le:%lu stripe:%u", le, stripe ); + y2mil("le:" << le << " stripe:" << stripe); map<string,unsigned long>::iterator mit; list<Pv>::iterator i; if( stripe>1 ) @@ -497,7 +496,7 @@ ConstDmPair p=dmPair(isDeleted); for( ConstDmIter i=p.begin(); i!=p.end(); ++i ) ret += i->getLe(); - y2milestone( "ret:%lu", ret ); + y2mil("ret:" << ret); return( ret ); } @@ -532,23 +531,20 @@ { if( mit->second != p->num_pe-p->free_pe ) { - y2warning( "Vg:%s used pv %s is %lu should be %lu", - name().c_str(), mit->first.c_str(), - mit->second, p->num_pe-p->free_pe ); + y2war("Vg:" << name() << " used pv " << mit->first << " is " << + mit->second << " should be " << p->num_pe - p->free_pe); ret = false; } } else { - y2warning( "Vg:%s pv %s not found", name().c_str(), - mit->first.c_str() ); + y2war("Vg:" << name() << " pv " << mit->first << " not found"); ret = false; } } if( sum != num_pe-free_pe ) { - y2warning( "Vg:%s used PE is %lu should be %lu", name().c_str(), - sum, num_pe-free_pe ); + y2war("Vg:" << name() << " used PE is " << sum << " should be " << num_pe - free_pe); ret = false; } return( ret ); -- 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] r55627 - /tags/stable-2_18_1/restore/
by locilka＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: locilka Date: Thu Feb 19 18:38:56 2009 New Revision: 55627 URL: http://svn.opensuse.org/viewcvs/yast?rev=55627&view=rev Log: Created tag stable-2_18_1 for restore Added: tags/stable-2_18_1/restore/ - copied from r55626, trunk/restore/ -- 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] r55626 - /tags/branch-Code-11-2_17_2/restore/
by locilka＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: locilka Date: Thu Feb 19 18:33:47 2009 New Revision: 55626 URL: http://svn.opensuse.org/viewcvs/yast?rev=55626&view=rev Log: Created tag branch-Code-11-2_17_2 for restore Added: tags/branch-Code-11-2_17_2/restore/ - copied from r55625, branches/SuSE-Code-11-Branch/restore/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0