October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52815 - in /trunk/theme/openSUSE/icons: 16x16/apps/yast-live-install-finish.png 22x22/apps/yast-live-install-finish.png 32x32/apps/yast-live-install-finish.png 48x48/apps/yast-live-install-finish.png
by jimmacfx＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jimmacfx Date: Fri Oct 31 23:59:45 2008 New Revision: 52815 URL: http://svn.opensuse.org/viewcvs/yast?rev=52815&view=rev Log: finishing stage for the live installer. addresses bug #438154 Added: trunk/theme/openSUSE/icons/16x16/apps/yast-live-install-finish.png (with props) trunk/theme/openSUSE/icons/22x22/apps/yast-live-install-finish.png (with props) trunk/theme/openSUSE/icons/32x32/apps/yast-live-install-finish.png (with props) trunk/theme/openSUSE/icons/48x48/apps/yast-live-install-finish.png (with props) Added: trunk/theme/openSUSE/icons/16x16/apps/yast-live-install-finish.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/22x22/apps/yast-live-install-finish.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/32x32/apps/yast-live-install-finish.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/48x48/apps/yast-live-install-finish.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary file - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52814 - in /trunk/theme/openSUSE/icons: 16x16/apps/suse.png 22x22/apps/suse.png 32x32/apps/suse.png 48x48/apps/suse.png
by jimmacfx＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jimmacfx Date: Fri Oct 31 23:59:40 2008 New Revision: 52814 URL: http://svn.opensuse.org/viewcvs/yast?rev=52814&view=rev Log: general suse logo Added: trunk/theme/openSUSE/icons/16x16/apps/suse.png (with props) trunk/theme/openSUSE/icons/22x22/apps/suse.png (with props) trunk/theme/openSUSE/icons/32x32/apps/suse.png (with props) trunk/theme/openSUSE/icons/48x48/apps/suse.png (with props) Added: trunk/theme/openSUSE/icons/16x16/apps/suse.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/22x22/apps/suse.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/32x32/apps/suse.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/48x48/apps/suse.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary file - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52813 - /trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png
by jimmacfx＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jimmacfx Date: Fri Oct 31 23:59:35 2008 New Revision: 52813 URL: http://svn.opensuse.org/viewcvs/yast?rev=52813&view=rev Log: add VM on 32x32 screen Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52812 - /tags/stable-2_17_11/product-creator/
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 21:01:53 2008 New Revision: 52812 URL: http://svn.opensuse.org/viewcvs/yast?rev=52812&view=rev Log: Created tag stable-2_17_11 for product-creator Added: tags/stable-2_17_11/product-creator/ - copied from r52811, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52811 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/data/kiwi_templates/iso/config.xml
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 21:01:46 2008 New Revision: 52811 URL: http://svn.opensuse.org/viewcvs/yast?rev=52811&view=rev Log: - image-creator template: install pattern packages by default (bnc#404022) - 2.17.11 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/data/kiwi_templates/iso/config.xml Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=5281… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Oct 31 21:01:46 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Oct 31 21:01:46 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 20:04:05 CET 2008 - jsuchome(a)suse.cz + +- image-creator template: install pattern packages by default + (bnc#404022) +- 2.17.11 + +------------------------------------------------------------------- Fri Oct 31 16:20:05 CET 2008 - lslezak(a)suse.cz - read and set the product name (bnc#440609) Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Fri Oct 31 21:01:46 2008 @@ -22,7 +22,7 @@ <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> <user name="root" pwd="" home="/root"/> </users> - <packages type="image" patternPackageType="onlyRequired"> + <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> <package name="yast2-live-installer"/> <package name="pam"/> <package name="pam-config"/> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52810 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgRepoFilterView.cc src/YQPkgSearchFilterView.cc
by sh-sh-sh＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: sh-sh-sh Date: Fri Oct 31 17:57:49 2008 New Revision: 52810 URL: http://svn.opensuse.org/viewcvs/yast?rev=52810&view=rev Log: Fixed bnc #381981: Bad initial size for secondary filters in "Repositories" filter view Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgRepoFilterView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=52810&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Oct 31 17:57:49 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "14") +SET(VERSION_PATCH "15") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Oct 31 17:57:49 2008 @@ -1,7 +1,14 @@ ------------------------------------------------------------------- +Fri Oct 31 17:56:00 CET 2008 - sh(a)suse.de + +- Fixed bnc #381981: Bad initial size for secondary filters in + "Repositories" filter view +- V 2.17.5 + +------------------------------------------------------------------- Fri Oct 24 18:25:17 CEST 2008 - sh(a)suse.de -- Fixed bnc # 403367: Crash when searching for invalid regex +- Fixed bnc #403367: Crash when searching for invalid regex - V 2.17.4 ------------------------------------------------------------------- Modified: trunk/qt-pkg/src/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRepoFilterView.c… ============================================================================== --- trunk/qt-pkg/src/YQPkgRepoFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRepoFilterView.cc Fri Oct 31 17:57:49 2008 @@ -20,15 +20,15 @@ #define YUILogComponent "qt-pkg" -#include "YUILog.h" +#include <YUILog.h> +#include <YUIException.h> -#include <qsplitter.h> +#include <QVBoxLayout> +#include <QSplitter> +#include <QFrame> #include "QY2ComboTabWidget.h" #include "QY2LayoutUtils.h" -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QFrame> #include "YQPkgRepoFilterView.h" #include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" @@ -36,6 +36,7 @@ #include "YQPkgStatusFilterView.h" #include "YQi18n.h" + YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent ) : QWidget( parent ) { @@ -43,14 +44,14 @@ layout->setContentsMargins(0,0,0,0); QSplitter * splitter = new QSplitter( Qt::Vertical, this ); - Q_CHECK_PTR( splitter ); + YUI_CHECK_NEW( splitter ); layout->addWidget( splitter ); _repoList = new YQPkgRepoList( this ); splitter->addWidget(_repoList); - Q_CHECK_PTR( _repoList ); + YUI_CHECK_NEW( _repoList ); _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert // Directly propagate signals filterStart() and filterFinished() @@ -90,12 +91,14 @@ QWidget * YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent ) { - QWidget *vbox = new QWidget(parent); - Q_CHECK_PTR( vbox ); + QWidget *vbox = new QWidget( parent ); + YUI_CHECK_NEW( vbox ); QVBoxLayout *layout = new QVBoxLayout(); - vbox->setLayout(layout); - layout->setContentsMargins(0,0,0,0); + YUI_CHECK_NEW( layout ); + + vbox->setLayout( layout ); + layout->setContentsMargins( 0, 0, 0, 0 ); // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of @@ -105,25 +108,23 @@ // few cases where a combo box label is left to the combo box rather than // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" )); + YUI_CHECK_NEW( _secondaryFilters ); layout->addWidget(_secondaryFilters); - Q_CHECK_PTR( _secondaryFilters ); - // // All Packages // _allPackages = new QWidget( this ); - layout->addWidget(_allPackages); - Q_CHECK_PTR( _allPackages ); + YUI_CHECK_NEW( _allPackages ); _secondaryFilters->addPage( _( "All Packages" ), _allPackages ); - // unmaintaned packages (packages that are not provided in any of - // the configured repositories) + + // Unmaintaned packages: Packages that are not provided in any of + // the configured repositories _unmaintainedPackages = new QWidget( this ); - layout->addWidget(_unmaintainedPackages); - Q_CHECK_PTR( _unmaintainedPackages ); + YUI_CHECK_NEW( _unmaintainedPackages ); _secondaryFilters->addPage( _( "Unmaintained Packages" ), _unmaintainedPackages ); // @@ -131,22 +132,22 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( this ); - layout->addWidget(_rpmGroupTagsFilterView); - - Q_CHECK_PTR( _rpmGroupTagsFilterView ); + YUI_CHECK_NEW( _rpmGroupTagsFilterView ); _secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( _rpmGroupTagsFilterView, SIGNAL( filterStart() ), - _repoList, SLOT ( filter() ) ); + _repoList, SLOT ( filter() ) ); // // Package search view // - _searchFilterView = new YQPkgSearchFilterView(this); - layout->addWidget(_searchFilterView); - Q_CHECK_PTR( _searchFilterView ); + _searchFilterView = new YQPkgSearchFilterView( this ); + YUI_CHECK_NEW( _searchFilterView ); + + _searchFilterView->setSizePolicy( QSizePolicy::Minimum, // horizontal + QSizePolicy::Minimum ); // vertical _secondaryFilters->addPage( _( "Search" ), _searchFilterView ); connect( _searchFilterView, SIGNAL( filterStart() ), @@ -161,7 +162,11 @@ // _statusFilterView = new YQPkgStatusFilterView( parent ); - Q_CHECK_PTR( _statusFilterView ); + YUI_CHECK_NEW( _statusFilterView ); + + _searchFilterView->setSizePolicy( QSizePolicy::Minimum, // horizontal + QSizePolicy::Minimum ); // vertical + _secondaryFilters->addPage( _( "Installation Summary" ), _statusFilterView ); connect( _statusFilterView, SIGNAL( filterStart() ), Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Fri Oct 31 17:57:49 2008 @@ -49,20 +49,21 @@ YQPkgSearchFilterView::YQPkgSearchFilterView( QWidget * parent ) : QWidget( parent ) { - QVBoxLayout *layout = new QVBoxLayout; - setLayout(layout); + QVBoxLayout * layout = new QVBoxLayout; + YUI_CHECK_NEW( layout ); + setLayout( layout ); _matchCount = 0; layout->addStretch(); // Headline QLabel * label = new QLabel( _( "Searc&h:" ), this ); - Q_CHECK_PTR( label ); + YUI_CHECK_NEW( label ); layout->addWidget(label); label->setFont( YQUI::yqApp()->headingFont() ); // Input field ( combo box ) for search text _searchText = new QComboBox( this ); - Q_CHECK_PTR( _searchText ); + YUI_CHECK_NEW( _searchText ); layout->addWidget(_searchText); _searchText->setEditable( true ); label->setBuddy( _searchText ); @@ -70,13 +71,13 @@ // Box for search button QHBoxLayout * hbox = new QHBoxLayout(); - Q_CHECK_PTR( hbox ); + YUI_CHECK_NEW( hbox ); layout->addLayout(hbox); hbox->addStretch(); // Search button _searchButton = new QPushButton( _( "&Search" ), this ); - Q_CHECK_PTR( _searchButton ); + YUI_CHECK_NEW( _searchButton ); hbox->addWidget(_searchButton); connect( _searchButton, SIGNAL( clicked() ), @@ -89,27 +90,27 @@ // QGroupBox * gbox = new QGroupBox( _( "Search in" ), this ); - Q_CHECK_PTR( gbox ); + YUI_CHECK_NEW( gbox ); layout->addWidget( gbox ); QVBoxLayout *vLayout = new QVBoxLayout; gbox->setLayout( vLayout ); - _searchInName = new QCheckBox( _( "&Name" ), gbox ); Q_CHECK_PTR( _searchInName ); + _searchInName = new QCheckBox( _( "&Name" ), gbox ); YUI_CHECK_NEW( _searchInName ); vLayout->addWidget(_searchInName); - _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); Q_CHECK_PTR( _searchInSummary ); + _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); YUI_CHECK_NEW( _searchInSummary ); vLayout->addWidget(_searchInSummary); - _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); Q_CHECK_PTR( _searchInDescription ); + _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); YUI_CHECK_NEW( _searchInDescription ); vLayout->addWidget(_searchInDescription); vLayout->addStretch(); // Intentionally NOT marking RPM tags for translation - _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); Q_CHECK_PTR( _searchInProvides ); + _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides ); vLayout->addWidget(_searchInProvides); - _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); Q_CHECK_PTR( _searchInRequires ); + _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); YUI_CHECK_NEW( _searchInRequires ); vLayout->addWidget(_searchInRequires); - _searchInFileList = new QCheckBox( _( "File list" ), gbox ); Q_CHECK_PTR( _searchInFileList ); + _searchInFileList = new QCheckBox( _( "File list" ), gbox ); YUI_CHECK_NEW( _searchInFileList ); vLayout->addWidget(_searchInFileList); @@ -124,11 +125,11 @@ // label = new QLabel( _( "Search &Mode:" ), this ); - Q_CHECK_PTR( label ); + YUI_CHECK_NEW( label ); layout->addWidget( label ); _searchMode = new QComboBox( this ); - Q_CHECK_PTR( _searchMode ); + YUI_CHECK_NEW( _searchMode ); layout->addWidget( _searchMode ); _searchMode->setEditable( false ); @@ -148,7 +149,7 @@ layout->addStretch(); _caseSensitive = new QCheckBox( _( "Case Sensiti&ve" ), this ); - Q_CHECK_PTR( _caseSensitive ); + YUI_CHECK_NEW( _caseSensitive ); layout->addWidget(_caseSensitive); for ( int i=0; i < 6; i++ ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52809 - /tags/stable-2_17_38/packager/
by locilka＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: locilka Date: Fri Oct 31 16:53:30 2008 New Revision: 52809 URL: http://svn.opensuse.org/viewcvs/yast?rev=52809&view=rev Log: Created tag stable-2_17_38 for packager Added: tags/stable-2_17_38/packager/ - copied from r52808, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52808 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_kickoff.ycp
by locilka＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: locilka Date: Fri Oct 31 16:53:16 2008 New Revision: 52808 URL: http://svn.opensuse.org/viewcvs/yast?rev=52808&view=rev Log: - Fixed list of files copied in inst_kickoff from inst-sys to the system (bnc #440430). - 2.17.38 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_kickoff.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=52808&r1=52… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Oct 31 16:53:16 2008 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Oct 31 16:53:16 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 16:49:05 CET 2008 - locilka(a)suse.cz + +- Fixed list of files copied in inst_kickoff from inst-sys to the + system (bnc #440430). +- 2.17.38 + +------------------------------------------------------------------- Fri Oct 31 12:18:18 CET 2008 - lslezak(a)suse.cz - 2.17.37 Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickof… ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Fri Oct 31 16:53:16 2008 @@ -422,9 +422,11 @@ }); } else { - // See bnc #381227 + y2milestone ("Copying users/groups information from the inst-sys to %1", Installation::destdir); + // @see bnc #381227 + // @see bnc #440430 // files might have been copied already from image - foreach (string filename, ["/etc/passwd", "/etc/group"], { + foreach (string filename, ["/etc/passwd", "/etc/shadow", "/etc/group"], { string filename_copy_to = sformat ("%1/%2", Installation::destdir, filename); if (FileUtils::Exists (filename_copy_to)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52807 - /trunk/nfs-client/src/Nfs.ycp
by kmachalkova＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: kmachalkova Date: Fri Oct 31 16:45:04 2008 New Revision: 52807 URL: http://svn.opensuse.org/viewcvs/yast?rev=52807&view=rev Log: Correct backwards compatibility code if 'vfstype' key is missing on Import (#438497) Modified: trunk/nfs-client/src/Nfs.ycp Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=52807… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Fri Oct 31 16:45:04 2008 @@ -107,7 +107,7 @@ global define boolean Import (list<map> settings) ``{ boolean missing = false; - foreach(map s,settings,``{ + settings = maplist(map s,settings,``{ foreach (string k, ["server_path", "mount_point", "nfs_options"], ``{ if (! haskey (s, k)) { @@ -124,6 +124,7 @@ { s["vfstype"] = "nfs"; } + return s; }); if (missing) @@ -131,7 +132,6 @@ return false; } - Set(settings); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52806 - /tags/stable-2_17_24/installation/
by locilka＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: locilka Date: Fri Oct 31 16:35:15 2008 New Revision: 52806 URL: http://svn.opensuse.org/viewcvs/yast?rev=52806&view=rev Log: Created tag stable-2_17_24 for installation Added: tags/stable-2_17_24/installation/ - copied from r52805, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52805 - in /trunk/installation: VERSION package/yast2-installation.changes src/include/inst_inc_first.ycp
by locilka＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: locilka Date: Fri Oct 31 16:33:57 2008 New Revision: 52805 URL: http://svn.opensuse.org/viewcvs/yast?rev=52805&view=rev Log: - Fixed checking whether running the second stage is required. - Added writing 'SecondStageRequired' 0/1 to /etc/install.inf (both bnc #439572) - 2.17.24 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52805&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Oct 31 16:33:57 2008 @@ -1 +1 @@ -2.17.23 +2.17.24 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Oct 31 16:33:57 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 31 16:28:23 CET 2008 - locilka(a)suse.cz + +- Fixed checking whether running the second stage is required. +- Added writing 'SecondStageRequired' 0/1 to /etc/install.inf + (both bnc #439572) +- 2.17.24 + +------------------------------------------------------------------- Thu Oct 30 14:42:15 CET 2008 - locilka(a)suse.cz - Saving sources at the end of inst_extrasources if some were Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Fri Oct 31 16:33:57 2008 @@ -147,21 +147,33 @@ } } + /** + * Writes to /etc/install.inf whether running the second stage is required + * This is written to inst-sys and not copied to the installed system + * (which is already umounted in that time). + * + * @see BNC #439572 + */ + void WriteSecondStageRequired (boolean scst_required) { + // writes 'SecondStageRequired' '1' or '0' + // if such tag exists, it is removed before + WFM::Execute (.local.bash, sformat ( + "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", + "SecondStageRequired", + (scst_required == false ? "0":"1"), + "/etc/install.inf" + )); + Linuxrc::ResetInstallInf(); + } + void HandleSecondStageRequired () { if (Stage::initial()) { // the current one is 'initial' + // after reboot/kexec it would be 'continue' string stage_to_check = "continue"; - // matching the control file - string mode_to_check = "unknown"; - - if (Mode::live_installation()) { - mode_to_check = "live_installation"; - } else if (Mode::installation()) { - mode_to_check = "installation"; - } else if (Mode::autoinst()) { - mode_to_check = "autoinstallation"; - } + // for matching the control file + string mode_to_check = Mode::mode(); // file name string run_yast_at_boot = sformat ("%1/%2", Installation::destdir, Installation::run_yast_at_boot); @@ -171,9 +183,11 @@ if (ProductControl::RunRequired (stage_to_check, mode_to_check)) { y2milestone ("Running the second stage is required"); WFM::Write (.local.string, run_yast_at_boot, ""); + WriteSecondStageRequired (true); } else { y2milestone ("It is not required to run the second stage"); WFM::Execute (.local.remove, run_yast_at_boot); + WriteSecondStageRequired (false); } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52804 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: lslezak Date: Fri Oct 31 16:29:22 2008 New Revision: 52804 URL: http://svn.opensuse.org/viewcvs/yast?rev=52804&view=rev Log: - Pkg::ResolvableProperties() - return correct status for selected patterns (bnc#440611) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 31 16:29:22 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 31 16:29:10 CET 2008 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - return correct status for selected + patterns (bnc#440611) + +------------------------------------------------------------------- Thu Oct 23 09:41:39 CEST 2008 - lslezak(a)suse.cz - added Pkg::SourceProvideSignedFile() function for downloading Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Fri Oct 31 16:29:22 2008 @@ -194,7 +194,12 @@ zypp::ResStatus status = item.status(); - if (status.isInstalled() || status.isSatisfied()) + if (status.isToBeInstalled()) + { + stat = "selected"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { @@ -206,11 +211,6 @@ stat = "installed"; } } - else if (status.isToBeInstalled()) - { - stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); - } else { stat = "available"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52803 - in /trunk/product-creator: package/yast2-product-creator.changes src/dialogs.ycp
by lslezak＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: lslezak Date: Fri Oct 31 16:22:26 2008 New Revision: 52803 URL: http://svn.opensuse.org/viewcvs/yast?rev=52803&view=rev Log: - read and set the product name (bnc#440609) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Oct 31 16:22:26 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 31 16:20:05 CET 2008 - lslezak(a)suse.cz + +- read and set the product name (bnc#440609) + +------------------------------------------------------------------- Fri Oct 24 13:12:05 CEST 2008 - lslezak(a)suse.cz - File "/PS3/otheros/otheros.bld" is optional when creating a PPC Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Fri Oct 31 16:22:26 2008 @@ -862,6 +862,24 @@ return (symbol)ret; } + string ProductFromRepo(integer repo_id) + { + map<string,string> read_content = ProductCreator::ReadContentFile(repo_id); + string prod_name = read_content["LABEL"]:""; + + y2milestone("Product name: %1", prod_name); + return prod_name; + } + + string ProductFromURL(string url) + { + integer src_id = ProductCreator::UrlToId([url])[0]:-1; + y2milestone("Reading product name from src %1", src_id); + string prod_name = ProductFromRepo(src_id); + + return prod_name; + } + define symbol baseProductSelectionDialog() { if (size(ProductCreator::Config["sources"]:[]) == 1) @@ -872,7 +890,14 @@ // remove the option if it exists if (haskey (ProductCreator::Config, "base_repo")) ProductCreator::Config = remove(ProductCreator::Config, "base_repo"); - return going_back ? `back : `next; + symbol ret = going_back ? `back : `next; + + if (ret == `next) + { + ProductCreator::Config["product"] = ProductFromURL((ProductCreator::Config["sources"]:[])[0]:""); + } + + return ret; } /* dialog caption */ @@ -944,6 +969,7 @@ if (ret == `next) { ProductCreator::Config["base_repo"] = base; + ProductCreator::Config["product"] = ProductFromURL(base); } return ret; @@ -1461,6 +1487,7 @@ // do not return patterns selected by dependencies foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""), { + y2debug("Processing pattern: %1", pat); if (pat["status"]:`none == `selected) { y2milestone ("pat %1 selected by %2" , pat["name"]:"", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52802 - /tags/stable-2_17_21/users/
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 15:22:53 2008 New Revision: 52802 URL: http://svn.opensuse.org/viewcvs/yast?rev=52802&view=rev Log: Created tag stable-2_17_21 for users Added: tags/stable-2_17_21/users/ - copied from r52801, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52801 - in /trunk/users: VERSION configure.in.in package/yast2-users.changes src/Users.pm
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 15:22:48 2008 New Revision: 52801 URL: http://svn.opensuse.org/viewcvs/yast?rev=52801&view=rev Log: - delete crypted homes before writing /etc/passwd - check for cracklib-devel in configure - 2.17.21 Modified: trunk/users/VERSION trunk/users/configure.in.in trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=52801&r1=52800… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Oct 31 15:22:48 2008 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: trunk/users/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/configure.in.in?rev=52801&… ============================================================================== --- trunk/users/configure.in.in (original) +++ trunk/users/configure.in.in Fri Oct 31 15:22:48 2008 @@ -11,5 +11,13 @@ @YAST2-CHECKS-TESTSUITE@ @YAST2-CHECKS-PROGRAM@ +AC_LANG_PUSH(C++) +yast_found_cracklib=no +AC_CHECK_HEADER(crack.h,[yast_found_cracklib=yes]) +if [[ "$yast_found_cracklib" = "no" ]]; then + AC_MSG_ERROR(Headers for cracklib are missing. Install the package cracklib-devel.) +fi +AC_LANG_POP(C++) + ## and generate the output... @YAST2-OUTPUT@ Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Oct 31 15:22:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 15:09:40 CET 2008 - jsuchome(a)suse.cz + +- delete crypted homes before writing /etc/passwd +- check for cracklib-devel in configure +- 2.17.21 + +------------------------------------------------------------------- Wed Oct 29 09:08:54 CET 2008 - jsuchome(a)suse.cz - during live installation, available package is installed one Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=52801&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Oct 31 15:22:48 2008 @@ -4399,6 +4399,7 @@ # Write users if ($use_gui) { Progress->NextStage (); } + if ($users_modified) { if ($passwd_not_read) { # error popup (%s is a file name) @@ -4421,6 +4422,13 @@ $plugin_error = GetPluginError ($args, $result); } } + # remove the crypted directories now, so cryptconfig still knows them + if (!DeleteCryptedHomes ()) { + # error popup + $ret = __("An error occurred while removing users."); + Report->Error ($ret); + return $ret; + } # -------------------------------------- write /etc/passwd if ($plugin_error eq "" && !WritePasswd ()) { $ret = Message->ErrorWritingFile ("$base_directory/passwd"); @@ -4509,16 +4517,6 @@ Package->InstallAll (cryptconfig_packages ()); } - # remove the crypted directories now - if ($users_modified) { - if (!DeleteCryptedHomes ()) { - # error popup - $ret = __("An error occurred while removing users."); - Report->Error ($ret); - return $ret; - } - } - # Write passwords if ($use_gui) { Progress->NextStage (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52800 - /tags/stable-2_17_30/printer/
by jsmeix＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsmeix Date: Fri Oct 31 14:58:33 2008 New Revision: 52800 URL: http://svn.opensuse.org/viewcvs/yast?rev=52800&view=rev Log: Created tag stable-2_17_30 for printer Added: tags/stable-2_17_30/printer/ - copied from r52799, trunk/printer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52799 - in /trunk/printer: VERSION package/yast2-printer.changes src/overview.ycp
by jsmeix＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsmeix Date: Fri Oct 31 14:58:27 2008 New Revision: 52799 URL: http://svn.opensuse.org/viewcvs/yast?rev=52799&view=rev Log: - Added a test if a local cupsd does not listen on the official IPP port (631) to the Overview dialog. - 2.17.30 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/overview.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52799&r1=527… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Oct 31 14:58:27 2008 @@ -1 +1 @@ -2.17.29 +2.17.30 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Oct 31 14:58:27 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 14:51:29 CET 2008 - jsmeix(a)suse.de + +- Added a test if a local cupsd does not listen on the + official IPP port (631) to the Overview dialog. +- 2.17.30 + +------------------------------------------------------------------- Thu Oct 30 15:10:48 CET 2008 - jsmeix(a)suse.de - Added Firewall Settings to the Printing via Network dialog. Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=527… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Fri Oct 31 14:58:27 2008 @@ -125,7 +125,35 @@ ); void initOverview( string key ) -{ boolean local_content_selected = Printer::queue_filter_show_local; +{ // First of all the multi-line string because such strings cannot be indented: + string required_cupsd_not_accessible = + // Message of a Popup::ErrorDetails + // when a local cupsd is required but it is not accessible. + // YaST did already run 'lpstat -h localhost -r' + // to check whether or not a local cupsd is accessible. + // The command is shown here to the user (even if it is a bit technical) + // to have him informed what goes on here and what he can do on his own. +_("A local running CUPS daemon is required but it seems to be not accessible. +Check with 'lpstat -h localhost -r' whether a local cupsd is accessible. +A non-accessible cupsd leads to an endless sequence of further failures. +"); + string cupsd_not_on_official_port = + // Message of a Popup::ErrorDetails + // when the local cupsd does not use the official IPP port (631). + // A rather technical text because this does not happen on normal systems + // By default the cupsd uses the official IPP port (631). + // If not, the user must have intentionally and manually changed + // the port setting for the cupsd in /etc/cups/cupsd.conf +_("The CUPS daemon seems not to listen on the official IANA IPP port (631). +Check with 'netstat -nap | grep cupsd' where the cupsd actually listens. +This happens when there is a 'Listen ...:1234' or 'Port 1234' setting +in /etc/cups/cupsd.conf (check also if there is 'BrowsePort 1234'). +The YaST printer modue does not support a non-official port. +A non-official port leads to an endless sequence of further failures. +If you really must use a non-official port, you cannot use +the YaST printer modue to configure your printers. +"); + boolean local_content_selected = Printer::queue_filter_show_local; boolean remote_content_selected = Printer::queue_filter_show_remote; boolean local_cupsd_required = true; // Determine whether or not it is currently a real client-only config @@ -149,8 +177,46 @@ } // Determine whether or not a local cupsd is accessible: if( local_cupsd_required && ! Printerlib::GetAndSetCupsdStatus( "" ) ) - { // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: - Printerlib::GetAndSetCupsdStatus( "start" ); + { // Printerlib::GetAndSetCupsdStatus results also false when + // a local running cupsd does not listen on the official IPP port. + // Therefore, to be on the safe side, do a restart here. + // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: + Printerlib::GetAndSetCupsdStatus( "restart" ); + // Check again whether a required local cupsd is actually accessible + // because the user may have rejected to start it in the above call or + // the user may have aborted the Popup::TimedMessage from the above call + // which would wait until a started cupsd becomes actually accessible. + if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) + { Popup::ErrorDetails( required_cupsd_not_accessible, + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + // A special case is when the cupsd does not listen on the official IANA IPP port (631). + // Then "lpstat -h localhost -r" also fails ("-h localhost:port" would have to be used). + // When there is a process which runs the command "cupsd" + // check if something is accessible on port 631. + // Do this test only here (and not in Printerlib::GetAndSetCupsdStatus) + // because the Overview is the initial dialog which is shown to the user + // when the YaST printer module started and if the cupsd does not listen + // on the official IPP port, a single error popup when the Overview dialog + // is launched is sufficient. + // The YaST printer modue does not support when the cupsd listens + // on a non-official port e.g. via "Listen *:9999" and/or "Port 9999" + // and/or "BrowsePort 9999" settings in /etc/cups/cupsd.conf. + // Skip this test (and hope for the best) when netcat is not available + // because in yast2-printer.spec there can be only "Recommends: netcat" + // because there have been narrow-minded user complaints who insist + // not to have netcat installed because "netcat is a hacker intrusion tool" + // (explanations of the difference between netcat and e.g. nmap did not help). + if( Printerlib::ExecuteBashCommand( "ps -C cupsd" ) + && Printerlib::ExecuteBashCommand( "type -P netcat" ) + ) + { if( ! Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z localhost 631" ) ) + { Popup::ErrorDetails( cupsd_not_on_official_port, + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + } + } + } } UI::ChangeWidget( `local_content_checkbox, `Value, local_content_selected ); UI::ChangeWidget( `remote_content_checkbox, `Value, remote_content_selected ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52798 - in /trunk/storage: libstorage/bindings/ycp/LibStorage.i libstorage/src/Storage.cc libstorage/src/Storage.h libstorage/src/StorageInterface.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: aschnell Date: Fri Oct 31 14:43:19 2008 New Revision: 52798 URL: http://svn.opensuse.org/viewcvs/yast?rev=52798&view=rev Log: - added function getCommitInfo (for fate #302857) Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Fri Oct 31 14:43:19 2008 @@ -35,6 +35,7 @@ specialize_sequence(storage::DmraidInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::DmmultipathInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::PartitionSlotInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::CommitInfo, TO_PACK, FROM_PACK, CHECK) %include "../../src/StorageInterface.h" Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Oct 31 14:43:19 2008 @@ -3483,43 +3483,56 @@ } -deque<string> Storage::getCommitActions( bool mark_destructive ) const - { - deque<string> ret; +deque<string> +Storage::getCommitActions(bool mark_destructive) const +{ + CommitInfo info; + getCommitInfo(mark_destructive, info); + return info.actions; +} + + +void +Storage::getCommitInfo(bool mark_destructive, CommitInfo& info) const +{ + info.destructive = false; + info.actions.clear(); + ConstContPair p = contPair(); - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( !p.empty() ) - { + { list<commitAction*> ac; for( ConstContIterator i = p.begin(); i != p.end(); ++i ) - { + { list<commitAction*> l; i->getCommitActions( l ); ac.splice( ac.end(), l ); - } + } ac.sort( cont_less<commitAction>() ); string txt; for( list<commitAction*>::const_iterator i=ac.begin(); i!=ac.end(); ++i ) - { + { + if ((*i)->destructive) + info.destructive = true; txt.erase(); if( mark_destructive && (*i)->destructive ) txt += "<font color=red>"; txt += (*i)->descr; const Volume *v = (*i)->vol(); if( v && !v->getDescText().empty() ) - { + { txt += ". "; txt += v->getDescText(); - } + } if( mark_destructive && (*i)->destructive ) txt += "</font>"; - ret.push_back( txt ); + info.actions.push_back( txt ); delete *i; - } } - y2mil("ret.size():" << ret.size()); - return ret; } + y2mil("destructive:" << info.destructive << " actions.size():" << info.actions.size()); +} static bool sort_cont_up( const Container* rhs, const Container* lhs ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Fri Oct 31 14:43:19 2008 @@ -445,6 +445,7 @@ int removeDmraid( const string& name ); deque<string> getCommitActions( bool mark_destructive ) const; + void getCommitInfo(bool mark_destructive, CommitInfo& info) const; const string& getLastAction() const { return lastAction; } const string& getExtendedErrorMessage() const { return extendedError; } void eraseFreeInfo( const string& device ); Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Fri Oct 31 14:43:19 2008 @@ -452,6 +452,16 @@ }; /** + * Contains info about actions performed during commit(). + */ + struct CommitInfo + { + bool destructive; + deque<string> actions; + }; + + + /** * preliminary list of error codes, must have negative values */ enum ErrorCodes @@ -1302,7 +1312,8 @@ /** * Sets the value of description text. - * This text will be returned together with the text returned by getCommitActions + * This text will be returned together with the text returned by + * getCommitInfo(). * * @param device name of volume, e.g. /dev/hda1 * @param txt description text for this partition @@ -1814,13 +1825,24 @@ /** * Gets a list of string describing the actions to be executed - * after next call to commit() + * after next call to commit(). * + * Deprecated, use getCommitInfo(). + * * @param mark_destructive if true use <red> around </red> * destructive actions (like e.g. deletion, formatting, ...) * @return list of strings presentable to the user */ - virtual deque<string> getCommitActions( bool mark_destructive ) const = 0; + virtual deque<string> getCommitActions(bool mark_destructive) const = 0; + + /** + * Gets info about actions to be executed after next call to commit(). + * + * @param mark_destructive if true use <red> around </red> + * destructive actions (like e.g. deletion, formatting, ...) + * @param info record that gets filled with data + */ + virtual void getCommitInfo(bool mark_destructive, CommitInfo& info) const = 0; /** * Gets action performed last during previous call to commit() Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Oct 31 14:43:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 31 14:21:58 CET 2008 - aschnell(a)suse.de + +- added function getCommitInfo (for fate #302857) + +------------------------------------------------------------------- Thu Oct 30 16:50:16 CET 2008 - aschnell(a)suse.de - prior to creating file system check that volume is big enough -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52797 - /tags/stable-2_17_10/samba-client/
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 14:38:08 2008 New Revision: 52797 URL: http://svn.opensuse.org/viewcvs/yast?rev=52797&view=rev Log: Created tag stable-2_17_10 for samba-client Added: tags/stable-2_17_10/samba-client/ - copied from r52796, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52796 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/Samba.ycp src/SambaConfig.pm src/SambaWinbind.pm
by jsuchome＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: jsuchome Date: Fri Oct 31 14:38:04 2008 New Revision: 52796 URL: http://svn.opensuse.org/viewcvs/yast?rev=52796&view=rev Log: - fixed reading /etc/security/pam_winbind.conf (bnc#433210) - do not restart dbus from YaST (bnc#395402) - 2.17.10 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/SambaConfig.pm trunk/samba-client/src/SambaWinbind.pm Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=52796&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Oct 31 14:38:04 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Oct 31 14:38:04 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 14:06:36 CET 2008 - jsuchome(a)suse.cz + +- fixed reading /etc/security/pam_winbind.conf (bnc#433210) +- do not restart dbus from YaST (bnc#395402) +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 15 14:36:15 CEST 2008 - jsuchome(a)suse.cz - updated help text for pam_mount configuration Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=5… ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Fri Oct 31 14:38:04 2008 @@ -460,8 +460,9 @@ */ global define boolean GetWinbindCaching () { - return SambaConfig::WinbindGlobalGetStr("cached_login", "") == "yes" && - SambaConfig::GlobalGetStr("winbind offline logon", "") == "yes"; + string cached = SambaConfig::WinbindGlobalGetStr ("cached_login", ""); + string offline = SambaConfig::GlobalGetStr ("winbind offline logon", ""); + return cached == "yes" && offline == "yes"; } /** Modified: trunk/samba-client/src/SambaConfig.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaConfig.pm?… ============================================================================== --- trunk/samba-client/src/SambaConfig.pm (original) +++ trunk/samba-client/src/SambaConfig.pm Fri Oct 31 14:38:04 2008 @@ -210,7 +210,7 @@ # read the complete global section $AllAtOnce = {}; - if (FileUtils->Exists ("/etc/security/winbind.conf")) { + if (FileUtils->Exists ("/etc/security/pam_winbind.conf")) { $AllAtOnce = SCR->Read(".etc.security_winbind.all"); } Modified: trunk/samba-client/src/SambaWinbind.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaWinbind.pm… ============================================================================== --- trunk/samba-client/src/SambaWinbind.pm (original) +++ trunk/samba-client/src/SambaWinbind.pm Fri Oct 31 14:38:04 2008 @@ -93,10 +93,6 @@ SCR->Execute (".target.bash", "/usr/sbin/nscd -i passwd"); SCR->Execute (".target.bash", "/usr/sbin/nscd -i group"); } - # restart D-BUS (#174589) FIXME this should be elsewhere - if (!$write_only && Service->Status ("dbus") == 0) { - Service->Restart ("dbus"); - } # restart zmd (#174589) FIXME this should be elsewhere if (!$write_only && PackageSystem->Installed ("zmd") && Service->Status ("novell-zmd") == 0) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52795 - /trunk/nfs-client/src/nfs-client4part.ycp
by kmachalkova＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: kmachalkova Date: Fri Oct 31 14:23:43 2008 New Revision: 52795 URL: http://svn.opensuse.org/viewcvs/yast?rev=52795&view=rev Log: Pass empty map to partitioner if user cancels the operation Modified: trunk/nfs-client/src/nfs-client4part.ycp Modified: trunk/nfs-client/src/nfs-client4part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs-client4part.y… ============================================================================== --- trunk/nfs-client/src/nfs-client4part.ycp (original) +++ trunk/nfs-client/src/nfs-client4part.ycp Fri Oct 31 14:23:43 2008 @@ -28,12 +28,15 @@ map <string, any> ToStorage ( map <string, any> entry ) { + map <string, any> ret = $[]; - return ( $[ + if (entry != nil && entry != $[]) + ret = $[ "device" : entry["spec"]:"", "mount" : entry["file"]:"", "fstopt" : entry["mntops"]:"" - ]); + ]; + return ret; } if (func == "CreateUI") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52794 - /trunk/storage/storage/src/include/ep-nfs.ycp
by kmachalkova＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: kmachalkova Date: Fri Oct 31 14:22:47 2008 New Revision: 52794 URL: http://svn.opensuse.org/viewcvs/yast?rev=52794&view=rev Log: - rollback if adding of NFS share fails (test mount does not succeed) - handle events (modify target map) only if y2-nfs-client returns some reasonable data Modified: trunk/storage/storage/src/include/ep-nfs.ycp Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-n… ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Fri Oct 31 14:22:47 2008 @@ -109,12 +109,15 @@ { y2milestone("Adding NFS share: %1 mountpoint: %2 options: %3", entry["device"]:"", entry["mount"]:"", entry["fstopt"]:""); + target_map = Storage::GetTargetMap(); + list<map> nfs_list = target_map["/dev/nfs", "partitions"]:[]; + integer sizeK = Storage::CheckNfsVolume (entry["device"]:"", entry["fstopt"]:""); if ( sizeK <= 0) { Popup::Error( sformat( _("Test mount of NFS share '%1' failed.\nCheck that remote server is accesible and try again."), entry["device"]:"") ); - //FIXME: rollback if the operation didn't succeed + WFM::CallFunction("nfs-client4part", [ "FromStorage", $[ "shares" : nfs_list] ] ); } else { @@ -157,25 +160,29 @@ map <string, any> line = ( map <string, any> ) WFM::CallFunction("nfs-client4part", [ "HandleEvent", $[ "widget_id" : widget ] ]); - switch (widget ) + //do something only if y2-nfs-client returns some reasonable data + if ( line != $[] && line != nil) { - case `newbut: - { - AddShare( line ); - break; - } - case `editbut: - { - EditShare( line ); - break; - } - case `delbut: + switch (widget ) { - DeleteShare( line ); - break; + case `newbut: + { + AddShare( line ); + break; + } + case `editbut: + { + EditShare( line ); + break; + } + case `delbut: + { + DeleteShare( line ); + break; + } + default: + break; } - default: - break; } //FIXME: Take care that non-fstab settings of nfs-client -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52793 - in /trunk/product-creator/src: ProductCreator.ycp complex.ycp dialogs.ycp
by lslezak＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: lslezak Date: Fri Oct 31 14:07:48 2008 New Revision: 52793 URL: http://svn.opensuse.org/viewcvs/yast?rev=52793&view=rev Log: - do not use stored "code10" flag, check the type at runtime Modified: trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/complex.ycp trunk/product-creator/src/dialogs.ycp Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Fri Oct 31 14:07:48 2008 @@ -279,42 +279,6 @@ } } -global boolean isCode10Source() -{ - boolean code10 = false; - string arch = GetArch(); - if (arch == "s390_64") arch = "s390x"; - foreach (string url , ProductCreator::Config["sources"]:[], - { - integer i = SourceManager::getSourceId(url); - - y2milestone("Downloading %1/boot/directory.yast...", url); - string local_directory_yast = Pkg::SourceProvideOptionalFile(i, 1, "/boot/directory.yast"); - - if (local_directory_yast != nil && local_directory_yast != "") - { - // read directory.yast file - string dir_listing = (string)SCR::Read(.target.string, local_directory_yast); - - if (dir_listing != nil && dir_listing != "") - { - list<string> items = splitstring(dir_listing, "\n"); - - code10 = code10 || contains(items, arch + "/"); - } - } - }); - - y2milestone("CODE10 source: %1", code10); - - return code10; -} - -global void CheckCode10Source() -{ - // add code10 flag - /boot directory layout - ProductCreator::Config["code10"] = isCode10Source(); -} symbol autoyastPackages () { @@ -332,9 +296,6 @@ SCR::Execute(.target.mkdir, tmp + "/tmproot"); Pkg::TargetInit( tmp + "/tmproot" , true); - // add code10 flag if the new source type is detected - CheckCode10Source(); - boolean success = ProductCreator::EnableSource(); // Pkg::SourceStartManager(true); @@ -1350,18 +1311,29 @@ } -global boolean isBootSource(integer srcid) +global list<string> BootFiles(integer srcid) { - boolean bootable = false; y2milestone("Downloading boot/directory.yast from src %1...", srcid); string local_directory_yast = Pkg::SourceProvideOptionalFile(srcid, 1, "/boot/directory.yast"); - bootable = local_directory_yast != nil; - y2milestone("Source %1 bootable: %2, directory.yast: %3", srcid, bootable, local_directory_yast); + y2milestone("directory.yast from src %1: %2", srcid, local_directory_yast); + + list<string> ret = []; - return bootable; + if (local_directory_yast != nil) + { + string listing = (string)SCR::Read(.target.string, local_directory_yast); + + ret = splitstring(listing, "\n"); + ret = filter(string f, ret, {return f != "";}); + } + + y2milestone("Content of boot/directory.yast: %1", ret); + + return ret; } + /** * Write the modified file with pattern definitions * @param file_path path to pattern file @@ -1431,12 +1403,46 @@ return ret; } +global map<string,any> GetBootInfoRepo(integer repo) +{ + list<string> boot_files = ProductCreator::BootFiles(repo); + boolean bootable_product = size(boot_files) > 0; + + string arch = ProductCreator::GetArch(); + // ppc64 has /boot/ppc + string boot_architecture = contains(boot_files, arch + "/") ? arch : ""; + + // TODO FIXME: add ppc 64 hack + // if (arch)== "ppc64") ? "ppc" : arch; + + map<string,any> ret = $[ "bootable" : bootable_product, "boot_architecture" : boot_architecture ]; + + y2milestone("Bootinfo: %1", ret); + + return ret; +} + +global map<string,any> GetBootInfo() +{ + string base_url = Config["base_repo"]:""; + + y2milestone("Configured base repository: %1", base_url); + + // detect the base source + integer base_source = (base_url != "") ? (UrlToId([base_url])[0]:-1) : checkProductDependency(); + + map<string,any> ret = GetBootInfoRepo(base_source); + ret = add(ret, "base_source", base_source); + + return ret; +} + /** * Create Skeleton * @return boolean true on success */ -global define boolean CreateSkeleton () ``{ - +global define boolean CreateSkeleton(integer base_source, boolean bootable_product, string boot_architecture) +{ integer ret = 0; boolean success = true; boolean savespace = Config["savespace"]:false; @@ -1445,7 +1451,6 @@ integer sles_src = 0; string descr_dir = ""; string arch = GetArch(); - if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1453,17 +1458,7 @@ skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:""); SCR::Execute(.target.mkdir, skel_root); - string base_url = Config["base_repo"]:""; - y2milestone("Configured base repository: %1", base_url); - - // detect the base source - integer base_source = (base_url != "") ? (UrlToId([base_url])[0]:-1) : checkProductDependency(); - boolean bootable_product = isBootSource(base_source); - - // ppc64 has /boot/ppc - string boot_architecture = (arch == "ppc64") ? "ppc" : arch; - - if (bootable_product && Config["code10"]:false) + if (bootable_product) { Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(boot_architecture))); } @@ -1480,17 +1475,11 @@ { if (_arch == "i386" || _arch == "x86_64") { - if (Config["code10"]:false) - { - Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); - } - else - { - Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); - } + Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(boot_architecture))); } else if (_arch == "ppc" || _arch == "ppc64") { + // FIXME PS3 is optional Exec(sformat("/bin/mkdir -p '%1/PS3'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); @@ -1550,32 +1539,17 @@ if (savespace) { // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/rescue", arch), - sformat("%1/boot/%2", skel_root, arch)); - } - else - { - // use the old directory - CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); - } + CopyFile(id, 1, sformat("boot/%1/rescue", boot_architecture), + sformat("%1/boot/%2", skel_root, boot_architecture)); + // Loader, x86 specific if (_arch == "i386" || _arch == "x86_64") { - if (Config["code10"]:false) - { - // recursive copy of /boot/$arch/loader/* - CopyDirectoryRec(id, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); + // recursive copy of /boot/$arch/loader/* + CopyDirectoryRec(id, 1, sformat("boot/%1/loader", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); - // nonrecursive copy of /boot/$arch/* - CopyDirectoryNonRec(id, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); - } - else - { - // recursive copy of /boot/loader/* - CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root)); - } + // nonrecursive copy of /boot/$arch/* + CopyDirectoryNonRec(id, 1, sformat("boot/%1", boot_architecture), sformat("%1/boot", skel_root)); } else if (_arch == "ppc" || _arch == "ppc64") { @@ -1631,18 +1605,9 @@ { if (bootable_product) { - // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else - { - CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); - CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); - } + CopyFile(id, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); + CopyFile(id, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); + CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); } // copy content* files @@ -1654,15 +1619,8 @@ { if (bootable_product) { - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else - { - CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); - } + CopyFile(id, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); + CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); } // copy base files, skip all directories @@ -1717,35 +1675,18 @@ { if (savespace) { - // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(base_source, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(base_source, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(base_source, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else - { - CopyFile(base_source, 1, "boot/rescue", sformat("%1/boot", skel_root)); - CopyFile(base_source, 1, "boot/root", sformat("%1/boot", skel_root)); - } + CopyFile(base_source, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); + CopyFile(base_source, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); + CopyFile(base_source, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); // Loader, x86 specific if (_arch == "i386" || _arch == "x86_64") { - if (Config["code10"]:false) - { - // recursive copy of /boot/$arch/loader/* - CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); + // recursive copy of /boot/$boot_architecture/loader/* + CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture)); - // nonrecursive copy of /boot/$arch/* - CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); - } - else - { - // recursive copy of /boot/loader/* - CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); - } + // nonrecursive copy of /boot/$boot_architecture/* + CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", boot_architecture), sformat("%1/boot", skel_root)); } else if (_arch == "ppc" || _arch == "ppc64") { @@ -1912,7 +1853,7 @@ Exec(sformat("/bin/echo %1 >> '%2/media.1/media'", count, String::Quote(skel_root))); // make the source digitally unsigned (because signed descr/packages file has been modified) - if (Config["code10"]:false) + if (boot_architecture != "") { // remove the key and the checksum Exec(sformat("/bin/rm '%1/content.asc' '%1/content.key'", String::Quote(skel_root))); @@ -2394,32 +2335,34 @@ * Copy other files to directory tree * @return boolean true on success */ -global define boolean CopyMiscFiles() ``{ - +global define boolean CopyMiscFiles(string boot_arch) +{ string cpCmd = ""; + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; + y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); - if (Config["bootconfig"]:"" != "") + + if (Config["bootconfig"]:"" != "") { y2debug("custom config available"); - string fname = (Config["code10"]:false) - ? sformat("%1/boot/%2/loader/isolinux.cfg", skel_root, arch) - : sformat("%1/boot/loader/isolinux.cfg", skel_root); + string fname = sformat("%1/boot/%2/loader/isolinux.cfg", skel_root, boot_arch); + y2milestone("Writing isolinux.cfg to %1", fname); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); } - cpCmd = (Config["code10"]:false) - ? sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) - : sformat("cp -- '%1/product-creator/message' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); - SCR::Execute (.target.bash, cpCmd); - - cpCmd = (Config["code10"]:false) - ? sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) - : sformat("cp -- '%1/product-creator/options.msg' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); - SCR::Execute (.target.bash, cpCmd); + cpCmd = sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", + String::Quote(Directory::datadir), String::Quote(skel_root), boot_arch); + + Exec(cpCmd); + + cpCmd = sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", + String::Quote(Directory::datadir), String::Quote(skel_root), boot_arch); + + Exec(cpCmd); return true; } Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Oct 31 14:07:48 2008 @@ -319,7 +319,14 @@ // redirect the download callbacks ProductCreator::RedirectCallbacks(); - if (!ProductCreator::CreateSkeleton()) + map<string, any> boot_info = ProductCreator::GetBootInfo(); + y2milestone("Boot info: %1", boot_info); + + boolean bootable = boot_info["bootable"]:false; + string boot_arch = boot_info["boot_architecture"]:""; + integer base_source = boot_info["base_source"]:-1; + + if (!ProductCreator::CreateSkeleton(base_source, bootable, boot_arch)) { Report::Error(_("Error while creating skeleton.")); ProductCreator::ResetCallbacks(); @@ -335,17 +342,15 @@ Progress::NextStage(); if (ProductCreator::Config["pkgtype"]:"" == "autoyast") { - ProductCreator::CopyMiscFiles(); + ProductCreator::CopyMiscFiles(boot_arch); } - else + else { if (ProductCreator::Config["bootconfig"]:"" != "") { y2debug("bootconfig available"); - - string fname = (ProductCreator::Config["code10"]:false) - ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, ProductCreator::GetArch()) - : sformat("%1/boot/loader/isolinux.cfg", ProductCreator::skel_root); + string fname = sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, boot_arch); + y2milestone("Writing bootconfig to %1", fname); SCR::Write(.target.string, fname, ProductCreator::Config["bootconfig"]:"" ); } @@ -401,10 +406,8 @@ { Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string arch = ProductCreator::GetArch(); - if (arch == "s390_64") arch = "s390x"; - string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? arch : "")); + string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote(boot_arch)); y2milestone("command: %1", command); SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]); @@ -581,10 +584,12 @@ symbol CheckBootableSrc() { - integer base_src = ProductCreator::checkProductDependency(); - if (!ProductCreator::isBootSource(base_src)) + map<string,any> boot_info = ProductCreator::GetBootInfo(); + boolean bootable = boot_info["bootable"]:false; + + if (!bootable) { - y2milestone("Base source %1 is not bootable, skipping isolinux.cfg configuration", base_src); + y2milestone("Base source %1 is not bootable, skipping isolinux.cfg configuration", boot_info["base_source"]:-1); return `skip_isolinux; } Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Fri Oct 31 14:07:48 2008 @@ -919,9 +919,11 @@ y2internal("Selected base product: %1", base); integer base_src_id = ProductCreator::UrlToId([base])[0]:-1; + map<string,any> boot_info = ProductCreator::GetBootInfoRepo(base_src_id); + boolean bootable = boot_info["bootable"]:false; // is the base source bootable? - if (!ProductCreator::isBootSource(base_src_id)) + if (!bootable) { y2warning("Selected base product is not bootable"); @@ -1029,9 +1031,6 @@ SCR::Execute(.target.mkdir, tmp + "/tmproot"); Pkg::TargetInit( tmp + "/tmproot" , true); - // add code10 flag if the new source type is detected - ProductCreator::CheckCode10Source(); - boolean success = ProductCreator::EnableSource(); // Pkg::SourceStartManager(true); @@ -1505,9 +1504,6 @@ // selections or patterns are used in the product ret_map["type"] = using_patterns ? `patterns : `selections; - // add code10 flag if the new source type is detected - ret_map["code10"] = ProductCreator::isCode10Source(); - ret_map["ui"] = ret; Wizard::CloseDialog(); @@ -1537,7 +1533,6 @@ ProductCreator::Config["addons"] = result["addons"]:[]; ProductCreator::Config["packages"] = result["packages"]:[]; ProductCreator::Config["taboo"] = result["taboo"]:[]; - ProductCreator::Config["code10"] = result["code10"]:true; ProductCreator::Config["type"] = result["type"]:`patterns; } while(result["ui"]:`next == `cancel && !ProductCreator::ReallyAbort()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52792 - /tags/stable-2_17_50/network/
by mzugec＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mzugec Date: Fri Oct 31 13:49:17 2008 New Revision: 52792 URL: http://svn.opensuse.org/viewcvs/yast?rev=52792&view=rev Log: Created tag stable-2_17_50 for network Added: tags/stable-2_17_50/network/ - copied from r52791, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52791 - /tags/stable-2_17_50/
by mzugec＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mzugec Date: Fri Oct 31 13:48:59 2008 New Revision: 52791 URL: http://svn.opensuse.org/viewcvs/yast?rev=52791&view=rev Log: Created tag stable-2_17_50 Added: tags/stable-2_17_50/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0