April 2008 - openSUSE Commits - openSUSE Mailing Lists

commit postfix
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package postfix checked in at Tue Apr 1 23:00:44 CEST 2008. -------- --- postfix/postfix.changes 2008-02-27 17:57:18.000000000 +0100 +++ postfix/postfix.changes 2008-04-01 16:18:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 16:17:31 CEST 2008 - mkoenig(a)suse.de + +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.K30446/_old 2008-04-01 23:00:11.000000000 +0200 +++ /var/tmp/diff_new_pack.K30446/_new 2008-04-01 23:00:11.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: A fast, secure, and flexible mailer Version: 2.5.1 -Release: 1 +Release: 11 Source: postfix-%{version}.tar.gz Source1: postfix-SuSE.tar.gz Patch: dynamic_maps.patch @@ -37,6 +37,7 @@ # %package mysql +License: IBM Public License Summary: postfix plugin to support MySQL maps AutoReqProv: on Group: Productivity/Networking/Email/Servers @@ -45,6 +46,7 @@ # %package postgresql +License: IBM Public License Summary: postfix plugin to support PostgreSQL maps AutoReqProv: on Group: Productivity/Networking/Email/Servers @@ -53,6 +55,7 @@ # %package devel +License: IBM Public License Summary: Development headers for the postfix package. AutoReqProv: on Group: Productivity/Networking/Email/Servers @@ -484,8 +487,6 @@ /var/adm/fillup-templates/sysconfig.postfix /var/adm/fillup-templates/sysconfig.mail-postfix /sbin/conf.d/SuSEconfig.postfix -%dir %{omc_pdir} -%dir %{omc_dir} %config(noreplace) %{omc_dir}/postfix.xml %dir /etc/postfix %config(noreplace) /etc/postfix/access @@ -583,6 +584,9 @@ Wietse Venema <wietse(a)porcupine.org> %changelog +* Tue Apr 01 2008 mkoenig(a)suse.de +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem * Tue Feb 26 2008 varkoly(a)suse.de - Update to Version 2.5 patchlevel 1 Changes: The Postfix 2.5 "postfix upgrade-configuration" command @@ -1116,7 +1120,7 @@ - #218229 - Postfix SuSEconfig script increases the max_proc line each run in master.cf * Sat Oct 28 2006 varkoly(a)suse.de - #206414 - /usr/lib/sasl2/smtpd.conf misplaced -* Tue Oct 24 2006 varkoly(a)suse.de +* Wed Oct 25 2006 varkoly(a)suse.de - #202119 – SuSEconfig script for Postfix incomplete - #202162 – Postfix 2.3.2 slightly incorrect, Cyrus SASL unavailable - #203174 – /sbin/conf.d/SuSEconfig.postfix should configure a TLS session cache for postfix 2.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Tue Apr 1 22:46:15 CEST 2008. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2008-03-28 10:49:47.000000000 +0100 +++ patterns-openSUSE/patterns-openSUSE.changes 2008-04-01 14:35:32.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 1 14:35:20 CEST 2008 - coolo(a)suse.de + +- sorting out dropped/renamed packages + +------------------------------------------------------------------- +Tue Apr 1 13:40:36 CEST 2008 - coolo(a)suse.de + +- moving x11 dependencies out of enhanced_base + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.I20675/_old 2008-04-01 22:46:05.000000000 +0200 +++ /var/tmp/diff_new_pack.I20675/_new 2008-04-01 22:46:05.000000000 +0200 @@ -18,7 +18,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 64 +Release: 66 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -35,6 +35,7 @@ %package addon-non-oss +License: GPL v2 or later Summary: Patterns for Installation (Non-OSS AddOn Media) Group: Metapackages Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE patterns-openSUSE-GNOME-cd patterns-openSUSE-KDE-cd @@ -47,6 +48,7 @@ %package GNOME-cd +License: GPL v2 or later Summary: Patterns for Installation (GNOME CD) Group: Metapackages Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE patterns-openSUSE-KDE-cd @@ -59,6 +61,7 @@ %package KDE-cd +License: GPL v2 or later Summary: Patterns for Installation (KDE CD) Group: Metapackages Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE patterns-openSUSE-KDE-cd @@ -129,6 +132,10 @@ /CD1/suse/setup/descr/non_oss-*.pat %changelog +* Tue Apr 01 2008 coolo(a)suse.de +- sorting out dropped/renamed packages +* Tue Apr 01 2008 coolo(a)suse.de +- moving x11 dependencies out of enhanced_base * Fri Mar 28 2008 coolo(a)suse.de - feedback from the KDE team * Thu Mar 27 2008 coolo(a)suse.de @@ -420,9 +427,9 @@ - include ntfs-3g by default * Sun Aug 12 2007 coolo(a)suse.de - remove dropped packages -* Sat Aug 11 2007 coolo(a)suse.de +* Sun Aug 12 2007 coolo(a)suse.de - fix file list -* Fri Aug 10 2007 coolo(a)suse.de +* Sat Aug 11 2007 coolo(a)suse.de - move cups-autoconf into DVD enhanced_basis * Fri Aug 10 2007 coolo(a)suse.de - split rest_cd into kde and gnome to simplify configs @@ -457,9 +464,9 @@ - need to split out more GNOME patterns to fit on CD (e.g. inkscape, dia) * Tue Jul 31 2007 coolo(a)suse.de - split GNOME multimedia for OSS medium and replace gaim with pidgin -* Mon Jul 30 2007 coolo(a)suse.de +* Tue Jul 31 2007 coolo(a)suse.de - yast2-registration should be on the media in any case -* Mon Jul 30 2007 coolo(a)suse.de +* Tue Jul 31 2007 coolo(a)suse.de - adding a rest_cd pattern to track invisible dependencies needed on the CD * Mon Jul 30 2007 coolo(a)suse.de @@ -534,7 +541,7 @@ - move deleted package yast2-mail-aliases to Prc * Fri May 11 2007 aj(a)suse.de - Add yast2-metapackage-handler to YaST2 pattern. -* Thu May 10 2007 aj(a)suse.de +* Fri May 11 2007 aj(a)suse.de - remove evms-gui from X11 pattern (#266362). - remove mozilla-xulrunner181 from X11 pattern (#266362). - remove libqt4 from X11 pattern, it should come in via @@ -565,7 +572,7 @@ * Mon Apr 16 2007 aj(a)suse.de - Add mrtg to Network Admin pattern (#264670). - Obsolete/provide zmd patterns. -* Fri Apr 13 2007 aj(a)suse.de +* Sat Apr 14 2007 aj(a)suse.de - Disable zmd patterns. * Wed Apr 11 2007 aj(a)suse.de - Add dasher, seahorse for GNOME (#262024). @@ -668,7 +675,7 @@ - Install xgl pattern for KDE as well. * Mon Nov 27 2006 aj(a)suse.de - i18n update. -* Sun Nov 26 2006 aj(a)suse.de +* Mon Nov 27 2006 aj(a)suse.de - Remove pdfs of manuals. * Sun Nov 26 2006 aj(a)suse.de - Add manuals (#223187). @@ -954,7 +961,7 @@ * Thu Sep 07 2006 aj(a)suse.de - Further refine KDE and GNOME patterns. - Refine BASE pattern. -* Wed Sep 06 2006 aj(a)suse.de +* Thu Sep 07 2006 aj(a)suse.de - Add GAMES. * Wed Sep 06 2006 aj(a)suse.de - Splitup new patterns from base. ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Web new/patterns-openSUSE-data/data/DEVEL-Web --- old/patterns-openSUSE-data/data/DEVEL-Web 2008-03-27 14:17:45.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Web 2008-04-01 14:34:40.000000000 +0200 @@ -67,5 +67,5 @@ selfhtml selfphp htdig -html2txt +html2text -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT --- old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2008-03-27 20:15:27.000000000 +0100 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2008-04-01 09:20:22.000000000 +0200 @@ -11,10 +11,7 @@ filters finger fbset -gdb groff -gutenprint -hplip initviocons #ifdef __ppc__ hfsutils @@ -42,7 +39,6 @@ sharutils smartmontools strace -suspend tcpdump tcsh telnet diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2008-03-20 08:03:52.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2008-04-01 14:33:36.000000000 +0200 @@ -13,7 +13,7 @@ -Prq: +Prc: -gnome-session-branding-openSUSE +gconf2-branding-openSUSE gtk2-branding-openSUSE // #302205 libgail-gnome @@ -29,8 +29,6 @@ beagle-firefox beagle-gui bug-buddy -cdparanoia -cdrdao control-center2 cups-backends dbus-1-x11 @@ -46,7 +44,6 @@ gcalctool gconf2-branding-openSUSE gedit -gle // open terminal from RMB on desktop nautilus-open-terminal gnome2-SuSE @@ -82,7 +79,6 @@ gtksourceview gtkspell gucharmap -guile input-utils metacity nautilus @@ -98,16 +94,12 @@ pinentry-gtk2 python-gnome python-gtk -python-numeric -python-orbit samba shared-mime-info -sox startup-notification susehelp tango-icon-theme tomboy -vcdimager vino vte xkeyboard-config diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-DESKTOP new/patterns-openSUSE-data/data/GNOME-DESKTOP --- old/patterns-openSUSE-data/data/GNOME-DESKTOP 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-DESKTOP 2008-03-28 13:03:49.000000000 +0100 @@ -1,3 +1,4 @@ +Psg: xsane +gnome-backgrounds -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Multimedia new/patterns-openSUSE-data/data/GNOME-Multimedia --- old/patterns-openSUSE-data/data/GNOME-Multimedia 2008-03-07 11:44:35.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Multimedia 2008-03-29 17:10:32.000000000 +0100 @@ -1,6 +1,5 @@ +Prc: banshee-player -f-spot totem totem-plugin // software.openSUSE.org/codecs @@ -9,4 +8,5 @@ +Psg: banshee +sound-juicer -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-Utilities-OPT new/patterns-openSUSE-data/data/GNOME-Utilities-OPT --- old/patterns-openSUSE-data/data/GNOME-Utilities-OPT 2008-03-07 11:50:05.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-Utilities-OPT 2008-03-28 13:02:40.000000000 +0100 @@ -12,4 +12,5 @@ libopensync-plugin-syncml libopensync libopensync-tools +evolution-webcal -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-YaST new/patterns-openSUSE-data/data/GNOME-YaST --- old/patterns-openSUSE-data/data/GNOME-YaST 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-YaST 2008-03-28 14:38:09.000000000 +0100 @@ -1,6 +1,4 @@ +Prc: -yast2-qt -yast2-qt-pkg yast2-gtk yast2-control-center-gnome -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/LAPTOP new/patterns-openSUSE-data/data/LAPTOP --- old/patterns-openSUSE-data/data/LAPTOP 2008-03-27 12:14:01.000000000 +0100 +++ new/patterns-openSUSE-data/data/LAPTOP 2008-04-01 14:32:09.000000000 +0200 @@ -1,8 +1,4 @@ +Prc: -#if defined(__i386__) || defined (__x86_64__) -suspend -#endif -dockutils irda jarnal pcmciautils diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-CD new/patterns-openSUSE-data/data/REST-CD --- old/patterns-openSUSE-data/data/REST-CD 2008-03-27 14:21:18.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-CD 2008-03-29 09:07:41.000000000 +0100 @@ -46,8 +46,8 @@ yast2-trans-en_US krb5-client -// prefer the small version -cracklib-dict-small +// prefer the full version for installation +cracklib-dict-full // filesystem(minix) util-linux diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD-UNKNOWN new/patterns-openSUSE-data/data/REST-DVD-UNKNOWN --- old/patterns-openSUSE-data/data/REST-DVD-UNKNOWN 2008-03-27 20:16:34.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD-UNKNOWN 2008-04-01 14:34:19.000000000 +0200 @@ -355,7 +355,6 @@ xaos xbanner xbsql -xcompmgr Xerces-c xfsdump xjdic diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11 new/patterns-openSUSE-data/data/X11 --- old/patterns-openSUSE-data/data/X11 2008-03-27 14:25:32.000000000 +0100 +++ new/patterns-openSUSE-data/data/X11 2008-04-01 14:39:02.000000000 +0200 @@ -33,6 +33,17 @@ x11-tools // #353229 - drag in empty replacements translation-update + +// interesting for workstations too +#if defined(__i386__) || defined (__x86_64__) +suspend +#endif + +// yast modules for the desktop +yast2-scanner +#if !defined(__s390__) +yast2-tv +#endif -Prc: +Psg: @@ -57,7 +68,5 @@ xpp // on security probation xpdf -// "old" window manager -xcompmgr xosd -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11-OPT new/patterns-openSUSE-data/data/X11-OPT --- old/patterns-openSUSE-data/data/X11-OPT 2008-03-27 16:43:28.000000000 +0100 +++ new/patterns-openSUSE-data/data/X11-OPT 2008-04-01 12:17:06.000000000 +0200 @@ -10,6 +10,11 @@ #if !defined(__i386__) nspluginwrapper #endif +// packages a GTK application +gutenprint + +// needs python-qt +hplip -Prc: +Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/YAST_BASIS new/patterns-openSUSE-data/data/YAST_BASIS --- old/patterns-openSUSE-data/data/YAST_BASIS 2008-03-27 12:18:10.000000000 +0100 +++ new/patterns-openSUSE-data/data/YAST_BASIS 2008-04-01 14:33:59.000000000 +0200 @@ -56,13 +56,9 @@ yast2-printer yast2-profile-manager yast2-restore -yast2-scanner yast2-slp yast2-sudo yast2-support -#if !defined(__s390__) -yast2-tv -#endif -Prc: +Psg: yast2-product-creator @@ -82,7 +78,7 @@ // see extra-packages for reasons star sbl -xorg-x11-Mesa +Mesa kdump-helpers i4l-isdnlog ypserv diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/x11_yast/freshens new/patterns-openSUSE-data/toinstall/x11_yast/freshens --- old/patterns-openSUSE-data/toinstall/x11_yast/freshens 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/x11_yast/freshens 2008-03-29 09:36:30.000000000 +0100 @@ -0,0 +1 @@ +x11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openSUSE-images
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package openSUSE-images checked in at Tue Apr 1 22:45:41 CEST 2008. -------- --- openSUSE-images/openSUSE-images.changes 2008-03-31 09:09:50.000000000 +0200 +++ openSUSE-images/openSUSE-images.changes 2008-04-01 13:30:21.298925000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 1 13:29:53 CEST 2008 - coolo(a)suse.de + +- put more image sets in the images.xml + +------------------------------------------------------------------- New: ---- images.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-images-KDE-cd.spec ++++++ --- /var/tmp/diff_new_pack.i12007/_old 2008-04-01 22:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.i12007/_new 2008-04-01 22:44:47.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: openSUSE-images Summary: Creates preinstalled images of patterns Version: 11.0 -Release: 1 +Release: 4 Group: SUSE internal License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/CD1/images/lists install -m 644 /CD1/images/lists/kde_cd-default.*.list $RPM_BUILD_ROOT/CD1/images/lists install -m 644 %SOURCE0 $RPM_BUILD_ROOT/CD1/images/images.xml -for file in kde_cd-root-meta.tar.lzma kde_cd-root.tar.lzma common-desktop-root.tar.lzma common-xorg-root.tar.lzma common-base-root.tar.lzma; do +for file in common-qt.tar.lzma kde_cd-root-meta.tar.lzma kde_cd-root.tar.lzma common-desktop-root.tar.lzma common-xorg-root.tar.lzma common-base-root.tar.lzma; do install -m 644 /CD1/images/$file $RPM_BUILD_ROOT/CD1/images/ done ++++++ openSUSE-images.spec ++++++ --- /var/tmp/diff_new_pack.i12007/_old 2008-04-01 22:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.i12007/_new 2008-04-01 22:44:47.000000000 +0200 @@ -18,11 +18,12 @@ #!BuildIgnore: suspend Summary: Creates preinstalled images of patterns Version: 11.0 -Release: 8 +Release: 11 Group: SUSE internal License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: common_tree +Source1: images.xml Source2: spec_dummy ExcludeArch: ia64 ppc64 s390x s390 # do not compress the ISO - takes ages @@ -95,6 +96,8 @@ perl %SOURCE0 --dst common-xorg-root --prim dvd5-x11-root --sec common-desktop-root perl %SOURCE0 --dst common-base-root --prim dvd5-base-root --sec common-xorg-root perl %SOURCE0 --dst common-dvd-root --prim dvd5-x11-root --sec dvd5-base-root +perl %SOURCE0 --dst common-qt --prim kde_cd-root --sec common-dvd-root +perl %SOURCE0 --dst x11-gnome --prim dvd5-x11-root --sec gnome_cd-root %install mkdir -p $RPM_BUILD_ROOT/CD1/images/lists @@ -106,12 +109,15 @@ tar cf - * | $COMP > $RPM_BUILD_ROOT/CD1/images/$i.tar.$EXT cd .. done +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/CD1/images/images.xml %files %defattr(-, root, root) /CD1 %changelog +* Tue Apr 01 2008 coolo(a)suse.de +- put more image sets in the images.xml * Mon Mar 31 2008 coolo(a)suse.de - adding more installation types * Fri Mar 28 2008 coolo(a)suse.de ++++++ images-kde_cd.xml ++++++ --- openSUSE-images/images-kde_cd.xml 2008-03-31 09:04:23.000000000 +0200 +++ openSUSE-images/images-kde_cd.xml 2008-04-01 12:08:06.725930000 +0200 @@ -21,6 +21,11 @@ <file>common-xorg-root.tar.lzma</file> </image> <image> + <name>KDE [qt3]</name> + <type>tar</type> + <file>common-qt.tar.lzma</file> + </image> + <image> <name>KDE [desktop]</name> <type>tar</type> <file>common-desktop-root.tar.lzma</file> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vsftpd
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package vsftpd checked in at Tue Apr 1 22:44:22 CEST 2008. -------- --- vsftpd/vsftpd.changes 2008-03-11 20:57:28.000000000 +0100 +++ vsftpd/vsftpd.changes 2008-04-01 16:24:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 16:23:57 CEST 2008 - mkoenig(a)suse.de + +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.EU8124/_old 2008-04-01 22:44:14.000000000 +0200 +++ /var/tmp/diff_new_pack.EU8124/_new 2008-04-01 22:44:14.000000000 +0200 @@ -19,7 +19,7 @@ BuildRequires: libcap-devel %endif Version: 2.0.6 -Release: 1 +Release: 8 Summary: Very Secure FTP Daemon - Written from Scratch License: GPL v2 or later Group: Productivity/Networking/Ftp/Servers @@ -107,8 +107,6 @@ %files %defattr(-,root,root) -%dir %_datadir/omc/ -%dir %_datadir/omc/svcinfo.d/ /usr/sbin/%name /usr/sbin/rc%name /etc/init.d/%name @@ -126,6 +124,9 @@ %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %changelog +* Tue Apr 01 2008 mkoenig(a)suse.de +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem * Tue Mar 11 2008 crrodriguez(a)suse.de - version 2.0.6 - Fix delay_failed_login typo. Oops. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pure-ftpd
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package pure-ftpd checked in at Tue Apr 1 22:43:44 CEST 2008. -------- --- pure-ftpd/pure-ftpd.changes 2008-03-20 15:42:49.000000000 +0100 +++ pure-ftpd/pure-ftpd.changes 2008-04-01 16:19:36.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 16:19:13 CEST 2008 - mkoenig(a)suse.de + +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.De3680/_old 2008-04-01 22:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.De3680/_new 2008-04-01 22:43:39.000000000 +0200 @@ -14,7 +14,7 @@ Name: pure-ftpd BuildRequires: mysql-devel openldap2-devel pam-devel postgresql-devel Version: 1.0.21 -Release: 126 +Release: 130 Url: http://www.pureftpd.org Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 Source1: %{name}.init @@ -123,8 +123,6 @@ %files %defattr(-, root, root) -%dir %{_datadir}/omc/ -%dir %{_datadir}/omc/svcinfo.d/ %{_datadir}/omc/svcinfo.d/%name.xml %doc AUTHORS CONTACT COPYING NEWS THANKS README README.Contrib %doc README.Configuration-File HISTORY README.Netfilter README.Virtual-Users @@ -144,6 +142,9 @@ %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name %changelog +* Tue Apr 01 2008 mkoenig(a)suse.de +- remove dir /usr/share/omc/svcinfo.d as it is provided now + by filesystem * Thu Mar 20 2008 hvogel(a)suse.de - Fix ldap schema [bnc:368864] - add Short-Description to init script @@ -203,7 +204,7 @@ upload correctly. [#133452] * Fri Jan 13 2006 hvogel(a)suse.de - Make use of Stack Protector -* Mon Oct 24 2005 mrueckert(a)suse.de +* Tue Oct 25 2005 mrueckert(a)suse.de - cleaned up spec file - add /etc/pure-ftpd/vhosts as base dir for virtual servers. (documentation and code changed accordingly.) @@ -227,7 +228,7 @@ * Wed Mar 03 2004 mmj(a)suse.de - Reflect in the configuration file that /etc/pure-ftpd/ now is a place to keep all the pure-ftpd configuration files. -* Tue Mar 02 2004 mmj(a)suse.de +* Wed Mar 03 2004 mmj(a)suse.de - Move configuration file when updating - Fix initscript to use /etc/pure-ftpd/pure-ftpd.conf [#35196] - Update to 1.0.18 including: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit filesystem
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package filesystem checked in at Tue Apr 1 22:43:29 CEST 2008. -------- --- filesystem/filesystem.changes 2008-03-17 00:47:23.000000000 +0100 +++ filesystem/filesystem.changes 2008-04-01 16:02:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 1 16:01:34 CEST 2008 - mkoenig(a)suse.de + +- add /usr/share/omc and /usr/share/omc/svcinfo.d + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.u32129/_old 2008-04-01 22:42:55.000000000 +0200 +++ /var/tmp/diff_new_pack.u32129/_new 2008-04-01 22:42:55.000000000 +0200 @@ -17,7 +17,7 @@ AutoReqProv: on Summary: Basic Directory Layout Version: 11.0 -Release: 25 +Release: 30 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: aaa_dir Provides: aaa_dir @@ -165,6 +165,8 @@ %changelog +* Tue Apr 01 2008 mkoenig(a)suse.de +- add /usr/share/omc and /usr/share/omc/svcinfo.d * Mon Mar 17 2008 ro(a)suse.de - added Mandingo (md) * Fri Mar 14 2008 maw(a)suse.de @@ -173,7 +175,7 @@ - Add Maithili (mai) * Mon Feb 18 2008 maw(a)suse.de - Add Friulian (fur) -* Mon Dec 17 2007 maw(a)suse.de +* Tue Dec 18 2007 maw(a)suse.de - Add Ido (io) * Mon Dec 10 2007 ro(a)suse.de - added /etc/skel/bin , .fonts and .mozilla (from aaa_skel) @@ -399,7 +401,7 @@ other cron versions. * Thu Feb 13 2003 mmj(a)suse.de - Do not own /etc/cron.daily -- it's owned by cron already -* Tue Jan 14 2003 kukuk(a)suse.de +* Wed Jan 15 2003 kukuk(a)suse.de - Add /etc/xinetd.d * Tue Nov 05 2002 ro(a)suse.de - removed /var/lib/YaST ++++++ directory.list ++++++ --- filesystem/directory.list 2007-12-10 17:14:11.000000000 +0100 +++ filesystem/directory.list 2008-04-01 16:01:31.000000000 +0200 @@ -143,6 +143,8 @@ 0755 root root /usr/share/sgml 0755 root root /usr/share/sgml/docbook 0755 root root /usr/share/sounds +0755 root root /usr/share/omc +0755 root root /usr/share/omc/svcinfo.d 0755 root root /usr/share/themes 0755 root root /usr/share/tmac 0755 root root /usr/share/xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-perl-bindings
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package yast2-perl-bindings checked in at Tue Apr 1 22:39:55 CEST 2008. -------- --- yast2-perl-bindings/yast2-perl-bindings.changes 2008-03-12 14:47:03.000000000 +0100 +++ yast2-perl-bindings/yast2-perl-bindings.changes 2008-04-01 12:59:55.375635000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 31 16:36:21 CEST 2008 - mvidner(a)suse.cz + +- Trap Perl exceptions so that simple bugs don't kill the whole YaST + (fate#412). +- 2.16.5 + +------------------------------------------------------------------- Old: ---- yast2-perl-bindings-2.16.4.tar.bz2 New: ---- yast2-perl-bindings-2.16.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-perl-bindings.spec ++++++ --- /var/tmp/diff_new_pack.i14860/_old 2008-04-01 22:39:21.000000000 +0200 +++ /var/tmp/diff_new_pack.i14860/_new 2008-04-01 22:39:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-perl-bindings (Version 2.16.4) +# spec file for package yast2-perl-bindings (Version 2.16.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-perl-bindings -Version: 2.16.4 +Version: 2.16.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-perl-bindings-2.16.4.tar.bz2 +Source0: yast2-perl-bindings-2.16.5.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel curl-devel gcc-c++ libxcrypt-devel libzypp-devel rpm-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings-devel # libzypp-devel is missing .la requires @@ -44,7 +44,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-perl-bindings-2.16.4 +%setup -n yast2-perl-bindings-2.16.5 %build %{prefix}/bin/y2tool y2autoconf @@ -81,7 +81,12 @@ /usr/share/YaST2/data/devtools/pluglib-bindings /usr/share/YaST2/data/devtools/admin/aminclude/pluglib-bindings.ami %doc %{prefix}/share/doc/packages/yast2-perl-bindings + %changelog +* Mon Mar 31 2008 mvidner(a)suse.cz +- Trap Perl exceptions so that simple bugs don't kill the whole YaST + (fate#412). +- 2.16.5 * Wed Mar 12 2008 mvidner(a)suse.cz - adapt testsuite results to latest debug output again - 2.16.4 ++++++ yast2-perl-bindings-2.16.4.tar.bz2 -> yast2-perl-bindings-2.16.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-perl-bindings-2.16.4/configure new/yast2-perl-bindings-2.16.5/configure --- old/yast2-perl-bindings-2.16.4/configure 2008-03-12 15:06:14.000000000 +0100 +++ new/yast2-perl-bindings-2.16.5/configure 2008-03-31 17:08:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-perl-bindings 2.16.4. +# Generated by GNU Autoconf 2.61 for yast2-perl-bindings 2.16.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-perl-bindings' PACKAGE_TARNAME='yast2-perl-bindings' -PACKAGE_VERSION='2.16.4' -PACKAGE_STRING='yast2-perl-bindings 2.16.4' +PACKAGE_VERSION='2.16.5' +PACKAGE_STRING='yast2-perl-bindings 2.16.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1444,7 +1444,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-perl-bindings 2.16.4 to adapt to many kinds of systems. +\`configure' configures yast2-perl-bindings 2.16.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1515,7 +1515,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-perl-bindings 2.16.4:";; + short | recursive ) echo "Configuration of yast2-perl-bindings 2.16.5:";; esac cat <<\_ACEOF @@ -1624,7 +1624,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-perl-bindings configure 2.16.4 +yast2-perl-bindings configure 2.16.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1638,7 +1638,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-perl-bindings $as_me 2.16.4, which was +It was created by yast2-perl-bindings $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2459,7 +2459,7 @@ # Define the identity of the package. PACKAGE='yast2-perl-bindings' - VERSION='2.16.4' + VERSION='2.16.5' cat >>confdefs.h <<_ACEOF @@ -2687,7 +2687,7 @@ -VERSION="2.16.4" +VERSION="2.16.5" RPMNAME="yast2-perl-bindings" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -21145,7 +21145,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-perl-bindings $as_me 2.16.4, which was +This file was extended by yast2-perl-bindings $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21198,7 +21198,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-perl-bindings config.status 2.16.4 +yast2-perl-bindings config.status 2.16.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22603,7 +22603,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-perl-bindings $as_me 2.16.4, which was +This file was extended by yast2-perl-bindings $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22656,7 +22656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-perl-bindings config.status 2.16.4 +yast2-perl-bindings config.status 2.16.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-perl-bindings-2.16.4/configure.in new/yast2-perl-bindings-2.16.5/configure.in --- old/yast2-perl-bindings-2.16.4/configure.in 2008-03-12 15:06:02.000000000 +0100 +++ new/yast2-perl-bindings-2.16.5/configure.in 2008-03-31 17:08:22.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-perl-bindings, 2.16.4, http://bugs.opensuse.org/, yast2-perl-bindings) +AC_INIT(yast2-perl-bindings, 2.16.5, http://bugs.opensuse.org/, yast2-perl-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.4" +VERSION="2.16.5" RPMNAME="yast2-perl-bindings" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-perl-bindings-2.16.4/src/YPerl.cc new/yast2-perl-bindings-2.16.5/src/YPerl.cc --- old/yast2-perl-bindings-2.16.4/src/YPerl.cc 2007-10-03 16:41:35.000000000 +0200 +++ new/yast2-perl-bindings-2.16.5/src/YPerl.cc 2008-03-31 16:17:24.000000000 +0200 @@ -285,8 +285,10 @@ string full_name = module + "::" + function; int ret_count = 0; + // G_EVAL: prevent errors from making Perl (and the rest of YaST) die + // (FATE 412) // so far we use static methods, so call_pv is enough - ret_count = call_pv( full_name.c_str(), calling_context ); + ret_count = call_pv( full_name.c_str(), calling_context | G_EVAL); // @@ -295,6 +297,13 @@ SPAGAIN; // Copy global stack pointer to local one + // if the eval catches an exception, undef is returned + // and we check $@ (ERRSV) + if (SvTRUE(ERRSV)) + { + ycp2error ("Perl wanted to die: %s", SvPV_nolen(ERRSV)); + } + YCPValue result = fromPerlScalar (POPs, wanted_result_type); // If we called it with G_ARRAY, we would have to pop all return diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-perl-bindings-2.16.4/VERSION new/yast2-perl-bindings-2.16.5/VERSION --- old/yast2-perl-bindings-2.16.4/VERSION 2008-03-12 14:44:56.000000000 +0100 +++ new/yast2-perl-bindings-2.16.5/VERSION 2008-03-31 16:36:35.000000000 +0200 @@ -1 +1 @@ -2.16.4 +2.16.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-kerberos-client
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package yast2-kerberos-client checked in at Tue Apr 1 22:37:22 CEST 2008. -------- --- yast2-kerberos-client/yast2-kerberos-client.changes 2008-03-26 10:47:20.000000000 +0100 +++ yast2-kerberos-client/yast2-kerberos-client.changes 2008-04-01 15:35:16.991518000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 15:29:54 CEST 2008 - jsuchome(a)suse.cz + +- added CLI option to (un)set DNS +- 2.16.6 + +------------------------------------------------------------------- Old: ---- yast2-kerberos-client-2.16.5.tar.bz2 New: ---- yast2-kerberos-client-2.16.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kerberos-client.spec ++++++ --- /var/tmp/diff_new_pack.E11259/_old 2008-04-01 22:36:29.000000000 +0200 +++ /var/tmp/diff_new_pack.E11259/_new 2008-04-01 22:36:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-kerberos-client (Version 2.16.5) +# spec file for package yast2-kerberos-client (Version 2.16.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-kerberos-client -Version: 2.16.5 +Version: 2.16.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-kerberos-client-2.16.5.tar.bz2 +Source0: yast2-kerberos-client-2.16.6.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API @@ -36,7 +36,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-kerberos-client-2.16.5 +%setup -n yast2-kerberos-client-2.16.6 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,9 @@ /usr/share/YaST2/include/kerberos-client/wizards.ycp %doc %{prefix}/share/doc/packages/yast2-kerberos-client %changelog +* Tue Apr 01 2008 jsuchome(a)suse.cz +- added CLI option to (un)set DNS +- 2.16.6 * Wed Mar 26 2008 jsuchome(a)suse.cz - use OK button label instead of Accept (fate #120373) - 2.16.5 ++++++ yast2-kerberos-client-2.16.5.tar.bz2 -> yast2-kerberos-client-2.16.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.16.5/src/dialogs.ycp new/yast2-kerberos-client-2.16.6/src/dialogs.ycp --- old/yast2-kerberos-client-2.16.5/src/dialogs.ycp 2008-03-26 10:45:57.000000000 +0100 +++ new/yast2-kerberos-client-2.16.6/src/dialogs.ycp 2008-03-26 10:47:33.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 44821 2008-02-22 12:58:04Z jsuchome $ + * $Id: dialogs.ycp 45724 2008-03-26 09:47:33Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.16.5/src/kerberos.ycp new/yast2-kerberos-client-2.16.6/src/kerberos.ycp --- old/yast2-kerberos-client-2.16.5/src/kerberos.ycp 2007-12-14 11:04:46.000000000 +0100 +++ new/yast2-kerberos-client-2.16.6/src/kerberos.ycp 2008-04-01 13:55:50.000000000 +0200 @@ -160,6 +160,22 @@ ret = true; } }); + if (options["dns"]:"" != "") + { + boolean dns = (options["dns"]:"" == "yes"); + if (dns != Kerberos::dns_used) + { + if (dns && !Kerberos::dns_available) + { + y2warning ("DNS does not provide config, ignoring"); + } + else + { + Kerberos::dns_used = true; + ret = true; + } + } + } if (ret) Kerberos::modified = true; @@ -210,6 +226,11 @@ // translators: command line help text for pam disable option "help" : _("Disable the service") ], + "dns" : $[ + "help" : _("Use DNS to aquire the configuration at runtime"), + "type" : "enum", + "typespec" : [ "yes", "no" ], + ], "kdc" :$[ // translators: command line help text for the kdc option "help" : _("The Key Distribution Center (KDC) address"), @@ -329,7 +350,7 @@ "keytab", "ccache_dir", "ccname_template", "mappings", "existing_ticket", "external", "validate", "use_shmem", "addressless", "debug", "debug_sensitive", - "initial_prompt", "subsequent_prompt", + "initial_prompt", "subsequent_prompt", "dns", ], ] ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.16.5/src/Kerberos.ycp new/yast2-kerberos-client-2.16.6/src/Kerberos.ycp --- old/yast2-kerberos-client-2.16.5/src/Kerberos.ycp 2008-02-22 13:36:30.000000000 +0100 +++ new/yast2-kerberos-client-2.16.6/src/Kerberos.ycp 2008-04-01 15:13:10.000000000 +0200 @@ -695,11 +695,14 @@ sformat (_("Default Realm: %1 "), (default_realm != "") ? default_realm : nc) + // summary text (yes/no follows) - sformat(_("Kerberos Authentication Enabled: %1 "), use_pam_krb ? + sformat(_("Kerberos Authentication Enabled: %1"), use_pam_krb ? // summary value _("Yes") : // summary value _("No")); + if (dns_used) + // summary line + summary = summary + " " + _("Configuration Acquired via DNS"); return summary; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-kerberos-client-2.16.5/VERSION new/yast2-kerberos-client-2.16.6/VERSION --- old/yast2-kerberos-client-2.16.5/VERSION 2008-03-19 08:52:56.000000000 +0100 +++ new/yast2-kerberos-client-2.16.6/VERSION 2008-04-01 15:30:19.000000000 +0200 @@ -1 +1 @@ -2.16.5 +2.16.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package yast2-installation checked in at Tue Apr 1 22:36:21 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-03-28 14:14:41.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2008-04-01 17:25:36.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Apr 1 13:12:00 CEST 2008 - locilka(a)suse.cz + +- Automatic configuration can be newly defined by control file. Two + new variables have been added enable_autoconfiguration and + autoconfiguration_default. +- New functionality to select the best-matching image for image + installation if more than one fit. +- 2.16.28 + +------------------------------------------------------------------- +Tue Apr 1 12:36:52 CEST 2008 - jsrain(a)suse.cz + +- added live installation workflow to default control file +- updated inst_finish clients handling for live installation + +------------------------------------------------------------------- +Tue Apr 1 10:15:34 CEST 2008 - jsrain(a)suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- +Mon Mar 31 16:42:40 CEST 2008 - locilka(a)suse.cz + +- There are currently two possible patterns/desktops that can use + kdm: kde4-kdm and kdebase3-kdm (bnc #372506). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.27.tar.bz2 New: ---- yast2-installation-2.16.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.gj9852/_old 2008-04-01 22:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.gj9852/_new 2008-04-01 22:35:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.27) +# spec file for package yast2-installation (Version 2.16.28) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-installation -Version: 2.16.27 +Version: 2.16.28 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.27.tar.bz2 +Source0: yast2-installation-2.16.28.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # anyxml -> barexml (bnc #366867) @@ -105,7 +105,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.27 +%setup -n yast2-installation-2.16.28 %build %{prefix}/bin/y2tool y2autoconf @@ -171,6 +171,21 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Tue Apr 01 2008 locilka(a)suse.cz +- Automatic configuration can be newly defined by control file. Two + new variables have been added enable_autoconfiguration and + autoconfiguration_default. +- New functionality to select the best-matching image for image + installation if more than one fit. +- 2.16.28 +* Tue Apr 01 2008 jsrain(a)suse.cz +- added live installation workflow to default control file +- updated inst_finish clients handling for live installation +* Tue Apr 01 2008 jsrain(a)suse.cz +- merged texts from proofread +* Mon Mar 31 2008 locilka(a)suse.cz +- There are currently two possible patterns/desktops that can use + kdm: kde4-kdm and kdebase3-kdm (bnc #372506). * Fri Mar 28 2008 locilka(a)suse.cz - Automatic configuration has been moved from the end of the first stage to the second stage. It's non-interactive (FATE #303396). @@ -559,7 +574,7 @@ - Calling the client from control file. - Adjusted RPM dependencies (.anyxml SCR agent). - 2.15.37 -* Sun Jul 29 2007 locilka(a)suse.cz +* Mon Jul 30 2007 locilka(a)suse.cz - Fixed curl parameters for network test in first stage (#295484). * Thu Jul 26 2007 mzugec(a)suse.cz - set variables VNC and USE_SSH in S07-medium (#294485) @@ -695,7 +710,7 @@ * Mon May 21 2007 locilka(a)suse.cz - Fixed release-notes desktop file. - 2.15.25 -* Thu May 17 2007 locilka(a)suse.cz +* Fri May 18 2007 locilka(a)suse.cz - Progress dialog for initializing installation sources. - 2.15.24 * Tue May 15 2007 locilka(a)suse.cz @@ -887,7 +902,7 @@ - Rereading all SCR Agents in case of installation workflow changed by Add-On product (#239055). - Calling PackageLock::Check before Pkg calls (#238556). -* Sun Jan 28 2007 locilka(a)suse.cz +* Mon Jan 29 2007 locilka(a)suse.cz - Removed tv and bluetooth hardware proposals from SLES control file. There are no such modules in that product (#238759). * Mon Jan 22 2007 locilka(a)suse.cz @@ -1551,7 +1566,7 @@ - Making "SLP Catalog" selection bigger (maximum ncurses size) (#168718) - 2.13.90 -* Tue Apr 25 2006 jsrain(a)suse.de +* Wed Apr 26 2006 jsrain(a)suse.de - fixed service proposal in SLES control file (#159771) * Tue Apr 25 2006 locilka(a)suse.cz - Return `next instead of `ok in case of SLP Add-On Source (#165989) @@ -1577,7 +1592,7 @@ * Fri Apr 21 2006 jdsn(a)suse.de - added proxy support for registration browser (#165891) - 2.13.83 -* Thu Apr 20 2006 jsrain(a)suse.de +* Fri Apr 21 2006 jsrain(a)suse.de - handle installation restart with repeating last step (#167561) - 2.13.82 * Thu Apr 20 2006 jdsn(a)suse.de @@ -1593,10 +1608,10 @@ * Wed Apr 19 2006 locilka(a)suse.cz - Added more debugging messages to the inst_proposal (#162831) - 2.13.78 -* Tue Apr 18 2006 jsrain(a)suse.de +* Wed Apr 19 2006 jsrain(a)suse.de - display proper popup when aborting add-on product installation (#159689) -* Tue Apr 18 2006 jdsn(a)suse.de +* Wed Apr 19 2006 jdsn(a)suse.de - in inst_suse_register: - busy/waiting popups (#163366, #164794) - text changes (#165509) @@ -1620,7 +1635,7 @@ - Skip popup and unnecessary work if there are no online update sources for add-ons (#167233). - 2.13.73 -* Fri Apr 14 2006 jsrain(a)suse.de +* Sat Apr 15 2006 jsrain(a)suse.de - prevent from changing installation mode and system for update once it is selected (#165832) - added add-on products to installation/update proposal for SLES/SLED @@ -1650,7 +1665,7 @@ - fixed Product.ycp - relnotes_url might be defined as an empty string (#165314). - 2.13.66 -* Tue Apr 11 2006 jsrain(a)suse.de +* Wed Apr 12 2006 jsrain(a)suse.de - fixed boot if root is on LVM (initialize udev symlinks) (#163073) - 2.13.65 * Tue Apr 11 2006 jdsn(a)suse.de @@ -1795,7 +1810,7 @@ installed Linux found. Just disabling 'Update' and 'Other' options in that case (#157695). - removed calling uml_finish, client doesn't has been dropped. -* Fri Mar 17 2006 jsrain(a)suse.de +* Sat Mar 18 2006 jsrain(a)suse.de - added AytoYaST support for add-on products - 2.13.39 * Fri Mar 17 2006 locilka(a)suse.cz @@ -1860,7 +1875,7 @@ change (#144783) * Wed Mar 08 2006 lrupp(a)suse.de - added suseRegister to Requires -* Tue Mar 07 2006 jdsn(a)suse.de +* Wed Mar 08 2006 jdsn(a)suse.de - added functionality to skip suse register and/or online update - 2.13.28 * Tue Mar 07 2006 jsrain(a)suse.de @@ -1932,7 +1947,7 @@ - 2.13.16 * Tue Feb 14 2006 jsrain(a)suse.de - fixed add-on product workflow and proposal merging -* Mon Feb 13 2006 jsrain(a)suse.de +* Tue Feb 14 2006 jsrain(a)suse.de - updated patchs on add-on product CD according to spec - 2.13.15 * Mon Feb 13 2006 visnov(a)suse.cz @@ -2489,7 +2504,7 @@ - updated fvwmrc.yast2 (see bug #43796) * Tue Aug 17 2004 nashif(a)suse.de - XFree86 -> xorg-x11 (#43832) -* Fri Aug 13 2004 nashif(a)suse.de +* Sat Aug 14 2004 nashif(a)suse.de - Fixed update (#43795) * Wed Aug 11 2004 nashif(a)suse.de - Copy EULA to installed system for later use in firstboot module @@ -2692,7 +2707,7 @@ * Thu Mar 18 2004 mvidner(a)suse.cz - Fall back to runlevel 3 if we accidentally don't set it in the installation proposal. It would be 0 (#35662). -* Wed Mar 17 2004 nashif(a)suse.de +* Thu Mar 18 2004 nashif(a)suse.de - Add runlevel to s390 proposal - remove x11 from autoinst workflow (handled differently) * Wed Mar 17 2004 nashif(a)suse.de @@ -2869,7 +2884,7 @@ - removed obsolete inst_hw_config.ycp and inst_confirm_abort.ycp * Sun Aug 31 2003 arvin(a)suse.de - use Popup::ConfirmAbort -* Sat Aug 30 2003 arvin(a)suse.de +* Sun Aug 31 2003 arvin(a)suse.de - moved reactivation of network to yast2-network (bug #29561) - moved display of into.txt into separate file * Thu Aug 28 2003 ms(a)suse.de @@ -2959,7 +2974,7 @@ - start apache as doc_server if suse_help_viewer isn't provided by kdebase3-SuSE (25436) - 2.7.39 -* Sat Mar 15 2003 kkaempf(a)suse.de +* Sun Mar 16 2003 kkaempf(a)suse.de - gdm2 might not be installed yet but earmarked for installation (#25410) - 2.7.38 @@ -3203,7 +3218,7 @@ - provides/obsoletes the old yast * Mon Sep 16 2002 kkaempf(a)suse.de - remove unneeded Save() functions (#19591) -* Thu Sep 12 2002 fehr(a)suse.de +* Fri Sep 13 2002 fehr(a)suse.de - remove obsolete LVM and MD initialisation in inst_mode.ycp - 2.6.63 * Thu Sep 12 2002 kkaempf(a)suse.de @@ -3264,7 +3279,7 @@ - 2.6.45 * Wed Sep 04 2002 arvin(a)suse.de - fixed provide/obsolete of trans packages (bug #18691) -* Tue Sep 03 2002 kkaempf(a)suse.de +* Wed Sep 04 2002 kkaempf(a)suse.de - adapt update workflow to package manager - 2.6.41 * Mon Sep 02 2002 arvin(a)suse.de @@ -3282,7 +3297,7 @@ - start in textmode for ssh installation (bug #18571) * Thu Aug 29 2002 kkaempf(a)suse.de - close source in inst_finish (#18508) -* Wed Aug 28 2002 kkaempf(a)suse.de +* Thu Aug 29 2002 kkaempf(a)suse.de - trigger cache copying at end - 2.6.35 * Wed Aug 28 2002 kkaempf(a)suse.de ++++++ yast2-installation-2.16.27.tar.bz2 -> yast2-installation-2.16.28.tar.bz2 ++++++ ++++ 2490 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/control/docs/control-section.xml new/yast2-installation-2.16.28/control/docs/control-section.xml --- old/yast2-installation-2.16.27/control/docs/control-section.xml 2008-03-26 11:20:36.000000000 +0100 +++ new/yast2-installation-2.16.28/control/docs/control-section.xml 2008-04-01 13:12:53.000000000 +0200 @@ -358,17 +358,31 @@ <itemizedlist> <listitem><para>(boolean) <emphasis>enable_firewall</emphasis> - firewall will proposed as either enabled or disabled in the network proposal.</para></listitem> + <listitem><para>(boolean) <emphasis>enable_clone</emphasis> - clonning feature will be either enabled or disabled.</para></listitem> + <listitem><para>(boolean) <emphasis>skip_language_dialog</emphasis> - the language dialog might be skipped (if language already selected).</para></listitem> + <listitem><para>(boolean) <emphasis>show_online_repositories</emphasis> - either shows or hides the "online repositories" feature check-box.</para></listitem> +  <listitem><para>(boolean) <emphasis>root_password_as_first_user</emphasis> - automatically selects or deselects the checkbox that makes Users configuration to set the password entered for a first user also for the user root. If not defined, default is <emphasis>false</emphasis></para></listitem> + +  + <listitem><para>(boolean) <emphasis>enable_autoconfiguration</emphasis> - enables a check box + in dialog that offers to switch the automatic configuration either on or off. + Default is false.</para></listitem> + + <listitem><para>(boolean) <emphasis>autoconfiguration_default</emphasis> - defines a default + value whether to use the automatic configuration. It works even if + <emphasis>enable_autoconfiguration</emphasis> is turned off, but user would not be able + to change it. Default is false.</para></listitem> </itemizedlist> </section> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/copy_logs_finish.ycp new/yast2-installation-2.16.28/src/clients/copy_logs_finish.ycp --- old/yast2-installation-2.16.27/src/clients/copy_logs_finish.ycp 2007-05-18 10:44:04.000000000 +0200 +++ new/yast2-installation-2.16.28/src/clients/copy_logs_finish.ycp 2008-04-01 13:11:10.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: copy_logs_finish.ycp 29684 2006-04-04 18:07:34Z jsrain $ + * $Id: copy_logs_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ * */ @@ -40,7 +40,7 @@ "steps" : 1, // progress step title "title" : _("Copying log files to installed system..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/desktop_finish.ycp new/yast2-installation-2.16.28/src/clients/desktop_finish.ycp --- old/yast2-installation-2.16.27/src/clients/desktop_finish.ycp 2008-02-18 12:18:14.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/desktop_finish.ycp 2008-03-31 16:45:53.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: desktop_finish.ycp 44576 2008-02-18 10:50:34Z coolo $ + * $Id: desktop_finish.ycp 45893 2008-03-31 14:45:52Z locilka $ * */ @@ -53,32 +53,36 @@ // check who provides suse_help_viewer // if kdebase3-SuSE isn't installed by apache or apache2, set /etc/sysconfig/apache:DOC_SERVER - if ((!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected ("kdebase3-SuSE"))) + if ( + (!(Pkg::IsProvided ("kdebase3-SuSE") || Pkg::IsSelected ("kdebase3-SuSE"))) + && + (!(Pkg::IsProvided ("kdebase4-openSUSE") || Pkg::IsSelected ("kdebase4-openSUSE"))) && (Pkg::IsProvided ("apache2") || Pkg::IsSelected ("apache2") || Pkg::IsProvided ("apache") || Pkg::IsSelected ("apache"))) { doc_server = true; } + // this detects WM and DM according to selected patterns and // installed packages if ( !Mode::update () ) { - map<string,map<string,string> > desktop_data = $[ + map <string,map <string, any> > desktop_data = $[ "gnome" : $[ - "package" : "gdm", + "package" : ["gdm"], "wm" : "gnome", "dm" : "gdm", "cursor" : "DMZ", ], "kde" : $[ - "package" : "kde4-kdm", + "package" : ["kde4-kdm", "kdebase3-kdm"], "wm" : "kde", "dm" : "kdm", "cursor" : "DMZ", ], "twm" : $[ - "package" : "xorg-x11", + "package" : ["xorg-x11"], "wm" : "", "dm" : "xdm", "cursor" : "DMZ", @@ -90,22 +94,26 @@ string default_cursor = "DMZ"; string selected_desktop = DefaultDesktop::Desktop (); - if (selected_desktop != "" && selected_desktop != nil) - { + + // DefaultDesktop has been set + if (selected_desktop != "" && selected_desktop != nil) { y2milestone ("Desktop was set to %1", selected_desktop); default_wm = desktop_data[selected_desktop, "wm"]:""; default_dm = desktop_data[selected_desktop, "dm"]:""; default_cursor = desktop_data[selected_desktop, "cursor"]:""; - } - else - { + + // KDE, GNOME CD ... or desktop just not set at all + } else { list<map<string,any> > patterns = Pkg::ResolvableDependencies ("", `pattern, ""); + patterns = filter (map<string,any> p, patterns, { return p["status"]:nil == `installed || p["status"]:nil == `selected; }); + list<list<string> > packages2 = []; + foreach (map<string,any> p, patterns, { y2internal ("P: %1", p); list<map<string,any> > deps = p["dependencies"]:[]; @@ -120,27 +128,27 @@ })); y2internal ("Packages2: %1", packages2); }); + list<string> packages = (list<string>)toset (flatten (packages2)); y2debug ("All packages in selected patterns: %1", packages); - list<string> desktop_order = ["gnome", "kde"]; + list <string> desktop_order = ["gnome", "kde"]; boolean desktop_found = false; string pattern_desktop = "gnome"; // check what packages are in the patterns // and adjust logon and window manager according to it - find (string d, desktop_order, { - if (contains (packages, desktop_data[d, "package"]:"")) - { - if (! desktop_found) - { + foreach (string d, desktop_order, { + if (desktop_found) break; + foreach (string one_package, desktop_data[d, "package"]:[], { + if (desktop_found) break; + if (contains (packages, one_package)) { desktop_found = true; pattern_desktop = d; y2milestone ("Setting desktop according to pattern to %1", pattern_desktop); } - } - return desktop_found; + }); }); // if no desktop was found according to pattern, try @@ -149,35 +157,26 @@ desktop_order = add (desktop_order, "twm"); desktop_order = prepend (desktop_order, pattern_desktop); desktop_found = false; - find (string d, desktop_order, { - string package = desktop_data[d, "package"]:""; - if (Pkg::IsProvided (package) - || Pkg::IsSelected (package)) - { + + foreach (string d, desktop_order, { + if (desktop_found) break; + + foreach (string package, desktop_data[d, "package"]:[], { + if (Pkg::IsProvided (package) && (Pkg::PkgInstalled (package) || Pkg::IsSelected (package))) { y2milestone ("package %1 selected or installed", package); - if (! desktop_found) - { - desktop_found = true; - default_dm = desktop_data[d, "dm"]:""; - y2milestone ( - "Setting logon manager %1 - package selecteed", - default_dm); - default_wm = desktop_data[d, "wm"]:""; - y2milestone ( - "Setting window manager %1 - package selecteed", - default_wm); - default_cursor - = desktop_data[d, "cursor"]:default_cursor; - y2milestone ( - "Setting cursor theme %1 - package selected", - default_cursor); - } - } - else if (! desktop_found) - { - y2milestone ("Package %1 not selected or installed, trying next desktop...", package); + desktop_found = true; + default_dm = desktop_data[d, "dm"]:""; + y2milestone ("Setting logon manager %1 - package selecteed", default_dm); + default_wm = desktop_data[d, "wm"]:""; + y2milestone ("Setting window manager %1 - package selecteed", default_wm); + default_cursor = desktop_data[d, "cursor"]:default_cursor; + y2milestone ("Setting cursor theme %1 - package selected", default_cursor); } - return desktop_found; + + y2milestone ("Package %1 not selected or installed, trying next desktop...", package); + }); + + return desktop_found; }); } y2milestone ("Default desktop: %1", default_wm); @@ -206,6 +205,8 @@ SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN, dm_shutdown); } + + y2milestone ("sysconfig/displaymanager/DISPLAYMANAGER=%1", default_dm); SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER, default_dm); SCR::Write (.sysconfig.displaymanager, nil); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.16.28/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.16.27/src/clients/inst_complex_welcome.ycp 2008-02-27 11:16:03.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_complex_welcome.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -135,7 +135,7 @@ // help text for initial (first time) language screen string help_text = _(" -Choose the Language and the Keyborad layout to be used during +Choose the Language and the Keyboard layout to be used during installation and for the installed system. ") + @@ -161,8 +161,8 @@ // help text, continued _(" -You can select Abort installation at any time to abort the -installation process. +Select Abort to abort the +installation process any time. "); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp new/yast2-installation-2.16.28/src/clients/inst_congratulate.ycp --- old/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp 2008-03-27 13:38:39.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_congratulate.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -6,7 +6,7 @@ * * Display a congratulation message for the user. * - * $Id: inst_congratulate.ycp 45790 2008-03-27 12:38:38Z locilka $ + * $Id: inst_congratulate.ycp 45912 2008-04-01 07:17:26Z jsrain $ */ { @@ -185,8 +185,7 @@ help = help + _("Use Clone if you want to create an AutoYaST profile. AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST needs a profile to know what the installed system should look like. If this option is -selected, a profile of the current system is stored in /root/autoinst.xml. -"); +selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>."); if (show_zmd_turnoff_checkbox) help = help + turnoff_zmd_help; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_finish.ycp new/yast2-installation-2.16.28/src/clients/inst_finish.ycp --- old/yast2-installation-2.16.27/src/clients/inst_finish.ycp 2008-03-28 13:37:21.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_finish.ycp 2008-04-01 13:11:10.000000000 +0200 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 45831 2008-03-28 12:37:20Z locilka $ + * $Id: inst_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -45,6 +45,7 @@ "mouse", "copy_files", "copy_systemfiles", + "live_copy_files", "switch_scr", ], ], @@ -54,6 +55,7 @@ "steps" : [ "ldconfig", "save_config", + "live_save_config", "runlevel", "desktop", "fonts", @@ -93,6 +95,7 @@ // progress stage "label" : _("Prepare system for initial boot"), "steps" : [ + "live_runme_at_boot", "vm", "driver_update2", // no second stage if possible @@ -157,12 +160,16 @@ run_type = `update; else if (Mode::autoinst ()) run_type = `autoinst; +else if (Mode::live_installation ()) + run_type = `live_installation; integer steps_count = 0; stages = maplist (map<string,any> stage, stages, { list<map> steps = maplist (string s, stage["steps"]:[], { s = s + "_finish"; + +// TODO: check if client exists map info = (map)WFM::CallFunction (s, ["Info"]); if (info == nil) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_mode.ycp new/yast2-installation-2.16.28/src/clients/inst_mode.ycp --- old/yast2-installation-2.16.27/src/clients/inst_mode.ycp 2008-03-17 11:14:48.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_mode.ycp 2008-04-01 13:13:48.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_mode.ycp 45508 2008-03-17 10:14:47Z locilka $ + * $Id: inst_mode.ycp 45927 2008-04-01 11:13:47Z locilka $ * */ @@ -172,12 +172,16 @@ _("In&clude Add-On Products from Separate Media"), Installation::add_on_selected )), - `Left (`CheckBox ( - `id (`use_automatic_configuration), `opt(`notify), - // check box - _("&Use Automatic Configuration"), - ProductControl::GetUseAutomaticConfiguration() - )) + (InstData::enable_autoconfiguration == true ? + `Left (`CheckBox ( + `id (`use_automatic_configuration), `opt(`notify), + // check box + _("&Use Automatic Configuration"), + ProductControl::GetUseAutomaticConfiguration() + )) + : + `Empty() + ) ), `HStretch() ); @@ -205,22 +209,19 @@ // help text for installation option (show_online_repositories == true ? _(" To use suggested remote repositories during installation or update, select -Add Online Repositories Before Installation. -"):"") + +Add Online Repositories Before Installation."):"") + // help text for installation method _(" To install an add-on product from separate media together with &product;, select -Include Add-On Products from Separate Media. -") + +Include Add-On Products from Separate Media.") + // help text for installation method _(" -To let new installation create an automatic configuration, select -Use Automatic Configuration. Otherwise second stage installation -with configuration proposals will be called instead. Update mode does not -support automatic configuration. -") + +To let the new installation to create an automatic configuration, select +Use Automatic Configuration. Otherwise, second stage installation +with configuration proposals will be used. Update mode does not +support automatic configuration.") + // help text for installation method _("Select Repair Installed System if you have a damaged Linux system on @@ -228,7 +229,7 @@ ") + // help text for installation method - _("Features Update and Repair Installed System are only + _("The features Update and Repair Installed System are only available if some Linux system has been detected. "); } @@ -405,11 +406,9 @@ // %2 - logfile, possibly with errors // %3 - link to our bugzilla // %4 - directory where YaST logs are stored - sformat (_("Calling the YaST module %1 has failed. -More information can be found near the end of the '%2' file. - -This is worth reporting a bug at %3. -Please, attach also all YaST logs stored in the '%4' directory."), + sformat (_("Accessing the YaST module %1 has failed. +More information can be found in the '%2' file. +Please report this bug at %3 and attach the YaST logs stored in the '%4' directory."), "inst_repair", "/var/log/YaST2/y2log", "http://bugzilla.novell.com/", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_network_check.ycp new/yast2-installation-2.16.28/src/clients/inst_network_check.ycp --- old/yast2-installation-2.16.27/src/clients/inst_network_check.ycp 2007-12-03 16:14:57.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_network_check.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -74,12 +74,13 @@ `Empty() ), `Left (`Label (_("No network setup has been found. -It is vitally important for using remote repositories -otherwise you can safely skip it."))) +It is important if using remote repositories, +otherwise you can safely skip it. +"))) ), `VSpacing (2), // TRANSLATORS: dialog label - `Left(`Label (_("Would you like to configure your network card now?"))), + `Left(`Label (_("Configure your network card now?"))), `VSpacing (1), `Frame ( // TRANSLATORS: frame label @@ -98,12 +99,13 @@ `VStretch() ), // TRANSLATORS: help text, part 1/2 - _("The current installation system does not seem -to have configured network.") + + _("The current installation system does not +have a configured network. +") + // TRANSLATORS: help text, part 2/2 _("A configured network is needed for using remote repositories -or Add-On products. You do not need to set it up in case you do not want -to use any remote repository and you can skip the configuration then."), +or add-on products. If you do not use remote repositories, skip the configuratio. +"), enable_next, enable_back ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_network_setup.ycp new/yast2-installation-2.16.28/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.16.27/src/clients/inst_network_setup.ycp 2008-01-10 10:34:28.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_network_setup.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -173,7 +173,7 @@ `Label (_("Probing network cards...")) ), // TRANSLATORS: dialog help - _("Please wait while installation is probing the network cards..."), + _("Please wait while the installation is probing the network cards..."), false, false ); @@ -275,8 +275,7 @@ // TRANSLATORS: pop-up error message Report::Error (_("No network card has been selected. -First, you need to select one network card -to configure it later.")); +Please select a network card to configure it later.")); return false; // Checking whether the netcard link is active @@ -287,10 +286,9 @@ sformat ( // TRANSLATORS: popup dialog question // %1 is replaced with a network device string - _("Link of the selected interface %1 is disconnected. + _("The link of the selected interface %1 is disconnected. It needs to be connected for a proper network configuration. - -Are you sure you want to use it despite the given fact?"), +Are you sure you want to use it?"), selected_netcard ), // TRANSLATORS: popup dialog button @@ -343,12 +341,12 @@ // TRANSLATORS: dialog help 1/3 _("Here you can configure your network cards to be used immediately.") + // TRANSLATORS: dialog help 2/3 - _("If you don't need a network connection now, + _("If you do not need a network connection now, you can safely skip the configuration.") + // TRANSLATORS: dialog help 3/3 - _("To configure a network card, select it from list -and click on the Next button, -otherwise click on the Cancel button."), + _("To configure a network card, select it from the list +and click the Next button. +Otherwise,clickCancel."), Label::BackButton(), Label::NextButton() ); @@ -1143,14 +1141,13 @@ // TRANSLATORS: a pop-up dialog headline _("Internet Test Failed"), // TRANSLATORS: a pop-up dialog question, see buttons *3 - _("Because the Internet connection test failed, you should be + _("The Internet connection test failed. You should be redirected to the previous dialog to change the configuration. - -Would you like to go back to change it?"), +Go back and change it?"), // TRANSLATORS: popup dialog button (*3) _("Go Back"), // TRANSLATORS: popup dialog button (*3) - _("Skip It"), + _("Skip"), `yes )) { return false; @@ -1385,9 +1382,8 @@ if (all_ok != true) { y2warning ("Writing has failed, returning to the previous dialog"); Report::Error (_("Writing the network settings failed. - -You will be returned to the previous dialog either -to change the settings or to cancel the network setup.")); +You will be returned to the previous dialog to either +change the settings, or cancel the network setup.")); return `back; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp new/yast2-installation-2.16.28/src/clients/inst_software_selection.ycp --- old/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp 2008-03-27 16:34:20.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_software_selection.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -179,8 +179,7 @@ break; } Popup::Message (_("No system type was selected. - -Select the default one, please.")); +Select the default type.")); continue; } else if (ret == `abort || ret == `cancel) { if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete)) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.16.28/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp 2008-03-19 17:26:58.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/inst_upgrade_urls.ycp 2008-04-01 10:34:40.000000000 +0200 @@ -102,7 +102,7 @@ // TRANSLATORS: dialog text, possibly multiline, // Please, do not use more than 50 characters per line. `Left (`Label (_("These repositories were found on the system -you are just upgrading:"))), +you are upgrading:"))), `Table ( `id ("table_of_repos"), `opt (`notify), @@ -126,9 +126,8 @@ ) ), // TRANSLATORS: help text 1/3 - _("Here you can see all software repositories that were found -on the system you are just upgrading. You have better enable -those you want to include in the upgrade process.") + + _("Here you see all software repositories found +on the system you are upgrading. Enable the ones you want to include in the upgrade process.") + // TRANSLATORS: help text 2/3 _("To enable or disable an URL, click on the Toggle Status button or double-click on the respective table item.") + @@ -412,9 +411,8 @@ // TRANSLATORS: popup header _("Network is not Configured"), // TRANSLATORS: popup question - _("Remote repositories require the Internet connection. - -Would you like to configure it?"), + _("Remote repositories require an Internet connection. +Configure it?"), Label::YesButton(), Label::NoButton(), `yes @@ -570,7 +568,7 @@ Report::Error (sformat ( // TRANSLATORS: error report // %1 is replaced with repo-name, %2 with repo-URL - _("An error occurred when refreshing repository + _("An error occurred while refreshing repository Name: %1 URL: %2"), repo_name, @@ -666,7 +664,7 @@ _("Initializing package manager..."), ], // TRANSLATORS: dialog help - _("Please wait, while repositories are being read...") + _("Please wait while repositories are being read...") ); Wizard::SetTitleIcon ("yast-sw_source"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/ldconfig_finish.ycp new/yast2-installation-2.16.28/src/clients/ldconfig_finish.ycp --- old/yast2-installation-2.16.27/src/clients/ldconfig_finish.ycp 2007-05-18 10:44:04.000000000 +0200 +++ new/yast2-installation-2.16.28/src/clients/ldconfig_finish.ycp 2008-04-01 13:11:10.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: ldconfig_finish.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: ldconfig_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ * */ @@ -37,7 +37,7 @@ "steps" : 1, // progress step title "title" : _("Setting up linker cache"), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/switch_scr_finish.ycp new/yast2-installation-2.16.28/src/clients/switch_scr_finish.ycp --- old/yast2-installation-2.16.27/src/clients/switch_scr_finish.ycp 2007-07-18 10:36:12.000000000 +0200 +++ new/yast2-installation-2.16.28/src/clients/switch_scr_finish.ycp 2008-04-01 13:11:10.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: switch_scr_finish.ycp 39488 2007-07-18 08:36:11Z locilka $ + * $Id: switch_scr_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ * */ @@ -69,7 +69,7 @@ "steps" : 1, // progress step title "title" : _("Moving to installed system..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/clients/umount_finish.ycp new/yast2-installation-2.16.28/src/clients/umount_finish.ycp --- old/yast2-installation-2.16.27/src/clients/umount_finish.ycp 2008-03-03 13:26:34.000000000 +0100 +++ new/yast2-installation-2.16.28/src/clients/umount_finish.ycp 2008-04-01 13:11:10.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: umount_finish.ycp 44265 2008-02-08 09:37:51Z locilka $ + * $Id: umount_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ * */ @@ -44,7 +44,7 @@ "steps" : 1, // progress step title "title" : _("Unmounting all mounted devices..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/include/inst_inc_first.ycp new/yast2-installation-2.16.28/src/include/inst_inc_first.ycp --- old/yast2-installation-2.16.27/src/include/inst_inc_first.ycp 2008-03-28 10:02:19.000000000 +0100 +++ new/yast2-installation-2.16.28/src/include/inst_inc_first.ycp 2008-04-01 12:55:05.000000000 +0200 @@ -21,6 +21,9 @@ import "FileUtils"; import "String"; import "Mode"; + import "ProductFeatures"; + + include "installation/misc.ycp"; void InitMouse () { if (!Arch::s390 () || Arch::board_iseries ()) { @@ -43,8 +46,16 @@ ProductControl::DisableModule ("add-on"); ProductControl::DisableModule ("productsources"); + // FATE #303396, Make second stage non-interactive + boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature ("globals", "enable_autoconfiguration"); + boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature ("globals", "autoconfiguration_default"); + // Enabled only when AC is selected - ProductControl::DisableModule ("automatic_configuration"); + InstData::enable_autoconfiguration = (enable_autoconfiguration == true); + // Default state + ProductControl::SetUseAutomaticConfiguration (autoconfiguration_default == true); + // Enables or disables some modules, etc. + AdjustAutomaticInstallation(); // First-stage users module will enable them again only if needed ProductControl::DisableModule ("root"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/include/misc.ycp new/yast2-installation-2.16.28/src/include/misc.ycp --- old/yast2-installation-2.16.27/src/include/misc.ycp 2008-03-28 13:37:21.000000000 +0100 +++ new/yast2-installation-2.16.28/src/include/misc.ycp 2008-04-01 13:13:48.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 45831 2008-03-28 12:37:20Z locilka $ + * $Id: misc.ycp 45927 2008-04-01 11:13:47Z locilka $ * */ @@ -208,7 +208,7 @@ return ( button == `confirm ); } - void AdjustStepsAccordingToInstallationSettings () { + void AdjustAutomaticInstallation () { if (ProductControl::GetUseAutomaticConfiguration()) { ProductControl::DisableAllModulesAndProposals ("installation", "continue"); ProductControl::EnableModule ("automatic_configuration"); @@ -216,6 +216,10 @@ ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); ProductControl::DisableModule ("automatic_configuration"); } + } + + void AdjustStepsAccordingToInstallationSettings () { + AdjustAutomaticInstallation(); if (Installation::add_on_selected == true) { ProductControl::EnableModule ("add-on"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp new/yast2-installation-2.16.28/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp 2008-03-28 14:22:11.000000000 +0100 +++ new/yast2-installation-2.16.28/src/modules/ImageInstallation.ycp 2008-04-01 15:48:12.000000000 +0200 @@ -312,6 +312,42 @@ // TODO error checking } +// TODO: extract the weight from control file +list <string> patterns_priority = ["^kde", "^gnome", "^xfce", "^x11", "^base", "^enhanced_base"]; + +/** + * Function finds a pattern weight + * The return value is 0 to 9999. The smaller the number the bigger the weight. + * + * @param string pattern + * @return integer pattern weight + */ +integer GetPatternWeight (string pattern) { + integer weight = 9999; + + integer counter = -1; + foreach (string one_pattern_regexp, patterns_priority, { + counter = counter + 1; + if (regexpmatch (pattern, one_pattern_regexp)) { + weight = counter; + break; + } + }); + + return weight; +} + +/** + * Patterns have an internal weight. It says which one of two is better + * to use for image installation. The size does matter. + */ +boolean DoesPatternFitBetter (string last_pattern, string new_pattern) { + integer last_pattern_weight = GetPatternWeight (last_pattern); + integer new_pattern_weight = GetPatternWeight (new_pattern); + + return (new_pattern_weight < last_pattern_weight); +} + /** * Find a set of images which suites selected patterns * @param patterns a list of patterns which are selected @@ -345,16 +381,52 @@ y2milestone ("Image set descriptions: %1", image_sets); map<string,any> result = $[]; + // more patterns could match at once + // as we can't merge the meta image, only one can be selected + map <string, map <string, any> > possible_patterns = $[]; + map <string, integer> matching_pattern_sizes = $[]; + + // trying to find all matching patterns foreach (map<string,any> image, image_sets, { string pattern = image["pattern"]:""; + // no image-pattern defined, matches all patterns if (pattern == "" && result == $[]) { - result = image; + possible_patterns[pattern] = image; + // image-patterns matches to patterns got as parameter } else if (contains (patterns, pattern)) { - result = image; + possible_patterns[pattern] = image; } + + matching_pattern_sizes[pattern] = size (image); }); + y2milestone ("Matching patterns: %1, sizes: %2", possible_patterns, matching_pattern_sizes); + + string last_pattern = ""; + + // one result + if (size (possible_patterns) == 1) { + foreach (string pattern, map <string, any> image, possible_patterns, { + result = image; + last_pattern = pattern; + }); + // more possible results + } else if (size (possible_patterns) > 1) { + integer last_size = -1; + last_pattern = ""; + + foreach (string pattern, map <string, any> image, possible_patterns, { + if (matching_pattern_sizes[pattern]:0 > last_size && DoesPatternFitBetter (last_pattern, pattern)) { + last_size = matching_pattern_sizes[pattern]:0; + result = image; + last_pattern = pattern; + } + }); + } + + y2milestone ("Result: %1/%2", last_pattern, result); + if (result == $[]) { Installation::image_installation = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/src/modules/InstData.ycp new/yast2-installation-2.16.28/src/modules/InstData.ycp --- old/yast2-installation-2.16.27/src/modules/InstData.ycp 2008-03-14 10:36:45.000000000 +0100 +++ new/yast2-installation-2.16.28/src/modules/InstData.ycp 2008-04-01 12:53:08.000000000 +0200 @@ -48,6 +48,10 @@ global list <string> localDisabledModules = []; global list <string> localDisabledProposals = []; + // FATE #303396, Non-interactive second stage + // this variable enables a check box in dialog + global boolean enable_autoconfiguration = false; + // <-- other /* EOF */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.16.27/VERSION new/yast2-installation-2.16.28/VERSION --- old/yast2-installation-2.16.27/VERSION 2008-03-28 14:30:31.000000000 +0100 +++ new/yast2-installation-2.16.28/VERSION 2008-04-01 17:25:45.000000000 +0200 @@ -1 +1 @@ -2.16.27 +2.16.28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit skelcd-control-openSUSE
by root＠Hilbert.suse.de 01 Apr '08

01 Apr '08

Hello community, here is the log from the commit of package skelcd-control-openSUSE checked in at Tue Apr 1 22:34:35 CEST 2008. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2008-03-28 14:27:12.000000000 +0100 +++ skelcd-control-openSUSE/skelcd-control-openSUSE-CD.changes 2008-04-01 17:20:04.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 1 17:17:27 CEST 2008 - jsrain(a)suse.cz + +- added live installation workflow to default control file. + +------------------------------------------------------------------- +Tue Apr 1 17:17:26 CEST 2008 - locilka(a)suse.cz + +- Automatic configuration can be newly defined by control file. Two + new variables have been added enable_autoconfiguration and + autoconfiguration_default. + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-CD.spec ++++++ --- /var/tmp/diff_new_pack.uQ5154/_old 2008-04-01 22:33:12.000000000 +0200 +++ /var/tmp/diff_new_pack.uQ5154/_new 2008-04-01 22:33:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE-CD (Version 2008.3.28) +# spec file for package skelcd-control-openSUSE-CD (Version 2008.4.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,7 +17,7 @@ License: YaST License Group: Metapackages AutoReqProv: off -Version: 2008.3.28 +Version: 2008.4.1 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +64,12 @@ /CD1/control.xml %changelog +* Tue Apr 01 2008 jsrain(a)suse.cz +- added live installation workflow to default control file. +* Tue Apr 01 2008 locilka(a)suse.cz +- Automatic configuration can be newly defined by control file. Two + new variables have been added enable_autoconfiguration and + autoconfiguration_default. * Fri Mar 28 2008 locilka(a)suse.cz - Automatic configuration has been moved from the end of the first stage to the second stage. It's non-interactive (FATE #303396). @@ -229,7 +235,7 @@ - added congratulate text to the control file (#170881) * Thu Apr 20 2006 mvidner(a)suse.cz - added globals/disable_register_w3m (#167255, jdsn) -* Fri Apr 14 2006 jsrain(a)suse.cz +* Sat Apr 15 2006 jsrain(a)suse.cz - removed update system selection from update proposal (#165832) * Fri Apr 14 2006 jsrain(a)suse.cz - changed control files according to (#165509 @@ -250,7 +256,7 @@ - changed title for registration in installation workflow * Thu Mar 09 2006 mvidner(a)suse.cz - added network/startmode=ifplugd (#156388). -* Tue Mar 07 2006 jsrain(a)suse.cz +* Wed Mar 08 2006 jsrain(a)suse.cz - adapted for online update (jdsn) * Thu Mar 02 2006 jsrain(a)suse.cz - added suse_resgister to installation workflow @@ -349,7 +355,7 @@ * Thu Apr 01 2004 nashif(a)suse.de - Added missing workflow step to shut network down in second phase of installation (#37546, #37763) -* Wed Mar 31 2004 nashif(a)suse.de +* Thu Apr 01 2004 nashif(a)suse.de - removed network proposal from update workflow * Wed Mar 31 2004 nashif(a)suse.de - show warning about suboptimal distribution skelcd-control-openSUSE.spec: same change ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2008-03-28 09:41:12.000000000 +0100 +++ skelcd-control-openSUSE/control.xml 2008-04-01 13:11:10.000000000 +0200 @@ -38,6 +38,10 @@ <system_directory>/root/inst-sys/</system_directory> </save_instsys_item> </save_instsys_content> + +  + <enable_autoconfiguration config:type="boolean">true</enable_autoconfiguration> + <autoconfiguration_default config:type="boolean">true</autoconfiguration_default> </globals> <software> @@ -151,6 +155,21 @@ </proposal> <proposal> + <label>Live Installation Settings</label> + <mode>live_installation</mode> + <stage>initial</stage> + <name>initial</name> + <enable_skip>no</enable_skip> + <proposal_modules config:type="list"> + <proposal_module>hwinfo</proposal_module> + <proposal_module>partitions</proposal_module> + <proposal_module>bootloader</proposal_module> + <proposal_module>keyboard</proposal_module> + <proposal_module>timezone</proposal_module> + </proposal_modules> + </proposal> + + <proposal> <label>Update Settings</label> <mode>update</mode> <name>initial</name> @@ -358,6 +377,74 @@ </modules> </workflow> +  + <workflow> + <defaults> + <archs>all</archs> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </defaults> + <label>Installation</label> + <mode>live_installation</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>Welcome</label> + <name>inst_live_welcome</name> + </module> + <module> + <label>License Agreement</label> + <name>inst_license</name> + </module> + + <module> + <label>Installation Settings</label> + <name>inst_live_pre-proposal</name> + </module> + <module> + <label>Installation Settings</label> + <name>inst_proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation</label> + <name>inst_do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>inst_prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_live_doit</name> + <enable_next>no</enable_next> + <enable_back>no</enable_back> + </module> + <module> + <label>Perform Installation</label> + <name>inst_finish</name> + <enable_back>no</enable_back> + </module> + </modules> + </workflow> +  <workflow> <defaults> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0