September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40967 - in /branches/tmp/sh/mod-ui/ncurses/src: ./ pkg/
by gs＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: gs Date: Wed Sep 19 14:10:16 2007 New Revision: 40967 URL: http://svn.opensuse.org/viewcvs/yast?rev=40967&view=rev Log: lot of debug added Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.h branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc branches/tmp/sh/mod-ui/ncurses/src/NCTree.h branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc Wed Sep 19 14:10:16 2007 @@ -660,6 +660,8 @@ if (!deflist.empty()) { wpos at( ScreenPos() + wpos( win->height(), -1 ) ); NCPopupList dialog( at, "", deflist, index ); + NCMIL << "Calling createEntries()" << endl; + dialog.createEntries( deflist, index ); int idx = dialog.post(); if ( idx != -1 ) setCurrentItem( idx ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCD… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Wed Sep 19 14:10:16 2007 @@ -67,6 +67,7 @@ , ncdopts ( DEFAULT ) , popedpos ( -1 ) { + NCMIL << "NCDialog(opt) derived from YDialog(opt)" << endl; _init( opt ); } @@ -88,6 +89,7 @@ , ncdopts ( boxed ? POPUP : POPUP|NOBOX ) , popedpos ( at ) { + NCMIL << "NCDialog(opt, at, boxed) derived from YDialog(opt)" << endl; _init( opt ); } @@ -226,14 +228,14 @@ int NCDialog::preferredHeight() { if ( hasDefaultSize() || !childrenCount() ) { - return wGetDefsze().H; - } + return wGetDefsze().H; + } wsze csze( firstChild()->preferredHeight(), - firstChild()->preferredWidth() ); - csze = wsze::min( wGetDefsze(), - wsze::max( csze, wsze( 1 ) ) ); + firstChild()->preferredWidth() ); + csze = wsze::min( wGetDefsze(), + wsze::max( csze, wsze( 1 ) ) ); - return csze.H; + return csze.H; } /////////////////////////////////////////////////////////////////// @@ -247,6 +249,7 @@ void NCDialog::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); + NCMIL << "setSize() called" << endl; YDialog::setSize( newwidth, newheight ); } @@ -262,6 +265,7 @@ { NCMIL << "initDialog()" << endl; if ( !pan ) { + NCMIL << "setInitialSize() called!" << endl; setInitialSize(); } } @@ -277,6 +281,7 @@ void NCDialog::showDialog() { NCMIL << "SHOW" << endl; + dumpWidgetTree(); IODBG << "sd+ " << this << endl; if ( pan && pan->hidden() ) { getVisible(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Wed Sep 19 14:10:16 2007 @@ -133,6 +133,8 @@ { NCPackageSelectorStart * ncSelector = 0; + NCMIL << "Calling runPkgSelection()" << endl; + if ( !dialog ) { UIERR << "ERROR package selection: No dialog existing." << endl; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc Wed Sep 19 14:10:16 2007 @@ -80,10 +80,7 @@ // widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast<YWidget *>(parent), // childrenOpt, 0, pkgLayout ); - // FIXME - remove YWidgetOpt() after parseWidgetTreeTerm is ported - YWidgetOpt * opt = new YWidgetOpt(); widgetRoot = YCPDialogParser::parseWidgetTreeTerm( this, - *opt, pkgLayout ); } @@ -188,7 +185,7 @@ if ( pkgList ) { // fill the list with packages (or patches) - pkgList->fillDefaultList( ); + //pkgList->fillDefaultList( ); pkgList->setKeyboardFocus(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc Wed Sep 19 14:10:16 2007 @@ -34,6 +34,7 @@ NCPopup::NCPopup( const wpos at, const bool boxed ) : NCDialog( wopt, at, boxed ) { + NCMIL << "Constructor NCPopup - creates NCDialog" << endl; } /////////////////////////////////////////////////////////////////// @@ -58,7 +59,9 @@ // void NCPopup::popupDialog() { + NCMIL << "popupDialog calls initDialog()" << endl; initDialog(); + NCMIL << "Call showDialog() " << endl; showDialog(); activate ( true ); while ( !(postevent = userInput()) ) Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h Wed Sep 19 14:10:16 2007 @@ -29,7 +29,7 @@ // // DESCRIPTION : // -class NCPopup : protected NCDialog { +class NCPopup : public NCDialog { NCPopup & operator=( const NCPopup & ); NCPopup ( const NCPopup & ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc Wed Sep 19 14:10:16 2007 @@ -35,6 +35,9 @@ int index ) : NCPopupTable( at ) { + NCMIL << "Constructor NCPopupList" << endl; + NCMIL << "CurrentDialog: " << dynamic_cast<NCDialog *>(currentDialog()) << endl; +#if 0 vector<string> row( 1 ); createList( row ); for ( list<string>::const_iterator entry = deflist.begin(); @@ -43,6 +46,7 @@ addItem( YCPNull(), row ); } setCurrentItem( index ); +#endif } /////////////////////////////////////////////////////////////////// @@ -55,6 +59,19 @@ // NCPopupList::~NCPopupList() { + +} + +void NCPopupList::createEntries( const list<string> & deflist, int index ) +{ + vector<string> row( 1 ); + createList( row ); + for ( list<string>::const_iterator entry = deflist.begin(); + entry != deflist.end(); ++entry ) { + row[0] = (*entry); + addItem( YCPNull(), row ); + } + setCurrentItem( index ); } /////////////////////////////////////////////////////////////////// @@ -69,3 +86,4 @@ { return NCPopupTable::postAgain(); } + Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.h Wed Sep 19 14:10:16 2007 @@ -50,6 +50,7 @@ int index = 0 ); virtual ~NCPopupList(); + void createEntries( const list<string> & deflist, int index ); }; /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Wed Sep 19 14:10:16 2007 @@ -18,6 +18,7 @@ /-*/ #include "Y2Log.h" #include "NCPopupTable.h" +#include "NCPushButton.h" #include "NCTable.h" #include "YMenuButton.h" @@ -34,6 +35,7 @@ NCPopupTable::NCPopupTable( const wpos at ) : NCPopup( at, false ) , sellist( 0 ) + , position( at ) { } @@ -67,8 +69,11 @@ NCMIL << "CurrentDialog: " << dynamic_cast<NCDialog *>(currentDialog()) << endl; NCMIL << "THIS dialog: " << dynamic_cast<NCDialog *>(this) << endl; - + + //NCPushButton * button = new NCPushButton( this, "Hello" ); + sellist= new NCTable( this, opt, row, false ); + sellist->setParent( this ); sellist->setBigList( true ); sellist->SetSepChar( ' ' ); sellist->SetSepWidht( 0 ); @@ -153,9 +158,11 @@ // bool NCPopupTable::postAgain() { - postevent.detail = (postevent == NCursesEvent::button) ? sellist->getCurrentItem() - : NCursesEvent::NODETAIL; - return false; + if ( sellist ) { + postevent.detail = (postevent == NCursesEvent::button) ? + sellist->getCurrentItem() : NCursesEvent::NODETAIL; + } + return false; } void NCPopupTable::stripHotkeys() @@ -182,3 +189,10 @@ else return sze.H; } + +#if 0 +void NCPopupTable::setSize( int newwidth, int newheight ) +{ + wRelocate( position, wsze( newheight, newwidth ) ); +} +#endif Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h Wed Sep 19 14:10:16 2007 @@ -44,7 +44,8 @@ private: NCTable * sellist; - + wpos position; + protected: void createList( vector<string> & row ); @@ -69,6 +70,8 @@ int preferredWidth(); int preferredHeight(); + //void setSize( int newwidth, int newheight ); + }; /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc Wed Sep 19 14:10:16 2007 @@ -159,34 +159,21 @@ void NCSelectionBox::selectItem( int index ) { NCDBG << "Select item (index) called" << endl; + YSelectionBox::deselectAllItems(); + YItem * item = YSelectionBox::itemAt( index ); if ( item ) { -#ifdef VERBOSE_SELECTION - y2debug( "%s \"%s\": Selecting item \"%s\"", - widgetClass(), - debugLabel().c_str(), - item->label().c_str() ); -#endif - + NCMIL << "selectItem: " << item->label().c_str() << endl; item->setSelected( true ); } else YUI_THROW( YUIException( "Can't find selected item" ) ); } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCSelectionBox::itemAdded -// METHOD TYPE : void -// -// DESCRIPTION : -// -// still used in NCPkgPopupDeps -// +#if 0 void NCSelectionBox::itemAdded( const YCPString& str, int index, bool selected ) { vector<NCTableCol*> Items( 1U, 0 ); @@ -196,6 +183,7 @@ if ( selected ) myPad()->ScrlLine( myPad()->Lines() ); } +#endif /////////////////////////////////////////////////////////////////// // @@ -220,6 +208,11 @@ } } +void NCSelectionBox::addItem( const string & description, bool selected ) +{ + YSelectionWidget::addItem( description, selected ); +} + /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h Wed Sep 19 14:10:16 2007 @@ -65,9 +65,8 @@ bool bigList() const { return biglist; } void setBigList( const bool big ) { biglist = big; } - virtual void itemAdded( const YCPString& string, int index, bool selected ); - virtual void addItem( YItem *item ); + virtual void addItem( const string & itemLabel, bool selected = false ); virtual int preferredWidth(); virtual int preferredHeight(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc Wed Sep 19 14:10:16 2007 @@ -335,19 +335,50 @@ { if ( !myPad() ) return; - - if ( selected ) + + YTreeItem * treeItem = dynamic_cast<YTreeItem *> (item); + YUI_CHECK_PTR( treeItem ); + + // FIXME - index NOT set (is -1) ???????????? + NCMIL << "Index: " << treeItem->index() << endl; + + if ( !selected ) + { + YTree::deselectAllItems(); + } + else { for ( unsigned i = 0; i < myPad()->Lines(); ++i ) { const NCTreeLine * cline = getTreeLine( i ); - if ( &cline->Yitem() == (YTreeItem *)item ) { - NCMIL << "got " << item->label() << " at " << i << endl; + if ( &cline->Yitem() == treeItem ) { + NCMIL << "got " << treeItem->label() << " at " << i << endl; myPad()->ShowItem( cline ); break; } } - YTree::selectItem( item, selected ); + YTree::selectItem( treeItem, selected ); + } +} + +void NCTree::selectItem( int index ) +{ + NCDBG << "Select item (index) called" << endl; + YTree::deselectAllItems(); + YItem * item = YTree::itemAt( index ); + + if ( item ) + { +#ifdef VERBOSE_SELECTION + y2debug( "%s \"%s\": Selecting item \"%s\"", + widgetClass(), + debugLabel().c_str(), + item->label().c_str() ); +#endif + + item->setSelected( true ); } + else + YUI_THROW( YUIException( "Can't find selected item" ) ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTree.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTree.h Wed Sep 19 14:10:16 2007 @@ -85,6 +85,7 @@ virtual void setCurrentItem( YTreeItem * it ); virtual void selectItem( YItem *item, bool selected ); + virtual void selectItem( int index ); virtual NCursesEvent wHandleInput( wint_t key ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidget.cc Wed Sep 19 14:10:16 2007 @@ -235,7 +235,7 @@ } catch ( NCursesError & err ) { NCINT << DLOC << child << " -> " << newpos << " in " << this << endl; - NCINT << err << endl; + NCERR << err << endl; ::endwin(); abort(); } @@ -265,7 +265,7 @@ } catch ( NCursesError & err ) { NCINT << *this << endl; - NCINT << err << endl; + NCERR << err << endl; ::endwin(); abort(); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidget.h Wed Sep 19 14:10:16 2007 @@ -129,8 +129,8 @@ public: - NCWidget( NCWidget * myparent = 0 ); - NCWidget( YWidget * parent ); + NCWidget( NCWidget * myparent ); + NCWidget( YWidget * parent = 0 ); virtual ~NCWidget(); bool isValid() const { return magic == YWIDGET_MAGIC; } Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Wed Sep 19 14:10:16 2007 @@ -75,7 +75,7 @@ NCurses::init(); } catch ( NCursesError & err ) { - UIINT << err << endl; + UIMIL << err << endl; ::endwin(); abort(); } @@ -321,7 +321,10 @@ NCDialog * dlg = dynamic_cast<NCDialog *>( dialog ); UIDBG << dlg << endl; if ( dlg ) + { dlg->showDialog(); + dlg->dumpWidgetTree(); + } } void YNCursesUI::closeDialog( YDialog * dialog ) { @@ -500,6 +503,7 @@ vector<string> header ) { ONCREATE; + NCMIL << "CreateTable" << endl; return new NCTable( parent, opt, header, true ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Wed Sep 19 14:10:16 2007 @@ -200,7 +200,7 @@ testMode = true; saveState (); - +#if 0 if ( !youMode ) { // create the selections popup @@ -237,7 +237,7 @@ // the disk space popup diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); - +#endif } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc Wed Sep 19 14:10:16 2007 @@ -48,7 +48,7 @@ protected: virtual NCursesEvent wHandleInput( wint_t ch ); - + public: NCProblemSelectionBox (YWidget * parent, const string & label, NCPkgPopupDeps * aDepsPopup) @@ -282,7 +282,8 @@ // no solution yet problems.push_back (make_pair (*i, zypp::ProblemSolution_Ptr ())); - problemw->itemAdded ((*i)->description (), idx, false /*selected*/); + //problemw->itemAdded ((*i)->description (), idx, false /*selected*/); + problemw->addItem( (*i)->description(), false ); // selected: false } return 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] r40966 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/Tree4.ycp
by gs＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: gs Date: Wed Sep 19 13:36:05 2007 New Revision: 40966 URL: http://svn.opensuse.org/viewcvs/yast?rev=40966&view=rev Log: copied from Tree1.ycp - but use string IDs and set option `notify Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/Tree4.ycp Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/Tree4.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/Tree4.ycp (added) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/Tree4.ycp Wed Sep 19 13:36:05 2007 @@ -0,0 +1,100 @@ +// Simple tree example +{ + UI::OpenDialog( + `VBox( + `Tree(`id(`dest_dir), `opt(`notify), + "Select destination directory:", + [ + `item(`id("root"), "/" , true, + [ + `item(`id("etc"), "etc", + [ + `item("opt"), + `item("SuSEconfig"), + `item("X11") + ] + ), + `item("usr", false, + [ + "bin", + "lib", + `item("share", + [ + "man", + "info", + "emacs" + ] + ), + `item(`id("usr_local"),"local"), + `item("X11R6", + [ + "bin", + "lib", + "share", + "man", + "etc" + ] + ) + ] + ), + `item(`id("opt"), "opt", true, + [ + "kde", + "netscape", + "Office51" + ] + ), + `item("home"), + "work", + `item(`id(`other), "<other>") + ] + ) + ] ), + `HBox( + `PushButton(`id(`sel_opt), `opt(`hstretch), "/&opt" ), + `PushButton(`id(`sel_usr), `opt(`hstretch), "/&usr" ), + `PushButton(`id(`sel_usr_local), `opt(`hstretch), "/usr/&local" ) + ), + `PushButton(`id(`ok), `opt(`default), "&OK") + ) + ); + + any id = nil; + + repeat + { + id = UI::UserInput(); + + if ( id == `sel_usr) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr" ); + else if ( id == `sel_usr_local) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr_local" ); + else if ( id == `sel_opt) UI::ChangeWidget(`dest_dir, `CurrentItem, "opt" ); + } until ( id == `ok ); + + // Get the input from the tree. + // + // Notice: The return value of UI::UserInput() does NOT return this value! + // Rather, it returns the ID of the widget (normally the PushButton) + // that caused UI::UserInput() to return. + string dest_dir = (string) UI::QueryWidget(`dest_dir, `CurrentItem); + y2milestone( "Selected: %1", dest_dir ); + + + if ( dest_dir == nil ) + dest_dir = ""; + + // Close the dialog. + // Remember to read values from the dialog's widgets BEFORE closing it! + UI::CloseDialog(); + + + // Pop up a new dialog to echo the selection. + UI::OpenDialog( + `VBox( + `Label("Selected destination directory: " + dest_dir), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + + UI::CloseDialog(); +} -- 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] r40965 - in /trunk: add-on-creator/ add-on/ autofs/ autoinstallation/ backup/ bluetooth/ boot-server/ bootloader/ ca-management/ cd-creator/ certify/ cim/ control-center-gnome/ control-center/ core...
by ckornacker＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: ckornacker Date: Wed Sep 19 13:07:47 2007 New Revision: 40965 URL: http://svn.opensuse.org/viewcvs/yast?rev=40965&view=rev Log: added PREFIX to Makefile.cvs Modified: trunk/add-on-creator/Makefile.cvs trunk/add-on/Makefile.cvs trunk/autofs/Makefile.cvs trunk/autoinstallation/Makefile.cvs trunk/backup/Makefile.cvs trunk/bluetooth/Makefile.cvs trunk/boot-server/Makefile.cvs trunk/bootloader/Makefile.cvs trunk/ca-management/Makefile.cvs trunk/cd-creator/Makefile.cvs trunk/certify/Makefile.cvs trunk/cim/Makefile.cvs trunk/control-center-gnome/Makefile.cvs trunk/control-center/Makefile.cvs trunk/core/Makefile.cvs trunk/country/Makefile.cvs trunk/debugger/Makefile.cvs trunk/devtools/devtools/skeletons/agent/Makefile.cvs trunk/devtools/devtools/skeletons/config/Makefile.cvs trunk/devtools/devtools/skeletons/trans/Makefile.cvs trunk/dhcp-server/Makefile.cvs trunk/dns-server/Makefile.cvs trunk/fingerprint-reader/Makefile.cvs trunk/firewall/Makefile.cvs trunk/firstboot/Makefile.cvs trunk/ftp-server/Makefile.cvs trunk/gtk/Makefile.cvs trunk/hardware-detection/Makefile.cvs trunk/heartbeat/Makefile.cvs trunk/http-server/Makefile.cvs trunk/inetd/Makefile.cvs trunk/installation/Makefile.cvs trunk/instserver/Makefile.cvs trunk/ipsec/Makefile.cvs trunk/irda/Makefile.cvs trunk/iscsi-client/Makefile.cvs trunk/iscsi-server/Makefile.cvs trunk/kdump/Makefile.cvs trunk/kerberos-client/Makefile.cvs trunk/kerberos-server/Makefile.cvs trunk/ldap-client/Makefile.cvs trunk/ldap-server/Makefile.cvs trunk/ldap/Makefile.cvs trunk/live-installer/Makefile.cvs trunk/mail/Makefile.cvs trunk/metapackage/Makefile.cvs trunk/mouse/Makefile.cvs trunk/ncurses/Makefile.cvs trunk/network/Makefile.cvs trunk/nfs-client/Makefile.cvs trunk/nfs-server/Makefile.cvs trunk/nis-client/Makefile.cvs trunk/nis-server/Makefile.cvs trunk/ntp-client/Makefile.cvs trunk/online-update/Makefile.cvs trunk/packagemanager-test/Makefile.cvs trunk/packager/Makefile.cvs trunk/pam/Makefile.cvs trunk/perl-bindings/Makefile.cvs trunk/phone-services/Makefile.cvs trunk/printer/Makefile.cvs trunk/product-creator/Makefile.cvs trunk/profile-manager/Makefile.cvs trunk/python-bindings/Makefile.cvs trunk/qt/Makefile.cvs trunk/registration/Makefile.cvs trunk/repair/Makefile.cvs trunk/restore/Makefile.cvs trunk/runlevel/Makefile.cvs trunk/s390/Makefile.cvs trunk/samba-client/Makefile.cvs trunk/samba-server/Makefile.cvs trunk/scanner/Makefile.cvs trunk/schema/Makefile.cvs trunk/security/Makefile.cvs trunk/slide-show/Makefile.cvs trunk/slp-server/Makefile.cvs trunk/slp/Makefile.cvs trunk/sound/Makefile.cvs trunk/squid/Makefile.cvs trunk/squidguard/Makefile.cvs trunk/sshd/Makefile.cvs trunk/storage/Makefile.cvs trunk/sudo/Makefile.cvs trunk/support/Makefile.cvs trunk/sysconfig/Makefile.cvs trunk/testsuite/Makefile.cvs trunk/tftp-server/Makefile.cvs trunk/theme/Makefile.cvs trunk/transfer/Makefile.cvs trunk/tune/Makefile.cvs trunk/tv/Makefile.cvs trunk/update/Makefile.cvs trunk/users/Makefile.cvs trunk/vm/Makefile.cvs trunk/x11/Makefile.cvs trunk/xml/Makefile.cvs trunk/y2pmsh/Makefile.cvs trunk/yast2/Makefile.cvs trunk/you-server/Makefile.cvs Modified: trunk/add-on-creator/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/Makefile.cvs?rev=… ============================================================================== --- trunk/add-on-creator/Makefile.cvs (original) +++ trunk/add-on-creator/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/add-on/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/add-on/Makefile.cvs (original) +++ trunk/add-on/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/autofs/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/autofs/Makefile.cvs (original) +++ trunk/autofs/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/autoinstallation/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/Makefile.cvs?re… ============================================================================== --- trunk/autoinstallation/Makefile.cvs (original) +++ trunk/autoinstallation/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/backup/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/backup/Makefile.cvs (original) +++ trunk/backup/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/bluetooth/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/Makefile.cvs?rev=40965… ============================================================================== --- trunk/bluetooth/Makefile.cvs (original) +++ trunk/bluetooth/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/boot-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/boot-server/Makefile.cvs?rev=409… ============================================================================== --- trunk/boot-server/Makefile.cvs (original) +++ trunk/boot-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/bootloader/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/Makefile.cvs?rev=4096… ============================================================================== --- trunk/bootloader/Makefile.cvs (original) +++ trunk/bootloader/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ca-management/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/Makefile.cvs?rev=4… ============================================================================== --- trunk/ca-management/Makefile.cvs (original) +++ trunk/ca-management/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/cd-creator/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/cd-creator/Makefile.cvs?rev=4096… ============================================================================== --- trunk/cd-creator/Makefile.cvs (original) +++ trunk/cd-creator/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/certify/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/certify/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/certify/Makefile.cvs (original) +++ trunk/certify/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/cim/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/cim/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/cim/Makefile.cvs (original) +++ trunk/cim/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/control-center-gnome/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/Makefile.cv… ============================================================================== --- trunk/control-center-gnome/Makefile.cvs (original) +++ trunk/control-center-gnome/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/control-center/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/Makefile.cvs?rev=… ============================================================================== --- trunk/control-center/Makefile.cvs (original) +++ trunk/control-center/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) all: y2tool y2autoconf Modified: trunk/core/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/core/Makefile.cvs (original) +++ trunk/core/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/country/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/country/Makefile.cvs (original) +++ trunk/country/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/debugger/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/debugger/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/debugger/Makefile.cvs (original) +++ trunk/debugger/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) all: y2tool y2autoconf Modified: trunk/devtools/devtools/skeletons/agent/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/agen… ============================================================================== --- trunk/devtools/devtools/skeletons/agent/Makefile.cvs (original) +++ trunk/devtools/devtools/skeletons/agent/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs for libycp # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/devtools/devtools/skeletons/config/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/Makefile.cvs (original) +++ trunk/devtools/devtools/skeletons/config/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/devtools/devtools/skeletons/trans/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/tran… ============================================================================== --- trunk/devtools/devtools/skeletons/trans/Makefile.cvs (original) +++ trunk/devtools/devtools/skeletons/trans/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs for y2t_XXpkgXX # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/dhcp-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/Makefile.cvs?rev=409… ============================================================================== --- trunk/dhcp-server/Makefile.cvs (original) +++ trunk/dhcp-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/dns-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/dns-server/Makefile.cvs (original) +++ trunk/dns-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/fingerprint-reader/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/Makefile.cvs?… ============================================================================== --- trunk/fingerprint-reader/Makefile.cvs (original) +++ trunk/fingerprint-reader/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/firewall/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/firewall/Makefile.cvs (original) +++ trunk/firewall/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/firstboot/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/Makefile.cvs?rev=40965… ============================================================================== --- trunk/firstboot/Makefile.cvs (original) +++ trunk/firstboot/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ftp-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/ftp-server/Makefile.cvs (original) +++ trunk/ftp-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/gtk/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/gtk/Makefile.cvs (original) +++ trunk/gtk/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -3,7 +3,8 @@ # LIB = $(shell y2tool get-lib) -PREFIX ?= /usr + +PREFIX = /usr configure: all ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) Modified: trunk/hardware-detection/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/hardware-detection/Makefile.cvs?… ============================================================================== --- trunk/hardware-detection/Makefile.cvs (original) +++ trunk/hardware-detection/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/heartbeat/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/Makefile.cvs?rev=40965… ============================================================================== --- trunk/heartbeat/Makefile.cvs (original) +++ trunk/heartbeat/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/http-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/Makefile.cvs?rev=409… ============================================================================== --- trunk/http-server/Makefile.cvs (original) +++ trunk/http-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/inetd/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/inetd/Makefile.cvs (original) +++ trunk/inetd/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/installation/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/Makefile.cvs?rev=40… ============================================================================== --- trunk/installation/Makefile.cvs (original) +++ trunk/installation/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/instserver/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/Makefile.cvs?rev=4096… ============================================================================== --- trunk/instserver/Makefile.cvs (original) +++ trunk/instserver/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ipsec/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ipsec/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/ipsec/Makefile.cvs (original) +++ trunk/ipsec/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/irda/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/irda/Makefile.cvs (original) +++ trunk/irda/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/iscsi-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/Makefile.cvs?rev=40… ============================================================================== --- trunk/iscsi-client/Makefile.cvs (original) +++ trunk/iscsi-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/iscsi-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/Makefile.cvs?rev=40… ============================================================================== --- trunk/iscsi-server/Makefile.cvs (original) +++ trunk/iscsi-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/kdump/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/kdump/Makefile.cvs (original) +++ trunk/kdump/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/kerberos-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/Makefile.cvs?rev… ============================================================================== --- trunk/kerberos-client/Makefile.cvs (original) +++ trunk/kerberos-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/kerberos-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/Makefile.cvs?rev… ============================================================================== --- trunk/kerberos-server/Makefile.cvs (original) +++ trunk/kerberos-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ldap-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/Makefile.cvs?rev=409… ============================================================================== --- trunk/ldap-client/Makefile.cvs (original) +++ trunk/ldap-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ldap-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/Makefile.cvs?rev=409… ============================================================================== --- trunk/ldap-server/Makefile.cvs (original) +++ trunk/ldap-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ldap/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/ldap/Makefile.cvs (original) +++ trunk/ldap/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/live-installer/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/Makefile.cvs?rev=… ============================================================================== --- trunk/live-installer/Makefile.cvs (original) +++ trunk/live-installer/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/mail/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/mail/Makefile.cvs (original) +++ trunk/mail/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/metapackage/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/Makefile.cvs?rev=409… ============================================================================== --- trunk/metapackage/Makefile.cvs (original) +++ trunk/metapackage/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/mouse/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/mouse/Makefile.cvs (original) +++ trunk/mouse/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ncurses/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/ncurses/Makefile.cvs (original) +++ trunk/ncurses/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/network/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/network/Makefile.cvs (original) +++ trunk/network/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/nfs-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/Makefile.cvs?rev=4096… ============================================================================== --- trunk/nfs-client/Makefile.cvs (original) +++ trunk/nfs-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/nfs-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/nfs-server/Makefile.cvs (original) +++ trunk/nfs-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/nis-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/Makefile.cvs?rev=4096… ============================================================================== --- trunk/nis-client/Makefile.cvs (original) +++ trunk/nis-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/nis-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/nis-server/Makefile.cvs (original) +++ trunk/nis-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/ntp-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/Makefile.cvs?rev=4096… ============================================================================== --- trunk/ntp-client/Makefile.cvs (original) +++ trunk/ntp-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/online-update/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/Makefile.cvs?rev=4… ============================================================================== --- trunk/online-update/Makefile.cvs (original) +++ trunk/online-update/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/packagemanager-test/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/packagemanager-test/Makefile.cvs… ============================================================================== --- trunk/packagemanager-test/Makefile.cvs (original) +++ trunk/packagemanager-test/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/packager/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/packager/Makefile.cvs (original) +++ trunk/packager/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/pam/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/pam/Makefile.cvs (original) +++ trunk/pam/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/perl-bindings/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/Makefile.cvs?rev=4… ============================================================================== --- trunk/perl-bindings/Makefile.cvs (original) +++ trunk/perl-bindings/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/phone-services/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/Makefile.cvs?rev=… ============================================================================== --- trunk/phone-services/Makefile.cvs (original) +++ trunk/phone-services/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/printer/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/printer/Makefile.cvs (original) +++ trunk/printer/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/product-creator/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/Makefile.cvs?rev… ============================================================================== --- trunk/product-creator/Makefile.cvs (original) +++ trunk/product-creator/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/profile-manager/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/Makefile.cvs?rev… ============================================================================== --- trunk/profile-manager/Makefile.cvs (original) +++ trunk/profile-manager/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/python-bindings/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/Makefile.cvs?rev… ============================================================================== --- trunk/python-bindings/Makefile.cvs (original) +++ trunk/python-bindings/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/qt/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/Makefile.cvs?rev=40965&r1=409… ============================================================================== --- trunk/qt/Makefile.cvs (original) +++ trunk/qt/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/$(LIB) all: y2tool y2autoconf Modified: trunk/registration/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/Makefile.cvs?rev=40… ============================================================================== --- trunk/registration/Makefile.cvs (original) +++ trunk/registration/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/repair/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/repair/Makefile.cvs (original) +++ trunk/repair/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/restore/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/restore/Makefile.cvs (original) +++ trunk/restore/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/runlevel/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/runlevel/Makefile.cvs (original) +++ trunk/runlevel/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/s390/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/s390/Makefile.cvs (original) +++ trunk/s390/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/samba-client/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/Makefile.cvs?rev=40… ============================================================================== --- trunk/samba-client/Makefile.cvs (original) +++ trunk/samba-client/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/samba-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/Makefile.cvs?rev=40… ============================================================================== --- trunk/samba-server/Makefile.cvs (original) +++ trunk/samba-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/scanner/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/scanner/Makefile.cvs (original) +++ trunk/scanner/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/schema/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/schema/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/schema/Makefile.cvs (original) +++ trunk/schema/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/security/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/security/Makefile.cvs (original) +++ trunk/security/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/slide-show/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/Makefile.cvs?rev=4096… ============================================================================== --- trunk/slide-show/Makefile.cvs (original) +++ trunk/slide-show/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/slp-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/slp-server/Makefile.cvs (original) +++ trunk/slp-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/slp/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/slp/Makefile.cvs (original) +++ trunk/slp/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs for libycp # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/sound/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/sound/Makefile.cvs (original) +++ trunk/sound/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/squid/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/squid/Makefile.cvs (original) +++ trunk/squid/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/squidguard/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/Makefile.cvs?rev=4096… ============================================================================== --- trunk/squidguard/Makefile.cvs (original) +++ trunk/squidguard/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/sshd/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/sshd/Makefile.cvs (original) +++ trunk/sshd/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/storage/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/storage/Makefile.cvs (original) +++ trunk/storage/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/sudo/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/sudo/Makefile.cvs (original) +++ trunk/sudo/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/support/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/Makefile.cvs?rev=40965&r… ============================================================================== --- trunk/support/Makefile.cvs (original) +++ trunk/support/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/sysconfig/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/Makefile.cvs?rev=40965… ============================================================================== --- trunk/sysconfig/Makefile.cvs (original) +++ trunk/sysconfig/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/testsuite/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/Makefile.cvs?rev=40965… ============================================================================== --- trunk/testsuite/Makefile.cvs (original) +++ trunk/testsuite/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/tftp-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/Makefile.cvs?rev=409… ============================================================================== --- trunk/tftp-server/Makefile.cvs (original) +++ trunk/tftp-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/theme/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/theme/Makefile.cvs (original) +++ trunk/theme/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/transfer/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/Makefile.cvs?rev=40965&… ============================================================================== --- trunk/transfer/Makefile.cvs (original) +++ trunk/transfer/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/tune/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/Makefile.cvs?rev=40965&r1=4… ============================================================================== --- trunk/tune/Makefile.cvs (original) +++ trunk/tune/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/tv/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/Makefile.cvs?rev=40965&r1=409… ============================================================================== --- trunk/tv/Makefile.cvs (original) +++ trunk/tv/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/update/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/update/Makefile.cvs (original) +++ trunk/update/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/users/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/users/Makefile.cvs (original) +++ trunk/users/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/vm/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/Makefile.cvs?rev=40965&r1=409… ============================================================================== --- trunk/vm/Makefile.cvs (original) +++ trunk/vm/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -1,8 +1,12 @@ # # Makefile.cvs # +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + configure: all - ./configure + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/x11/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/x11/Makefile.cvs (original) +++ trunk/x11/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/xml/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/xml/Makefile.cvs?rev=40965&r1=40… ============================================================================== --- trunk/xml/Makefile.cvs (original) +++ trunk/xml/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/y2pmsh/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/y2pmsh/Makefile.cvs?rev=40965&r1… ============================================================================== --- trunk/y2pmsh/Makefile.cvs (original) +++ trunk/y2pmsh/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) --prefix=/usr --sysconfdir=/etc + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --prefix=/usr --sysconfdir=/etc all: rm -rf libtecla Modified: trunk/yast2/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/Makefile.cvs?rev=40965&r1=… ============================================================================== --- trunk/yast2/Makefile.cvs (original) +++ trunk/yast2/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf Modified: trunk/you-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/you-server/Makefile.cvs?rev=4096… ============================================================================== --- trunk/you-server/Makefile.cvs (original) +++ trunk/you-server/Makefile.cvs Wed Sep 19 13:07:47 2007 @@ -4,8 +4,10 @@ LIB = $(shell y2tool get-lib) +PREFIX = /usr + configure: all - ./configure --libdir=/usr/$(LIB) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: y2tool y2autoconf -- 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] r40964 - /trunk/core/libyui/doc/examples/Tree4.ycp
by gs＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: gs Date: Wed Sep 19 12:52:55 2007 New Revision: 40964 URL: http://svn.opensuse.org/viewcvs/yast?rev=40964&view=rev Log: copied from Tree1,ycp - but use string IDs and test notfy option Added: trunk/core/libyui/doc/examples/Tree4.ycp Added: trunk/core/libyui/doc/examples/Tree4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/doc/examples/Tree4.y… ============================================================================== --- trunk/core/libyui/doc/examples/Tree4.ycp (added) +++ trunk/core/libyui/doc/examples/Tree4.ycp Wed Sep 19 12:52:55 2007 @@ -0,0 +1,100 @@ +// Simple tree example +{ + UI::OpenDialog( + `VBox( + `Tree(`id(`dest_dir), `opt(`notify), + "Select destination directory:", + [ + `item(`id("root"), "/" , true, + [ + `item(`id("etc"), "etc", + [ + `item("opt"), + `item("SuSEconfig"), + `item("X11") + ] + ), + `item("usr", false, + [ + "bin", + "lib", + `item("share", + [ + "man", + "info", + "emacs" + ] + ), + `item(`id("usr_local"),"local"), + `item("X11R6", + [ + "bin", + "lib", + "share", + "man", + "etc" + ] + ) + ] + ), + `item(`id("opt"), "opt", true, + [ + "kde", + "netscape", + "Office51" + ] + ), + `item("home"), + "work", + `item(`id(`other), "<other>") + ] + ) + ] ), + `HBox( + `PushButton(`id(`sel_opt), `opt(`hstretch), "/&opt" ), + `PushButton(`id(`sel_usr), `opt(`hstretch), "/&usr" ), + `PushButton(`id(`sel_usr_local), `opt(`hstretch), "/usr/&local" ) + ), + `PushButton(`id(`ok), `opt(`default), "&OK") + ) + ); + + any id = nil; + + repeat + { + id = UI::UserInput(); + + if ( id == `sel_usr) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr" ); + else if ( id == `sel_usr_local) UI::ChangeWidget(`dest_dir, `CurrentItem, "usr_local" ); + else if ( id == `sel_opt) UI::ChangeWidget(`dest_dir, `CurrentItem, "opt" ); + } until ( id == `ok ); + + // Get the input from the tree. + // + // Notice: The return value of UI::UserInput() does NOT return this value! + // Rather, it returns the ID of the widget (normally the PushButton) + // that caused UI::UserInput() to return. + string dest_dir = (string) UI::QueryWidget(`dest_dir, `CurrentItem); + y2milestone( "Selected: %1", dest_dir ); + + + if ( dest_dir == nil ) + dest_dir = ""; + + // Close the dialog. + // Remember to read values from the dialog's widgets BEFORE closing it! + UI::CloseDialog(); + + + // Pop up a new dialog to echo the selection. + UI::OpenDialog( + `VBox( + `Label("Selected destination directory: " + dest_dir), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + + UI::CloseDialog(); +} -- 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] r40963 - /tags/stable-2_15_23/online-update/
by jsuchome＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: jsuchome Date: Wed Sep 19 09:21:07 2007 New Revision: 40963 URL: http://svn.opensuse.org/viewcvs/yast?rev=40963&view=rev Log: Created tag stable-2_15_23 for online-update Added: tags/stable-2_15_23/online-update/ - copied from r40962, trunk/online-update/ -- 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] r40962 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateCallbacks.ycp
by jsuchome＠svn.opensuse.org 19 Sep '07

19 Sep '07

Author: jsuchome Date: Wed Sep 19 09:21:03 2007 New Revision: 40962 URL: http://svn.opensuse.org/viewcvs/yast?rev=40962&view=rev Log: - removed popup used for debugging (#326247) - 2.15.23 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=40962&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Sep 19 09:21:03 2007 @@ -1 +1 @@ -2.15.22 +2.15.23 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Sep 19 09:21:03 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 19 09:16:05 CEST 2007 - jsuchome(a)suse.cz + +- removed popup used for debugging (#326247) +- 2.15.23 + +------------------------------------------------------------------- Mon Sep 17 10:39:22 CEST 2007 - jsuchome(a)suse.cz - register download callbacks (#309127) Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCa… ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Wed Sep 19 09:21:03 2007 @@ -35,7 +35,6 @@ // last_callback = "PatchProgressCallback"; y2debug("PatchProgressCallback %1", num); -Popup::Message (sformat ("PatchProgressCallback %1", num)); if ( UI::WidgetExists( `id( `you_patch_progress ) ) ) { UI::ChangeWidget( `id( `you_patch_progress ), `Value, num ); } -- 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] r40961 - /tags/stable-2_15_50/installation/
by locilka＠svn.opensuse.org 18 Sep '07

18 Sep '07

Author: locilka Date: Tue Sep 18 19:52:59 2007 New Revision: 40961 URL: http://svn.opensuse.org/viewcvs/yast?rev=40961&view=rev Log: Created tag stable-2_15_50 for installation Added: tags/stable-2_15_50/installation/ - copied from r40960, 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] r40960 - in /trunk/installation: VERSION package/yast2-installation.changes src/modules/SystemFilesCopy.ycp
by locilka＠svn.opensuse.org 18 Sep '07

18 Sep '07

Author: locilka Date: Tue Sep 18 19:52:38 2007 New Revision: 40960 URL: http://svn.opensuse.org/viewcvs/yast?rev=40960&view=rev Log: - Fixed tar syntax: --ignore-failed-read param. position (#326055). - 2.15.50 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/SystemFilesCopy.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=40960&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Sep 18 19:52:38 2007 @@ -1 +1 @@ -2.15.49 +2.15.50 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 Tue Sep 18 19:52:38 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 18 19:50:52 CEST 2007 - locilka(a)suse.cz + +- Fixed tar syntax: --ignore-failed-read param. position (#326055). +- 2.15.50 + +------------------------------------------------------------------- Thu Sep 13 16:18:30 CEST 2007 - locilka(a)suse.cz - Fixed inst_upgrade_urls to re-register sources with their Modified: trunk/installation/src/modules/SystemFilesCopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/SystemF… ============================================================================== --- trunk/installation/src/modules/SystemFilesCopy.ycp (original) +++ trunk/installation/src/modules/SystemFilesCopy.ycp Tue Sep 18 19:52:38 2007 @@ -156,7 +156,9 @@ // archive files were already quoted string command = sformat ( // 'ignore failed read' is for optional files - "cd '%1'; tar -zcvf --ignore-failed-read '%2' %3", + // but needs to be entered after the archive name + // bugzilla #326055 + "cd '%1'; tar -zcvf '%2' --ignore-failed-read %3", tmp_mount_directory, String::Quote(archive_name), archive_files ); map cmd_run = (map) SCR::Execute(.target.bash_output, command); -- 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] r40959 - in /trunk/storage: libstorage/src/LoopCo.h libstorage/src/Volume.cc libstorage/src/Volume.h package/yast2-storage.changes
by fehr＠svn.opensuse.org 18 Sep '07

18 Sep '07

Author: fehr Date: Tue Sep 18 18:27:21 2007 New Revision: 40959 URL: http://svn.opensuse.org/viewcvs/yast?rev=40959&view=rev Log: fix wrong cryptotab line for old style encryption (#325597) Modified: trunk/storage/libstorage/src/LoopCo.h trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/LoopCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.h?… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.h (original) +++ trunk/storage/libstorage/src/LoopCo.h Tue Sep 18 18:27:21 2007 @@ -90,7 +90,6 @@ bool findLoopDev( const string& dev, LoopIter& i ); void addLoop( Loop* m ); void updateEntry( const Loop* m ); - static int getFreeLoop( string& dev ); void init(); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue Sep 18 18:27:21 2007 @@ -2268,7 +2268,7 @@ if( cont->type()!=LOOP ) { if( dmcrypt() ) - ret = optNoauto()?dev:dmcrypt_dev; + ret = (inCryptotab()||optNoauto())?dev:dmcrypt_dev; else ret = getMountByString( mount_by, dev, uuid, label ); } @@ -2414,8 +2414,11 @@ { changed = true; che.encr = encryption; - if( !dmcrypt() ) + if( inCryptotab() ) + { + getFreeLoop(); che.loop_dev = fstab_loop_dev; + } che.dentry = de; if( encryption!=ENC_NONE ) che.freq = che.passno = 0; @@ -2448,8 +2451,11 @@ che.encr = encryption; if( dmcrypt() && isTmpCryptMp(mp) && crypt_pwd.empty() ) che.tmpcrypt = true; - if( !dmcrypt() ) + if( inCryptotab() ) + { + getFreeLoop(); che.loop_dev = fstab_loop_dev; + } che.fs = fs_names[fs]; getFstabOpts( che.opts ); che.mount = mp; Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?… ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Tue Sep 18 18:27:21 2007 @@ -157,7 +157,7 @@ string sizeString() const; string bootMount() const; bool optNoauto() const; - bool inCryptotab() const { return( encryption!=ENC_LUKS && is_loop && !optNoauto() ); } + bool inCryptotab() const { return( encryption!=ENC_LUKS && !optNoauto() ); } bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); } virtual void print( std::ostream& s ) const { s << *this; } int getFreeLoop(); 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 Tue Sep 18 18:27:21 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Sep 18 18:22:57 CEST 2007 - fehr(a)suse.de + +- fix wrong cryptotab line for old style encryption (#325597) + +------------------------------------------------------------------- Mon Sep 17 14:26:39 CEST 2007 - fehr(a)suse.de - version 2.15.24 -- 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] r40958 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 18 Sep '07

18 Sep '07

Author: kmachalkova Date: Tue Sep 18 18:02:36 2007 New Revision: 40958 URL: http://svn.opensuse.org/viewcvs/yast?rev=40958&view=rev Log: indent ++ Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Tue Sep 18 18:02:36 2007 @@ -38,10 +38,16 @@ * @return true on success */ define boolean ReadInstallInfItem(path install_inf, string item, string var) { - if(item == nil || item == "" || var == nil || var == "") return false; + if(item == nil || item == "" || var == nil || var == "") + return false; + string val = (string) SCR::Read(add(install_inf, var)); - if(val == nil) return false; - if(val != "") InstallInf[item] = val; + if(val == nil) + return false; + + if(val != "") + InstallInf[item] = val; + return true; } @@ -137,20 +143,21 @@ } else { - // FIXME: alias = eth0 tulip - // FIXME: options = ne io=0x200 + // FIXME: alias = eth0 tulip + // FIXME: options = ne io=0x200 - // #42203: correctly parse module and options for proposal - // "eth0 qeth" -> "qeth" - // FIXME: this only works for a single module - string mod = InstallInf["module"]:""; - if (mod != "") { - InstallInf["module"] = DeleteFirstWord (mod); - } - string options = InstallInf["options"]:""; - if (options != "") { - InstallInf["options"] = DeleteFirstWord (options); - } + // #42203: correctly parse module and options for proposal + // "eth0 qeth" -> "qeth" + // FIXME: this only works for a single module + string mod = InstallInf["module"]:""; + if (mod != "") { + InstallInf["module"] = DeleteFirstWord (mod); + } + + string options = InstallInf["options"]:""; + if (options != "") { + InstallInf["options"] = DeleteFirstWord (options); + } } y2milestone("InstallInf(%1)", InstallInf); @@ -180,65 +187,84 @@ map <string,any> hwcfg=$[]; void CreateIfcfg(){ - string network_configuration=""; - // set BOOTPROTO=[ static | dhcp ] - if (InstallInf["bootproto"]:"dhcp"=="static") { - // add broadcast interface #suse49131 - network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", - InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); - } else { - network_configuration="BOOTPROTO='dhcp'\n"; - // set DHCP_SET_HOSTNAME=yes #suse30528 - y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); - SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); - } + string network_configuration=""; + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") + { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + } + else + { + network_configuration="BOOTPROTO='dhcp'\n"; + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } // wlan devices - if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || size(InstallInf["WKeyLen"]:"")>0){ - network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); - if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) - network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); - } + if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || + size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || + size(InstallInf["WKeyLen"]:"")>0) + { + network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) + network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, + substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + } + + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) + network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + // for queth devices (s390) + if (size(InstallInf["LLADDR"]:"")>0) + network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); - // if available, write MTU - if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + if (network_disk) + { + network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } + else + { + network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } - // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + // reference to hardware configuration + // network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + // point to point interface + if (size(InstallInf["remote_ip"]:"")>0) + network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); - } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); - } + list<map> hardware=ReadHardware("netcard"); + y2milestone("hardware %1", hardware); + + string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - // reference to hardware configuration -// network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); + if (size(hw_name)>0) + network_configuration = sformat("%1NAME='%2'\n", network_configuration, hw_name); - // point to point interface - if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - list<map> hardware=ReadHardware("netcard"); -y2internal("hardware %1", hardware); - -string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - - string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); - if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, hw_name); - - - y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); - - // write only if file doesn't exists - string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); -// string dev_file=sformat("/tmp/%1", ifcfg); - if (!FileUtils::Exists(dev_file)) { - SCR::Write(.target.string, dev_file, network_configuration); - y2internal("ifcfg file: %1", dev_file); - } - else y2warning("File exists %1", dev_file); + y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); + + // write only if file doesn't exists + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); + // string dev_file=sformat("/tmp/%1", ifcfg); + + if (!FileUtils::Exists(dev_file)) + { + SCR::Write(.target.string, dev_file, network_configuration); + y2milestone("ifcfg file: %1", dev_file); + } + else + y2warning("File exists %1", dev_file); } /* @@ -248,53 +274,55 @@ void CreateOtherNetworkFiles(){ - // create hostname - if (size(InstallInf["hostname"]:"")>0){ - y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); - SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); - } - - if(InstallInf["bootproto"]:"dhcp"=="static") - { - // create routes file - if (size(InstallInf["gateway"]:"")>0){ - y2milestone("Writing route : %1", InstallInf["gateway"]:""); - SCR::Write(.target.string, "/etc/sysconfig/network/routes", sformat("default %1 - -\n", InstallInf["gateway"]:"")); - } else y2warning("No routing information in install.inf"); - - // create resolv.conf only for static configuration - if (size(InstallInf["nameserver"]:"")>0){ - string text = ""; - //Enter search domain data only if present - if( size(InstallInf["domain"]:"") > 0) - text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); - else - //If we don't have search domain data, skip 'search' field, - //do not leave out 'nameserver' completely - #298001 - text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); - y2milestone("Write resolv.conf content: %1", text); - SCR::Write(.target.string, "/etc/resolv.conf", text); - } - } - - // create proxy sysconfig file - if (size(InstallInf["proxy"]:"")>0) { - y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); - map ex = Proxy::Export(); - Proxy::Read(); - Proxy::Import( ex ); - Proxy::Write(); - } - // create defaultdomain - if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ - y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); - SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["nisdomain"]:""); - } - - // write wait_for_interfaces if needed - if (size(InstallInf["connect_wait"]:"")>0){ - SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); - } + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + if(InstallInf["bootproto"]:"dhcp"=="static") + { + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", sformat("default %1 - -\n", InstallInf["gateway"]:"")); + } + else + y2warning("No routing information in install.inf"); + + // create resolv.conf only for static configuration + if (size(InstallInf["nameserver"]:"")>0){ + string text = ""; + //Enter search domain data only if present + if( size(InstallInf["domain"]:"") > 0) + text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + else + //If we don't have search domain data, skip 'search' field, + //do not leave out 'nameserver' completely - #298001 + text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + } + + // create proxy sysconfig file + if (size(InstallInf["proxy"]:"")>0) { + y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); + map ex = Proxy::Export(); + Proxy::Read(); + Proxy::Import( ex ); + Proxy::Write(); + } + // create defaultdomain + if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["nisdomain"]:""); + } + + // write wait_for_interfaces if needed + if (size(InstallInf["connect_wait"]:"")>0){ + SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); + } } /* @@ -302,80 +330,81 @@ */ void save_network(){ - // skip from chroot - integer old_SCR = WFM::SCRGetDefault (); - integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); - WFM::SCRSetDefault (new_SCR); - - // when root is on nfs/iscsi set startmode=nfsroot #176804 - string device = NetworkStorage::getDevice( Installation::destdir ); - y2internal("%1 directory is on %2 device", Installation::destdir, device); - network_disk = NetworkStorage::isDiskOnNetwork( device ); - - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); - - //Deleting lockfiles and re-triggering udev events for *net is not needed any more - //(#292375 c#18) - - string udev_rules_srcdir = "/etc/udev/rules.d"; - string net_srcfile = "70-persistent-net.rules"; - string cd_srcfile = "70-persistent-cd.rules"; - - string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); - string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); - string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile); - - //Do not create udev_rules_destdir if it already exists (in case of update) - //(bug #293366, c#7) - - if (! FileUtils::Exists( udev_rules_destdir )) - { - y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); - WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); - } - - if (! FileUtils::Exists( net_destfile )) - { - y2milestone("Copying %1 to the installed system ", net_srcfile); - WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); - } - - if (! FileUtils::Exists( cd_destfile )) - { - y2milestone("Copying %1 to the installed system ", cd_srcfile); - WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, cd_srcfile, cd_destfile)); - } - - // close and chroot back - WFM::SCRClose (new_SCR); - WFM::SCRSetDefault (old_SCR); - - if (Mode::autoinst()){ - import "LanUdevAuto"; - LanUdevAuto::Write(); - } - - - if(ReadInstallInf()){ -// string hwcfgname = CreateHardwareFile(); -// string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - - CreateIfcfg(); - CreateOtherNetworkFiles(); - - SCR::Execute(.target.bash, "chkconfig network on"); - - // if portmap running - start it after reboot - WFM::Execute (.local.bash, - "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + // when root is on nfs/iscsi set startmode=nfsroot #176804 + string device = NetworkStorage::getDevice( Installation::destdir ); + y2internal("%1 directory is on %2 device", Installation::destdir, device); + network_disk = NetworkStorage::isDiskOnNetwork( device ); + + // -------------------------------------------------------------- + // Copy DHCP client cache so that we can request the same IP (#43974). + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", + "/var/lib/dhcpcd", + String::Quote (Installation::destdir))); + + //Deleting lockfiles and re-triggering udev events for *net is not needed any more + //(#292375 c#18) + + string udev_rules_srcdir = "/etc/udev/rules.d"; + string net_srcfile = "70-persistent-net.rules"; + string cd_srcfile = "70-persistent-cd.rules"; + + string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); + string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); + string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile); + //Do not create udev_rules_destdir if it already exists (in case of update) + //(bug #293366, c#7) + + if (! FileUtils::Exists( udev_rules_destdir )) + { + y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); + } - } else + if (! FileUtils::Exists( net_destfile )) + { + y2milestone("Copying %1 to the installed system ", net_srcfile); + WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); + } + + if (! FileUtils::Exists( cd_destfile )) + { + y2milestone("Copying %1 to the installed system ", cd_srcfile); + WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, cd_srcfile, cd_destfile)); + } + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if (Mode::autoinst()){ + import "LanUdevAuto"; + LanUdevAuto::Write(); + } + + + if(ReadInstallInf()){ + // string hwcfgname = CreateHardwareFile(); + // string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); + + CreateIfcfg(); + CreateOtherNetworkFiles(); + + SCR::Execute(.target.bash, "chkconfig network on"); + + // if portmap running - start it after reboot + WFM::Execute (.local.bash, + "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + + + } + else y2error("Error while reading install.inf!"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0