Author: jsuchome Date: Wed Jan 6 14:18:38 2010 New Revision: 60238 URL: http://svn.opensuse.org/viewcvs/yast?rev=60238&view=rev Log: - do not remove directory that can be resused (patch from varkoly, bnc#568298) - adapt to new paths of kiwi-config-openSUSE, changed template - 2.19.1 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=60238&r1=60237&r2=60238&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Jan 6 14:18:38 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=60238&r1=60237&r2=60238&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Jan 6 14:18:38 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 6 13:52:43 CET 2010 - jsuchome@suse.cz + +- do not remove directory that can be resused (patch from varkoly, + bnc#568298) +- adapt to new paths of kiwi-config-openSUSE, changed template +- 2.19.1 + +------------------------------------------------------------------- Tue Dec 22 15:31:27 CET 2009 - jsuchome@suse.cz - use menubutton for both iso image and directory tree (bnc#438223) Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=60238&r1=60237&r2=60238&view=diff ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Jan 6 14:18:38 2010 @@ -2814,7 +2814,7 @@ } else { - return false; + y2milestone("Directory %1 won't be removed", isodir); } } Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/config.xml?rev=60238&r1=60237&r2=60238&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Wed Jan 6 14:18:38 2010 @@ -1,28 +1,37 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-image-template"> +<image schemeversion="2.4" name="kiwi-image-template"> <description type="system"> <author></author> <contact></contact> <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type primary="true" boot="isoboot/suse-11.2" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true">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> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>False</rpm-force> + <size unit="M">3000</size> + <boot-theme>openSUSE</boot-theme> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> <locale>en_US.UTF-8</locale> + <oem-swap>false</oem-swap> + <oem-boot-title>USB</oem-boot-title> + <rpm-excludedocs>false</rpm-excludedocs> </preferences> <users group="users"> <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> <user name="root" pwd="" home="/root"/> </users> - <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> + </repository> + <packages type="image" patternPackageType="onlyRequired"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="yast2-live-installer"/> <package name="pam"/> <package name="pam-config"/> @@ -33,52 +42,34 @@ <package name="patch"/> <package name="zypper"/> <!-- PACKAGES BEGIN --> - <package name="3ddiag"/> - <package name="915resolution"/> <package name="ConsoleKit"/> <package name="ConsoleKit-x11"/> + <package name="DeviceKit-disks"/> <package name="DirectFB"/> - <package name="IlmBase"/> - <package name="LibVNCServer"/> + <package name="ImageMagick"/> <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="MozillaSunbird"/> + <package name="MozillaSunbird-translations"/> <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="acpica"/> <package name="acpid"/> <package name="adaptec-firmware"/> - <package name="akonadi-runtime"/> <package name="alsa"/> + <package name="alsa-firmware"/> <package name="alsa-oss"/> + <package name="alsa-plugins"/> <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="aria2"/> <package name="aspell"/> + <package name="aspell-de"/> <package name="aspell-en"/> <package name="atk"/> <package name="atmel-firmware"/> @@ -86,91 +77,76 @@ <package name="audiofile"/> <package name="audit"/> <package name="audit-libs"/> + <package name="augeas-lenses"/> <package name="autofs"/> <package name="autoyast2-installation"/> - <package name="avahi"/> + <package name="awesfx"/> <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="btrfsprogs"/> + <package name="bundle-lang-common-de"/> <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="command-not-found"/> + <package name="compcache"/> + <package name="compcache-kmp-desktop"/> <package name="coreutils"/> <package name="cpio"/> <package name="cpp"/> - <package name="cpp43"/> + <package name="cpp44"/> <package name="cracklib"/> <package name="cracklib-dict-full"/> + <package name="crda"/> <package name="cron"/> <package name="cryptsetup"/> <package name="cups"/> <package name="cups-client"/> + <package name="cups-drivers"/> <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-gssapi"/> <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="dmidecode"/> <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="elfutils"/> + <package name="esound-daemon"/> + <package name="espeak"/> <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"/> @@ -183,65 +159,53 @@ <package name="fuse"/> <package name="gawk"/> <package name="gconf2"/> - <package name="gconf2-branding-openSUSE"/> - <package name="gdb"/> + <package name="gd"/> <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-32bit"/> <package name="glibc-locale"/> - <package name="glitz"/> - <package name="gmp"/> - <package name="gnokii"/> + <package name="glibc-locale-32bit"/> + <package name="gnome-icon-theme"/> <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-engine-murrine"/> <package name="gtk2-engines"/> - <package name="gtk2-theme-openSUSE"/> + <package name="gtk2-metatheme-gilouche"/> + <package name="gtk2-metatheme-sonar"/> <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="initviocons"/> <package name="input-utils"/> <package name="insserv"/> <package name="iproute2"/> @@ -249,359 +213,293 @@ <package name="iputils"/> <package name="ipw-firmware"/> <package name="irda"/> - <package name="iwl3945-ucode"/> - <package name="iwl4965-ucode"/> + <package name="irqbalance"/> + <package name="iw"/> <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="kernel-desktop"/> + <package name="kernel-firmware"/> + <package name="keyutils"/> <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="lcms"/> <package name="less"/> - <package name="libFLAC++6"/> <package name="libFLAC8"/> + <package name="libHX18"/> + <package name="libMagickCore2"/> + <package name="libMagickWand2"/> + <package name="libSDL-1_2-0"/> <package name="libacl"/> + <package name="libadns1"/> <package name="libaio"/> - <package name="libakonadi4"/> - <package name="libakonadiprotocolinternals0"/> - <package name="libao"/> <package name="libapparmor1"/> <package name="libarchive2"/> <package name="libart_lgpl"/> + <package name="libasm1"/> <package name="libasound2"/> + <package name="libatasmart4"/> <package name="libatk-1_0-0"/> <package name="libattr"/> + <package name="libaugeas0"/> <package name="libavahi-client3"/> <package name="libavahi-common3"/> - <package name="libavahi-core5"/> <package name="libavahi-glib1"/> <package name="libblkid1"/> <package name="libblocxx6"/> + <package name="libbluetooth3"/> <package name="libbonobo"/> + <package name="libbonoboui"/> + <package name="libbonoboui-lang"/> <package name="libbz2-1"/> <package name="libcap2"/> - <package name="libcdio7"/> + <package name="libcdio10"/> + <package name="libcdio_cdda0"/> + <package name="libcdio_paranoia0"/> + <package name="libcloog0"/> <package name="libcom_err2"/> - <package name="libcompizconfig"/> + <package name="libcryptsetup0"/> <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="libdw1"/> + <package name="libeggdbus-1-0"/> + <package name="libelf1"/> + <package name="liberation-fonts"/> <package name="libesd0"/> - <package name="libevent"/> + <package name="libevent-1_4-2"/> <package name="libexif"/> - <package name="libexiv2-2"/> <package name="libexpat1"/> <package name="libext2fs2"/> + <package name="libfprint0"/> + <package name="libfreebl3"/> <package name="libfuse2"/> - <package name="libgcc43"/> + <package name="libgcc44"/> <package name="libgcrypt11"/> - <package name="libggz2"/> + <package name="libgdu0"/> <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="libgmp3"/> + <package name="libgmpxx4"/> <package name="libgnome"/> - <package name="libgnutls-extra26"/> + <package name="libgnomecanvas"/> + <package name="libgnomecanvas-lang"/> + <package name="libgnomeui"/> + <package name="libgnomeui-lang"/> <package name="libgnutls26"/> <package name="libgobject-2_0-0"/> + <package name="libgomp44"/> <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="libgudev-1_0-0"/> <package name="libgvfscommon0"/> - <package name="libical0"/> - <package name="libicu"/> <package name="libidl"/> <package name="libidn"/> + <package name="libiw30"/> <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="libldap-2_4-2"/> + <package name="libldapcpp1"/> + <package name="libltdl7"/> + <package name="liblua5_1"/> + <package name="liblzma0"/> + <package name="liblzo2-2"/> <package name="libmng"/> - <package name="libmpcdec5"/> <package name="libmpfr1"/> - <package name="libmtp7"/> - <package name="libmusicbrainz4"/> + <package name="libmysqlclient_r16"/> <package name="libncurses5"/> - <package name="libneon27"/> + <package name="libncurses5-32bit"/> + <package name="libncurses6"/> <package name="libnetpbm10"/> - <package name="libnjb"/> - <package name="libnjb5"/> <package name="libnl"/> <package name="libnscd"/> - <package name="libofa0"/> + <package name="libnsssharedhelper0"/> + <package name="libnuma1"/> <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="libpcap1"/> + <package name="libpciaccess0"/> + <package name="libpcre0"/> + <package name="libpixman-1-0"/> <package name="libpng12-0"/> - <package name="libpoppler-qt4-3"/> - <package name="libpoppler3"/> - <package name="libqca2"/> - <package name="libqimageblitz4"/> + <package name="libpolkit0"/> + <package name="libpoppler5"/> + <package name="libpopt0"/> + <package name="libppl7"/> + <package name="libppl_c2"/> + <package name="libproxy0"/> + <package name="libproxy0-config-gnome"/> + <package name="libproxy0-pacrunner-mozjs"/> + <package name="libproxy0-wpad-dns"/> + <package name="libpth20"/> + <package name="libpulse0"/> + <package name="libpython2_6-1_0"/> <package name="libqt4"/> <package name="libqt4-qt3support"/> <package name="libqt4-sql"/> + <package name="libqt4-sql-mysql"/> <package name="libqt4-x11"/> - <package name="libraptor1"/> - <package name="librasqal0"/> - <package name="libreadline5"/> - <package name="libredland0"/> + <package name="libreadline6"/> <package name="libreiserfs"/> <package name="librpcsecgss"/> - <package name="libsamplerate"/> + <package name="libselinux1"/> <package name="libsmbclient0"/> <package name="libsmbios-bin"/> - <package name="libsmbios-libs"/> + <package name="libsmbios2"/> <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="libstdc++44"/> + <package name="libstorage"/> <package name="libtalloc1"/> <package name="libtasn1"/> <package name="libtasn1-3"/> - <package name="libtdb0"/> - <package name="libtheora0"/> - <package name="libthinkfinger"/> + <package name="libtdb1"/> <package name="libtiff3"/> - <package name="libtunepimp"/> - <package name="libtunepimp5"/> - <package name="libusb"/> + <package name="libtirpc1"/> + <package name="libudev0"/> + <package name="libusb-0_1-4"/> + <package name="libusb-1_0-0"/> <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="libx86emu1"/> <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-ca-mgm"/> + <package name="limal-ca-mgm-perl"/> + <package name="limal-nfs-server"/> + <package name="limal-nfs-server-perl"/> <package name="limal-perl"/> <package name="linux-atm-lib"/> + <package name="linux32"/> <package name="login"/> <package name="logrotate"/> <package name="lomoco"/> + <package name="lsb-release"/> + <package name="lsof"/> + <package name="lsscsi"/> <package name="lukemftp"/> <package name="lvm2"/> - <package name="lzo"/> <package name="mailx"/> <package name="man"/> + <package name="manufacturer-PPDs"/> <package name="master-boot-code"/> + <package name="mc"/> <package name="mdadm"/> <package name="memtest86+"/> + <package name="mhash"/> <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="mtools"/> + <package name="multipath-tools"/> + <package name="nano"/> <package name="ncurses-utils"/> <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-default"/> + <package name="ndiswrapper-kmp-desktop"/> <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="numactl"/> <package name="numlockx"/> <package name="obex-data-server"/> - <package name="obexftp"/> + <package name="openSUSE-build-key"/> <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="opensuse-manuals_en"/> <package name="orbit2"/> - <package name="oxygen-icon-theme"/> <package name="pam"/> <package name="pam-config"/> <package name="pam-modules"/> + <package name="pam_apparmor"/> + <package name="pam_fp"/> <package name="pam_krb5"/> <package name="pam_ldap"/> - <package name="pam_thinkfinger"/> + <package name="pam_mount"/> <package name="pango"/> <package name="parted"/> + <package name="patterns-openSUSE-apparmor"/> + <package name="patterns-openSUSE-base"/> + <package name="patterns-openSUSE-enhanced_base"/> + <package name="patterns-openSUSE-fonts"/> + <package name="patterns-openSUSE-sw_management"/> + <package name="patterns-openSUSE-x11"/> + <package name="patterns-openSUSE-x11_yast"/> + <package name="patterns-openSUSE-yast2_basis"/> + <package name="patterns-openSUSE-yast2_install_wf"/> <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-Business-ISBN"/> + <package name="perl-Business-ISBN-Data"/> <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-HMAC"/> <package name="perl-Digest-MD4"/> <package name="perl-Digest-SHA1"/> <package name="perl-File-Tail"/> + <package name="perl-GD"/> + <package name="perl-GD-Barcode"/> <package name="perl-HTML-Parser"/> <package name="perl-HTML-Tagset"/> <package name="perl-Net-Daemon"/> + <package name="perl-NetxAP"/> <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-WWW-Curl"/> <package name="perl-X500-DN"/> - <package name="perl-XML-Bare"/> + <package name="perl-XML-LibXML"/> + <package name="perl-XML-LibXML-Common"/> + <package name="perl-XML-NamespaceSupport"/> <package name="perl-XML-Parser"/> + <package name="perl-XML-SAX"/> <package name="perl-XML-Simple"/> <package name="perl-XML-Writer"/> <package name="perl-XML-XPath"/> @@ -611,43 +509,35 @@ <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-profiler"/> <package name="pm-utils"/> - <package name="pmtools"/> - <package name="poppler-data"/> + <package name="polkit"/> + <package name="polkit-default-privs"/> <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="preload-kmp-desktop"/> <package name="procps"/> <package name="psmisc"/> - <package name="pth"/> + <package name="pullin-flash-player"/> + <package name="pullin-msttf-fonts"/> <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-base"/> + <package name="python-satsolver"/> <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="rpcbind"/> <package name="rpm"/> - <package name="ruby"/> + <package name="rpm-python"/> + <package name="rsync"/> + <package name="rsyslog"/> <package name="satsolver-tools"/> <package name="sax2"/> <package name="sax2-gui"/> @@ -655,75 +545,65 @@ <package name="sax2-libsax"/> <package name="sax2-libsax-perl"/> <package name="sax2-tools"/> + <package name="sbl"/> + <package name="scout"/> <package name="scpm"/> - <package name="scsi"/> <package name="sed"/> <package name="setserial"/> + <package name="sg3_utils"/> <package name="shared-mime-info"/> - <package name="siga"/> - <package name="simple-ccsm"/> <package name="slang"/> + <package name="smartmontools"/> + <package name="smp_utils"/> <package name="smpppd"/> - <package name="soprano"/> <package name="splashy"/> - <package name="sqlite2"/> - <package name="sqlite3"/> - <package name="startup-notification"/> + <package name="splashy-branding-openSUSE"/> <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_de"/> <package name="susehelp_en"/> <package name="suspend"/> <package name="sysconfig"/> <package name="sysfsutils"/> - <package name="syslog-ng"/> + <package name="systemtap-runtime"/> <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="translation-update-de"/> <package name="udev"/> <package name="ulimit"/> + <package name="unrar"/> + <package name="unscd"/> <package name="unzip"/> <package name="update-alternatives"/> + <package name="usbutils"/> <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="virtualbox-ose-kmp-desktop"/> <package name="w3m"/> <package name="wdiff"/> <package name="wget"/> + <package name="wireless-regdb"/> <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="xfsdump"/> <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"/> @@ -731,7 +611,6 @@ <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"/> @@ -754,19 +633,22 @@ <package name="xorg-x11-libxcb"/> <package name="xorg-x11-libxkbfile"/> <package name="xorg-x11-server"/> + <package name="xorg-x11-xauth"/> <package name="xstroke"/> <package name="xterm"/> - <package name="xvkbd"/> + <package name="xz"/> <package name="yast2"/> <package name="yast2-add-on"/> <package name="yast2-apparmor"/> <package name="yast2-backup"/> <package name="yast2-bootloader"/> + <package name="yast2-branding-openSUSE"/> <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-dbus-client"/> <package name="yast2-fingerprint-reader"/> <package name="yast2-firewall"/> <package name="yast2-hardware-detection"/> @@ -785,11 +667,13 @@ <package name="yast2-ncurses-pkg"/> <package name="yast2-network"/> <package name="yast2-nfs-client"/> + <package name="yast2-nfs-common"/> <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-packager-webpin"/> <package name="yast2-pam"/> <package name="yast2-perl-bindings"/> <package name="yast2-pkg-bindings"/> @@ -798,6 +682,7 @@ <package name="yast2-qt"/> <package name="yast2-qt-pkg"/> <package name="yast2-registration"/> + <package name="yast2-registration-branding-openSUSE"/> <package name="yast2-repair"/> <package name="yast2-restore"/> <package name="yast2-runlevel"/> @@ -808,12 +693,10 @@ <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-de"/> <package name="yast2-trans-en_US"/> <package name="yast2-trans-stats"/> <package name="yast2-transfer"/> @@ -821,25 +704,24 @@ <package name="yast2-tv"/> <package name="yast2-update"/> <package name="yast2-users"/> + <package name="yast2-vm"/> <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="zip"/> <package name="zisofs-tools"/> <package name="zlib"/> - <package name="zvbi"/> <package name="zypper"/> <!-- PACKAGES END --> </packages> <packages type="bootstrap"> <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="kernel-default"/> - <package name="udev"/> <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-livecd-x11"/> </packages> <split> <temporary> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=60238&r1=60237&r2=60238&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Jan 6 14:18:38 2010 @@ -1132,11 +1132,8 @@ kiwi_task = Kiwi::kiwi_task; - // path to definition of openSUSE live CD (used if kiwi-config-openSUSE-kde, - // resp. kiwi-config-openSUSE-gnome is installed) - string kiwi_dir = "/usr/share/openSUSE/kiwi-config-kde"; - if (!FileUtils::Exists (kiwi_dir)) - kiwi_dir = "/usr/share/openSUSE/kiwi-config-gnome"; + // path to definition of openSUSE live CD (used if kiwi-config-openSUSE is installed) + string kiwi_dir = "/usr/share/openSUSE-kiwi/livecd-x11"; // read the information from the base product integer src_id = ProductCreator::checkProductDependency (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org