May 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38178 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:25:59 2007 New Revision: 38178 URL: http://svn.opensuse.org/viewcvs/yast?rev=38178&view=rev Log: Pkg manager related stuff moved into pkg/ subdirectory Modified: trunk/ncurses/POTFILES Modified: trunk/ncurses/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/POTFILES?rev=38178&r1=38… ============================================================================== --- trunk/ncurses/POTFILES (original) +++ trunk/ncurses/POTFILES Tue May 29 16:25:59 2007 @@ -1,6 +1,15 @@ -./src/PkgNames.cc ./src/NCFileSelection.cc ./src/NCAskForDirectory.cc ./src/NCAskForFile.cc ./src/NCurses.cc ./src/NCDialog.cc +./src/NCPopupInfo.h +pkg/NCPkgTable.cc +pkg/pkg_layout.ycp +pkg/NCPkgPopupDiskspace.cc +pkg/NCPkgNames.cc +pkg/NCPkgPopupSearch.cc +pkg/NCPkgPopupDeps.cc +pkg/NCPackageSelector.cc +pkg/you_layout.ycp + -- 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] r38177 - in /trunk/storage: libstorage/src/AppUtil.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 29 May '07

29 May '07

Author: aschnell Date: Tue May 29 16:18:21 2007 New Revision: 38177 URL: http://svn.opensuse.org/viewcvs/yast?rev=38177&view=rev Log: - fixed crash during detection (caused by empty key-value-pair) (bug #278169) Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Tue May 29 16:18:21 2007 @@ -347,7 +347,9 @@ if( (pos=i->find_first_of( delim ))!=string::npos ) { k = i->substr( 0, pos ); - v = i->substr( i->find_first_not_of( delim, pos+1 ) ); + string::size_type pos2 = i->find_first_not_of( delim, pos+1 ); + if( pos2 != string::npos ) + v = i->substr( pos2 ); } if( !removeSur.empty() ) { @@ -360,7 +362,8 @@ if( !v.empty() && (pos=v.find_last_of(removeSur))==v.size()-1 ) v.erase( v.find_last_not_of(removeSur)+1 ); } - ret[k] = v; + if( !k.empty() && !v.empty() ) + ret[k] = v; } return( ret ); } 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 May 29 16:18:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de + +- fixed crash during detection (caused by empty key-value-pair) + (bug #278169) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) @@ -31,7 +37,7 @@ ------------------------------------------------------------------- Mon May 14 11:15:42 CEST 2007 - fehr(a)suse.de -- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of +- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of "linux-swap") - fix wrong crypttab entry for encrypted swap with password (#273572) - prevent bind mounts from confusing mount detection (#271720) -- 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] r38176 - in /trunk/yast2: data/sysconfig.yast2 package/yast2.changes
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 16:09:47 2007 New Revision: 38176 URL: http://svn.opensuse.org/viewcvs/yast?rev=38176&view=rev Log: - updated metadata in the sysconfig file (#278612) Modified: trunk/yast2/data/sysconfig.yast2 trunk/yast2/package/yast2.changes Modified: trunk/yast2/data/sysconfig.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/data/sysconfig.yast2?rev=3… ============================================================================== --- trunk/yast2/data/sysconfig.yast2 (original) +++ trunk/yast2/data/sysconfig.yast2 Tue May 29 16:09:47 2007 @@ -2,21 +2,22 @@ # to over-ride these settins per-user create a # ~/.yast2/yast2 file. -## Path: System/YaST2 +## Path: System/Yast2/GUI +## Description: Default UI for YaST ## Type: list(auto,qt,gtk) -## Description: Default control center for YaST ## Default: "auto" -# selects the control-center implementation to be used -# to render yast widgets -# auto: will attempt to detect both desktop & plugin -# presence and adapt accordingly +# Default control center for YaST +# selects the control-center implementation to be used +# to render yast widgets +# auto: will attempt to detect both desktop & plugin +# presence and adapt accordingly WANTED_SHELL="auto" ## Type: list(auto,qt,gtk,ncurses) -## Description: Default UI backend for YaST ## Default: "auto" -# selects the GUI plugin to be used to render yast widgets -# auto: will attempt to detect both desktop & plugin -# presence and adapt accordingly, falling back to -# qt rendering if gtk is not present +# Default UI backend for YaST +# selects the GUI plugin to be used to render yast widgets +# auto: will attempt to detect both desktop & plugin +# presence and adapt accordingly, falling back to +# qt rendering if gtk is not present WANTED_GUI="auto" Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue May 29 16:09:47 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz + +- updated metadata in the sysconfig file (#278612) + +------------------------------------------------------------------- Fri May 25 10:59:56 CEST 2007 - jsrain(a)suse.cz - fixed spec file (removed duplicate .desktop files translations) -- 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] r38175 - /tags/stable-2_15_17/ncurses/
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 14:35:07 2007 New Revision: 38175 URL: http://svn.opensuse.org/viewcvs/yast?rev=38175&view=rev Log: Created tag stable-2_15_17 for ncurses Added: tags/stable-2_15_17/ncurses/ - copied from r38174, trunk/ncurses/ -- 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] r38174 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/pkg/NCPackageSelector.cc
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 14:34:59 2007 New Revision: 38174 URL: http://svn.opensuse.org/viewcvs/yast?rev=38174&view=rev Log: Version 2.15.17 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=38174&r1=381… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue May 29 14:34:59 2007 @@ -1 +1 @@ -2.15.16 +2.15.17 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue May 29 14:34:59 2007 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue May 29 13:03:07 CEST 2007 - kmachalkova(a)suse.cz + +- Removed obsolete save/load selection stuff + related NCPkgPopupFile + class - replaced by save/load pkgs & patterns (FaTE #300729) +- Improved usability of cancel dialog in pkg manager (#274774) +- Fix disappearing 'Etc./All Packages List' submenu after unchecking + AutoDependency Check +- Place all popup dialogs in pkg manager to the centre of the screen + and calculate their size relatively to the screen size (if applicable) + (#275610) +- 2.15.17 + +------------------------------------------------------------------- Wed May 23 13:54:16 CEST 2007 - gs(a)suse.de - Package Installation: check the partition size to prevent Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 14:34:59 2007 @@ -2386,7 +2386,7 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10), + NCPopupInfo info( wpos( NCurses::lines()/10, NCurses::cols()/10), NCPkgNames::NotifyLabel(), YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), NCPkgNames::AcceptLabel(), -- 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] r38173 - /tags/branch-SLE-10-SP1-2_13_2/product-creator/
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 14:18:55 2007 New Revision: 38173 URL: http://svn.opensuse.org/viewcvs/yast?rev=38173&view=rev Log: Created tag branch-SLE-10-SP1-2_13_2 for product-creator Added: tags/branch-SLE-10-SP1-2_13_2/product-creator/ - copied from r38172, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38172 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 14:18:43 2007 New Revision: 38172 URL: http://svn.opensuse.org/viewcvs/yast?rev=38172&view=rev Log: - 2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue May 29 14:18:43 2007 @@ -1 +1 @@ -2.13.1 +2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue May 29 14:18:43 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 14:18:19 CEST 2007 - lslezak(a)suse.cz + +- 2.13.2 + +------------------------------------------------------------------- Mon May 28 15:59:55 CEST 2007 - lslezak(a)suse.cz - reinitialize the package manager before creating another image -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38171 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 12:58:24 2007 New Revision: 38171 URL: http://svn.opensuse.org/viewcvs/yast?rev=38171&view=rev Log: Created tag stable-2_15_37 for network Added: tags/stable-2_15_37/network/ - copied from r38170, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38170 - in /trunk/network: VERSION package/yast2-network.changes src/modules/DSL.ycp src/modules/ISDN.ycp src/modules/Lan.ycp src/modules/Modem.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 12:58:19 2007 New Revision: 38170 URL: http://svn.opensuse.org/viewcvs/yast?rev=38170&view=rev Log: add Confirm::MustBeRoot to all network modules (#276478) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/DSL.ycp trunk/network/src/modules/ISDN.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/Modem.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38170&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 29 12:58:19 2007 @@ -1 +1 @@ -2.15.36 +2.15.37 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 29 12:58:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 12:56:38 CEST 2007 - mzugec(a)suse.cz + +- add Confirm::MustBeRoot to all network modules (#276478) +- 2.15.37 + +------------------------------------------------------------------- Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz - improve add/edit device dialogs (device type) Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue May 29 12:58:19 2007 @@ -154,6 +154,10 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + /* Progress step 1/5 */ ProgressNextStage(_("Detecting DSL devices...")); if(!Detection::running) Detection::Start(); Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev… ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Tue May 29 12:58:19 2007 @@ -277,6 +277,10 @@ Devices = $[]; if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + // step 1 in reading current ISDN setup ProgressNextStage(_("Detecting ISDN cards...")); Hardware = ReadHardware("isdn"); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue May 29 12:58:19 2007 @@ -380,6 +380,11 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + + /* Progress step 1/9 */ ProgressNextStage(_("Detecting network devices...")); // if(!Arch::s390 ()) /* FIXME: Temporary hack until the detection is functional */ Modified: trunk/network/src/modules/Modem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Modem.ycp?re… ============================================================================== --- trunk/network/src/modules/Modem.ycp (original) +++ trunk/network/src/modules/Modem.ycp Tue May 29 12:58:19 2007 @@ -128,6 +128,11 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + + /* Progress step 1/4 */ ProgressNextStage(_("Detecting modems...")); Hardware = ReadHardware("modem"); -- 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] r38169 - /tags/stable-2_15_20/pkg-bindings/
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 12:55:31 2007 New Revision: 38169 URL: http://svn.opensuse.org/viewcvs/yast?rev=38169&view=rev Log: Created tag stable-2_15_20 for pkg-bindings Added: tags/stable-2_15_20/pkg-bindings/ - copied from r38168, trunk/pkg-bindings/ -- 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] r38168 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/Selection.cc
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 12:55:20 2007 New Revision: 38168 URL: http://svn.opensuse.org/viewcvs/yast?rev=38168&view=rev Log: - updated GPG callbacks (#277117) - improved logging (found by build check) - 2.15.20 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Selection.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=38168&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue May 29 12:55:20 2007 @@ -1 +1 @@ -2.15.19 +2.15.20 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue May 29 12:55:20 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 11:20:43 CEST 2007 - lslezak(a)suse.cz + +- updated GPG callbacks (#277117) +- 2.15.20 + +------------------------------------------------------------------- Thu May 17 15:35:54 CEST 2007 - lslezak(a)suse.cz - Evaluate start/finish callbacks in Pkg::SourceRestore() and Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue May 29 12:55:20 2007 @@ -1590,7 +1590,7 @@ { KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual void trustedKeyAdded( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyAdded( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) ); @@ -1602,7 +1602,7 @@ } } - virtual void trustedKeyRemoved( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyRemoved( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) ); Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Tue May 29 12:55:20 2007 @@ -117,7 +117,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetSelections(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetSelections(%s, ...)", status.c_str()); break; } @@ -218,7 +218,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetPatterns(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetPatterns(%s, ...)", status.c_str()); break; } -- 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] r38167 - in /trunk/ncurses/src: NCDialog.cc pkg/NCPackageSelector.cc pkg/NCPkgPopupDeps.cc
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 12:14:34 2007 New Revision: 38167 URL: http://svn.opensuse.org/viewcvs/yast?rev=38167&view=rev Log: Place all popup dialogs in pkg manager to the centre of the screen and calculate their size relatively to the screen size (if applicable) (#275610) Modified: trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=3816… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Tue May 29 12:14:34 2007 @@ -1195,7 +1195,7 @@ helpIntro = _( "Press F1 or ESC to close this dialog." ); } - helpPopup = new NCPopupInfo( wpos(1,1), + helpPopup = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/3 ), // headline of the text mode help _( "Text Mode Navigation" ), YCPString( helpIntro + @@ -1203,6 +1203,8 @@ helpText ), "" ); + helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 ); + } if ( helpPopup ) { Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 12:14:34 2007 @@ -228,10 +228,10 @@ searchPopup = new NCPkgPopupSearch( wpos( 1, 1 ), this ); // the dependency popup - depsPopup = new NCPkgPopupDeps( wpos( 1, 1 ), this ); + depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); // the disk space popup - diskspacePopup = new NCPkgPopupDiskspace( wpos( 1, 1 ), testMode ); + diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); } @@ -1551,10 +1551,10 @@ return false; } - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), YCPString(_( "All package dependencies are OK." )), NCPkgNames::OKLabel() ); - info.setNiceSize( 30, 5 ); + info.setNiceSize( 35, 5 ); if ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL ) { @@ -1955,7 +1955,7 @@ if ( success ) { - NCPopupInfo info( wpos( 1, 1 ), + NCPopupInfo info( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), YCPString( "" ), YCPString( _("Dependency resolver test case written to ") + " " + testCaseDir ) ); info.setNiceSize( 40, 8 ); @@ -2014,11 +2014,12 @@ (void) unlink( filename->asString()->value_cstr() ); //present error popup to the user - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error exporting list of packages and patterns to ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2096,11 +2097,12 @@ { NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl; - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error importing list of packages and patterns from ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2157,7 +2159,7 @@ } // open the popup with the help text - NCPopupInfo pkgHelp( wpos( 1, 1 ), headline, YCPString( text ) ); + NCPopupInfo pkgHelp( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, YCPString( text ) ); pkgHelp.setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); pkgHelp.showInfoPopup( ); @@ -2185,7 +2187,8 @@ text += NCPkgNames::YouHelp3(); // open the popup with the help text - NCPopupInfo youHelp( wpos( 1, 1 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + NCPopupInfo youHelp( wpos( NCurses::lines()/3, NCurses::cols()/6 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + youHelp.setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); youHelp.showInfoPopup( ); if ( packageList ) @@ -2208,7 +2211,7 @@ if (changes) { // show a popup and ask the user - NCPopupInfo cancelMsg( wpos( 2, 2 ), + NCPopupInfo cancelMsg( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), YCPString( NCPkgNames::NotifyLabel() ), YCPString( NCPkgNames::CancelText() ), NCPkgNames::YesLabel(), @@ -2259,7 +2262,7 @@ if ( !youMode ) // don't show automatic changes if YOU mode { // show the automatic changes list - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) @@ -2276,7 +2279,7 @@ if ( message != "" ) { // open the popup e.g. with the text "/usr needs 50 MB more disk space" - NCPopupInfo spaceMsg( wpos( 2, 2 ), + NCPopupInfo spaceMsg( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), YCPString( NCPkgNames::ErrorLabel() ), YCPString( NCPkgNames::DiskSpaceError() + " " + message ), NCPkgNames::OKLabel(), @@ -2383,11 +2386,12 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( 1, 1), + NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10), NCPkgNames::NotifyLabel(), YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), NCPkgNames::AcceptLabel(), NCPkgNames::CancelLabel() ); + info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; @@ -2527,7 +2531,7 @@ bool ok = false; bool cancel = false; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), YCPString( "" ), YCPString(_( "System dependencies verify OK." )), NCPkgNames::OKLabel() ); info.setNiceSize( 30, 5 ); @@ -2540,7 +2544,7 @@ //call the solver (with S_Verify it displays no popup) cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); //display the popup with automatic changes - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8 ), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Tue May 29 12:14:34 2007 @@ -230,7 +230,7 @@ NCDBG << "Solving..." << endl ; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2), YCPString( "" ), YCPString(NCPkgNames::Solving()), NCPkgNames::OKLabel() ); info.setNiceSize( 18, 4 ); -- 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] r38166 - /tags/stable-2_15_4/http-server/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:10:06 2007 New Revision: 38166 URL: http://svn.opensuse.org/viewcvs/yast?rev=38166&view=rev Log: Created tag stable-2_15_4 for http-server Added: tags/stable-2_15_4/http-server/ - copied from r38165, trunk/http-server/ -- 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] r38165 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp src/dialogs.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:08:50 2007 New Revision: 38165 URL: http://svn.opensuse.org/viewcvs/yast?rev=38165&view=rev Log: improved workflow dialogs (host/hosts) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=38165&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue May 29 09:08:50 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue May 29 09:08:50 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:08:05 CEST 2007 - mzugec(a)suse.cz + +- improved workflow dialogs (host/hosts) +- 2.15.4 + +------------------------------------------------------------------- Fri May 11 14:26:47 CEST 2007 - mzugec(a)suse.cz - validation for VhostID when create new virtual host (#245155) Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Tue May 29 09:08:50 2007 @@ -202,7 +202,6 @@ // skip ourself also when this is main server if (( host == hostid ) || (hostid == "main")) continue; if (host == "main") continue; -// list< map<string,any> > desc = YaST::HTTPDData::GetHost (host); // find out the server name string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil ); if (value == servername) @@ -214,7 +213,6 @@ break; } -// value = (string)get_host_value ("HostIP", desc, nil); map<string, any> vhost = YaST::HTTPDData::GetVhostType(host); if (! FileUtils::CheckAndCreatePath( documentroot )){ @@ -319,12 +317,6 @@ ]); return nil; } -//symbol showAccessLogPopup (any key, map event); -//symbol showErrorLogPopup (any key, map event); - -//list <string> host_ids = nil; - -//void OverviewInit (string widget) { } /** * Handle overview (listen) widget @@ -636,8 +628,6 @@ global void storeServiceStatus (string key, map event); global void initAdaptFirewall (string key); global void storeAdaptFirewall (string opt_id, map event); -//global void DirectoryOptionInit (any key, string id); -//global void DirectoryOptionStore (any key, string id); // wizard widget functions global void initOpenPort (string key); @@ -647,10 +637,9 @@ global boolean validateListenInterfaces(string key, map event); global void initFwOpen (string key); global void storeFwOpen (string opt_id, map event); -//void initExpertConf (string key); global symbol handleExpertConf (string key, map event); void initScriptModules(string key); -void initSummaryText(string key); +void initSummaryText(string key); global symbol handleBooting (string key, map event); global map getHostOptions(boolean is_main_server); boolean getServiceAutoStart(); @@ -677,8 +666,6 @@ // table cell description "label" : _("Server Name"), "widget" : `textentry, -// "validate_type" : `function, -// "validate_function" : validate_servername, ], ], "DocumentRoot" : $[ Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Tue May 29 09:08:50 2007 @@ -257,7 +257,7 @@ // translators: dialog caption, %1 is the host name string caption = sformat( _("SSL Configuration for '%1'"), // translators: human-readable "default host" - HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host") + HttpServerWidgets::currenthost == "main" ? _("Default Host") : HttpServerWidgets::get_host_value ( "ServerName" , YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) ); Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Tue May 29 09:08:50 2007 @@ -20,45 +20,24 @@ include "http-server/dialogs.ycp"; include "http-server/wizard-dialog.ycp"; +define symbol MainSequence(); -/** - * Main workflow of the http-server configuration - * @return sequence result - */ -symbol MainSequence() { +symbol VirtualHostSequence(string action){ map aliases = $[ - "overview" : ``( OverviewDialog() ), "host" : ``( HostDialog() ), - "main-host" : ``( HostDialog() ), // different workflow "addhost" : ``( AddHost() ), "setvhost" : ``( SetVHostOptions() ), "ssl" : ``( SSLDialog () ), "dir" : ``( DirDialog () ), - "ssl-default" : ``( SSLDialog () ), ]; + string def = (action=="add")?"addhost":"host"; map sequence = $[ - "ws_start" : "overview", - "overview" : $[ - `abort : `abort, - `next : `next, - `default : "main-host", -// `hosts : "hosts", - `dir : "dir", - `ssl : "ssl-default", - `edit : "host", - `add : "addhost", - ], - "ssl-default" : $[ - `abort : `abort, - `next : "main-host", - `back : "main-host", - ], + "ws_start" : def, "host" : $[ `abort : `abort, - `next : "overview", -// `back : "hosts", + `next : `next, //"overview", `ssl : "ssl", `dir : "dir" ], @@ -66,11 +45,10 @@ "addhost": $[ `abort : `abort, `next : "setvhost", -// `back : "hosts", ], "setvhost": $[ `abort : `abort, - `next : "overview", + `next : `next, //"overview", `back : "addhost" ], "ssl": $[ @@ -85,6 +63,51 @@ ] ]; + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the http-server configuration + * @return sequence result + */ +symbol MainSequence() { + + map aliases = $[ + "overview" : ``( OverviewDialog() ), + "addhost" : ``( AddHost() ), + "setvhost" : ``( SetVHostOptions() ), + "dir" : ``( DirDialog () ), + "add-vh" : [ ``( VirtualHostSequence("add")), true ], + "edit-vh" : [ ``( VirtualHostSequence("edit")), true ] + ]; + + map sequence = $[ + "ws_start" : "overview", + "overview" : $[ + `abort : `abort, + `next : `next, + `dir : "dir", + `edit : "edit-vh", + `add : "add-vh", + ], + "add-vh" : $[ + `next : "overview" //`next + ], + "edit-vh" : $[ + `next : "overview" //`next + ], + "setvhost": $[ + `abort : `abort, + `next : "overview", + `back : "addhost" + ], + "dir": $[ + `abort : `abort, + `next : "overview", + `back : "overview" + ] + ]; + symbol ret = Sequencer::Run(aliases, sequence); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38164 - /tags/stable-2_15_36/network/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:23 2007 New Revision: 38164 URL: http://svn.opensuse.org/viewcvs/yast?rev=38164&view=rev Log: Created tag stable-2_15_36 for network Added: tags/stable-2_15_36/network/ - copied from r38163, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38163 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/lan/complex.ycp src/lan/hardware.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:15 2007 New Revision: 38163 URL: http://svn.opensuse.org/viewcvs/yast?rev=38163&view=rev Log: improve add/edit device dialogs (device type) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38163&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 29 09:04:15 2007 @@ -1 +1 @@ -2.15.35 +2.15.36 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 29 09:04:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz + +- improve add/edit device dialogs (device type) +- 2.15.36 + +------------------------------------------------------------------- Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz - disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue May 29 09:04:15 2007 @@ -135,14 +135,11 @@ break; case "none" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); break; - - } } symbol handleBootProto (string key, map event) { -// if (event["EventReason"]:"" == "ValueChanged"){ boolean none = false; boolean dynamic = false; boolean stat = false; @@ -157,8 +154,6 @@ UI::ChangeWidget(`dyn, `Enabled, dynamic); UI::ChangeWidget(`ipaddr, `Enabled, stat); UI::ChangeWidget(`netmask, `Enabled, stat); - -// } return nil; } @@ -196,22 +191,13 @@ void initIfcfg (string key) { UI::ChangeWidget(`id(key), `Value, Lan::type); + UI::ChangeWidget(`id(key), `Enabled, false); } void initIfcfgId (string key) { UI::ChangeWidget(`id(key), `Value, Lan::device); } -/** - * Event handler for ifcfg name - * enable or disable depending on whether we are adding a new interface - * @param key the widget receiving the event - * @param event the event being handled - * @return nil so that the dialog loops on - */ -symbol HandleIfcfg (string key, map event) { - UI::ChangeWidget (`id (key), `Enabled, Lan::operation == `add); - return nil; -} + /** * Remap the buttons to their Wizard Sequencer values @@ -300,18 +286,6 @@ } /** - * Initialize the dialog as a whole - * Sets default focus - * @param key id of the widget - */ - -/* -void InitDialog (string key) { - UI::SetFocus (`id ("IPADDR")); -} -*/ - -/** * If the traffic would be blocked, ask the user * if he wants to change it * @param event the event being handled @@ -381,19 +355,6 @@ } /** - * Store values computed from the whole dialog - * @param key the widget being validated - * @param event the event being handled - */ - -/* -void StoreDialog (string key, map event) { - return; -} -*/ - - -/** * Initialize value of firewall zone widget * (disables it when SuSEFirewall is not installed) * @param key id of the widget @@ -410,7 +371,7 @@ "widget" : `custom, "custom_widget" : /* Frame label */ - `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( + `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( `VSpacing(1), `Table(`id(`table), `opt(`notify), `header( /* Table header label */ @@ -498,7 +459,7 @@ "help": "", // "items" will be filled in the dialog itself "init" : initIfcfg, - "handle": HandleIfcfg, +// "handle": HandleIfcfg, "validate_type": `function, "validate_function": ValidateIfcfgType, ], @@ -511,7 +472,7 @@ "help": "", "init" : initIfcfgId, "valid_chars": NetworkDevices::ValidCharsIfcfg (), - "handle": HandleIfcfg, +// "handle": HandleIfcfg, ], "BONDSLAVE": $[ @@ -883,21 +844,16 @@ "tab_help" : "", "fallback_functions" : functions, ]; - -// if (Lan::operation == `add) wd_content["initial_tab"] = "hardware"; - + hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ "tab" : CWMTab::CreateWidget (wd_content) ]); - term contents2 = `HBox ("tab"); - - any ret = CWM::ShowAndRun ( $[ "widget_names": ["tab"], "widget_descr": wd, - "contents": contents2, + "contents": `HBox ("tab"), /* Address dialog caption */ "caption": _("Network Card Setup"), "back_button" : Label::BackButton (), @@ -905,7 +861,7 @@ "fallback_functions" : functions, ]); y2milestone ("ShowAndRun: %1", ret); - + if (ret != `back && ret != `abort) { string ifcfgname = NetworkDevices::device_name ( Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Tue May 29 09:04:15 2007 @@ -216,10 +216,8 @@ list<map<string,any> > o_items = nil; void initOverview (string key) ``{ -// if (o_items == nil){ o_items = (list<map<string,any> >)Lan::Overview(); o_items = o_items + Lan::Unconfigured (); -// } list<term> term_items = maplist (map<string,any> i, o_items, { term t = `item (`id (i["id"]:"")); Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue May 29 09:04:15 2007 @@ -61,11 +61,13 @@ _("Options for the module should be written in the format specified in the IBM Device Drivers and Installation Commands manual."); } + map<string, any> hardware = nil; +boolean hw_standalone=false; + void initHwDialog(string text) { hardware = $[]; -// ScreenName("lan-hardware"); /* Manual dialog caption */ string caption = _("Manual Network Card Configuration"); @@ -88,7 +90,7 @@ // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; hardware["hwcfg"] = Lan::nm_name; -if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; // FIXME duplicated in address.ycp hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; @@ -99,10 +101,9 @@ if(Arch::ia64 ()) hardware["device_types"] = add(hardware["device_types"]:[], "xp"); - if(issubstring(hardware["device"]:"", "bus-pcmcia")) - hardware["hotplug"] = "pcmcia"; - else if(issubstring(hardware["device"]:"", "bus-usb")) - hardware["hotplug"] = "usb"; + if(issubstring(hardware["device"]:"", "bus-pcmcia")) hardware["hotplug"] = "pcmcia"; + else if(issubstring(hardware["device"]:"", "bus-usb")) hardware["hotplug"] = "usb"; + y2milestone("hotplug=%1", Lan::hotplug); term CheckBoxes = `HBox( @@ -124,9 +125,6 @@ `HSpacing(1.5) ); - /* Pushbutton label */ - term ListButton = `PushButton(`id(`list), _("Select from &List")); - /* Disable PCMCIA and USB checkboxex on Edit and s390 */ if(Lan::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true) CheckBoxes = `VSpacing(0); @@ -147,6 +145,7 @@ CheckBoxes, `VSpacing(0.4) ),`HSpacing(0.5))); + hardware["devices"] = Lan::FreeDevices(hardware["realtype"]:""); // TODO: id-, bus-, ... here if(!contains(hardware["devices"]:[], hardware["device"]:"")) hardware["devices"] = prepend(hardware["devices"]:[], hardware["device"]:""); @@ -156,7 +155,6 @@ /* Manual dialog contents */ term TypeNameWidgets = -// `Frame(_("Network &Configuration"), `VBox( `VSpacing(0.2), `HBox( @@ -168,8 +166,6 @@ DeviceNumberBox, `HSpacing(0.5) ) -// `VSpacing(0.2) -// ) ); /* Add hardware -> don't allow some changes (card type) */ @@ -201,7 +197,8 @@ term ButtonBox = `HBox( `HStretch(), `HSpacing(0.5), - ListButton, + /* Pushbutton label */ + `PushButton(`id(`list), _("Select from &List")), `HSpacing(0.5), `HStretch() ); @@ -223,6 +220,7 @@ )); UI::ReplaceWidget(`hw_content, contents); + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) UI::ChangeWidget(`enable_hwconfig, `Value, false); hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; @@ -232,7 +230,7 @@ ChangeWidgetIfExists(`id(`hwcfg), `Enabled, hardware["no_hotplug"]:false); ChangeWidgetIfExists(`id(`usb), `Enabled, (hardware["hotplug"]:"" == "usb" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); ChangeWidgetIfExists(`id(`pcmcia), `Enabled, (hardware["hotplug"]:"" == "pcmcia" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); - + if (!hw_standalone) ChangeWidgetIfExists(`id(`dev), `Enabled,false); ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkDevices::ValidCharsIfcfg ()); ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); } @@ -723,6 +721,7 @@ any HardwareDialog (){ string caption = _("Hardware Dialog"); + hw_standalone = true; list<map <string, any> > w = CWM::CreateWidgets (["HWDIALOG"], (map <string, map <string, any> >) widget_descr_hardware); term contents = `VBox( -- 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] r38162 - /tags/stable-2_15_35/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:24 2007 New Revision: 38162 URL: http://svn.opensuse.org/viewcvs/yast?rev=38162&view=rev Log: Created tag stable-2_15_35 for network Added: tags/stable-2_15_35/network/ - copied from r38161, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38161 - in /trunk/network: VERSION package/yast2-network.changes src/services/routing.ycp
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:18 2007 New Revision: 38161 URL: http://svn.opensuse.org/viewcvs/yast?rev=38161&view=rev Log: disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38161&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 17:09:18 2007 @@ -1 +1 @@ -2.15.34 +2.15.35 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 17:09:18 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz + +- disable routing dialog when NetworkManager used (#178538) +- 2.15.35 + +------------------------------------------------------------------- Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz - installation network changes: Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp… ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Mon May 28 17:09:18 2007 @@ -22,6 +22,7 @@ import "Lan"; import "CWM"; import "CWMTab"; +import "NetworkService"; include "network/lan/help.ycp"; include "network/routines.ycp"; @@ -58,7 +59,7 @@ )); if(entry[4]:"" != "") - UI::ChangeWidget(`id(`device), `Value, entry[4]:""); + UI::ChangeWidget(`id(`device), `Value, entry[4]:""); UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-"); UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-"); UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-"); @@ -165,6 +166,15 @@ UI::ChangeWidget(`id(`add), `Enabled, false); UI::SetFocus(`id(`gw)); + // #178538 - disable routing dialog when NetworkManager is used + boolean enabled = !(boolean)NetworkService::IsManaged(); + + UI::ChangeWidget(`id(`gw), `Enabled, enabled); + UI::ChangeWidget(`id(`table), `Enabled, enabled); + UI::ChangeWidget(`id(`forward), `Enabled, enabled); + UI::ChangeWidget(`id(`add), `Enabled, enabled); + UI::ChangeWidget(`id(`expert), `Enabled, enabled); + // fixed bug #73739 - if dhcp is used, dont set default gw statically // if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, 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] r38160 - in /trunk/installation: control/control.SLD.xml control/control.SLES.xml control/examples/custom.xml control/tests/test.xml package/yast2-installation.changes
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 16:03:18 2007 New Revision: 38160 URL: http://svn.opensuse.org/viewcvs/yast?rev=38160&view=rev Log: removed netsetup item from control files Modified: trunk/installation/control/control.SLD.xml trunk/installation/control/control.SLES.xml trunk/installation/control/examples/custom.xml trunk/installation/control/tests/test.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLD.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD… ============================================================================== --- trunk/installation/control/control.SLD.xml (original) +++ trunk/installation/control/control.SLD.xml Mon May 28 16:03:18 2007 @@ -538,10 +538,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -629,12 +625,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -787,10 +777,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon May 28 16:03:18 2007 @@ -661,10 +661,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -752,12 +748,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -915,10 +905,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/examples/custom.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/cu… ============================================================================== --- trunk/installation/control/examples/custom.xml (original) +++ trunk/installation/control/examples/custom.xml Mon May 28 16:03:18 2007 @@ -378,19 +378,10 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>rpmcopy</name> </module> <module> <label>Network</label> - <name>netsetup</name> - <arguments>false,false,`dn</arguments> - </module> - <module> - <label>Network</label> <name>proposal</name> <arguments>true,true,`net</arguments> </module> @@ -435,10 +426,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> @@ -561,10 +548,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/tests/test.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/tests/test.… ============================================================================== --- trunk/installation/control/tests/test.xml (original) +++ trunk/installation/control/tests/test.xml Mon May 28 16:03:18 2007 @@ -316,9 +316,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>rpmcopy</name> </module> <module> @@ -368,10 +365,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -497,9 +490,6 @@ <mode>autoinstallation</mode> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>netprobe</name> </module> <module> 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 Mon May 28 16:03:18 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz + +- removed netsetup item from control files + +------------------------------------------------------------------- Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz - removed inst_netsetup item from control files -- 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] r38159 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 16:01:34 2007 New Revision: 38159 URL: http://svn.opensuse.org/viewcvs/yast?rev=38159&view=rev Log: - reinitialize the package manager before creating another image Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 16:01:34 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 15:59:55 CEST 2007 - lslezak(a)suse.cz + +- reinitialize the package manager before creating another image + +------------------------------------------------------------------- Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz - install "yast2-instserver" package (.content_file agent) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 16:01:34 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// original source configuration, needed to reset the package manager +list<map<string,any> > original_config = nil; + /** * Data was modified? * @return true if modified @@ -287,6 +290,11 @@ } }); + if (id == -1) + { + y2error("Source %1 not found!", url); + } + return id; }); @@ -1815,6 +1823,19 @@ global define void enableSources()``{ + // TODO FIXME: use better way to reset the source config in the package manager + if (original_config != nil) + { + y2milestone("Restoring original config: %1", original_config); + Pkg::SourceEditSet(original_config); + Pkg::SourceFinishAll(); + } + else + { + original_config = Pkg::SourceEditGet(); + y2milestone("Current source configuration: %1", original_config); + } + Pkg::SourceStartManager(false); y2milestone("sources: %1", ProductCreator::Config["sources"]:[]); -- 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] r38158 - in /trunk/installation: control/examples/control_default.xml control/examples/control_flex_part.xml control/examples/control_with_liveeval.xml package/yast2-installation.changes
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 13:33:51 2007 New Revision: 38158 URL: http://svn.opensuse.org/viewcvs/yast?rev=38158&view=rev Log: removed inst_netsetup item from control files Modified: trunk/installation/control/examples/control_default.xml trunk/installation/control/examples/control_flex_part.xml trunk/installation/control/examples/control_with_liveeval.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/examples/control_default.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_default.xml (original) +++ trunk/installation/control/examples/control_default.xml Mon May 28 13:33:51 2007 @@ -173,10 +173,6 @@ </defaults> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -266,9 +262,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> Modified: trunk/installation/control/examples/control_flex_part.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_flex_part.xml (original) +++ trunk/installation/control/examples/control_flex_part.xml Mon May 28 13:33:51 2007 @@ -201,10 +201,6 @@ </defaults> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -294,9 +290,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> Modified: trunk/installation/control/examples/control_with_liveeval.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_with_liveeval.xml (original) +++ trunk/installation/control/examples/control_with_liveeval.xml Mon May 28 13:33:51 2007 @@ -186,10 +186,6 @@ <name>continue</name> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -282,9 +278,6 @@ <name>continue</name> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -330,9 +323,6 @@ <name>inst_finish</name> </module> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> 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 Mon May 28 13:33:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz + +- removed inst_netsetup item from control files + +------------------------------------------------------------------- Sun May 27 14:49:37 CEST 2007 - mzugec(a)suse.de - installation network changes: -- 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] r38157 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes scripts/y2mkiso src/ProductCreator.ycp src/complex.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 11:11:35 2007 New Revision: 38157 URL: http://svn.opensuse.org/viewcvs/yast?rev=38157&view=rev Log: - install "yast2-instserver" package (.content_file agent) - fixed signing of addon products - allow spaces in the file names (#275918) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 11:11:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz + +- install "yast2-instserver" package (.content_file agent) +- fixed signing of addon products +- allow spaces in the file names (#275918) + +------------------------------------------------------------------- Wed May 23 15:59:07 CEST 2007 - lslezak(a)suse.cz - 2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso Mon May 28 11:11:35 2007 @@ -55,7 +55,7 @@ fi # set it later in pmac branch PPC_HFS_APPID="" -if [ -f $SOURCE/content ] ; then +if [ -f "$SOURCE/content" ] ; then BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image BOOT_ISOLINUX=$BOOT_BASE_DIR/$BOOT_ARCH/loader @@ -85,18 +85,18 @@ esac ;; esac - done < $SOURCE/content + done < "$SOURCE/content" DISTVERSION=`echo $DISTVERSION | tr '-' '#'` DISTIDENT="$DISTPRODUCT-$DISTVERSION" - for i in $SOURCE/media.? ; do - test -d $i || continue + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue { read VENDOR read CREATIONDATE - } < $i/media + } < "$i"/media done else - if [ -d $SOURCE/boot/$BOOT_ARCH/loader -a -d $SOURCE/i386/update ]; then + if [ -d "$SOURCE/boot/$BOOT_ARCH/loader" -a -d "$SOURCE/i386/update" ]; then # We have a bootable Patch-CD BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image @@ -105,30 +105,30 @@ fi -TMP_LS=`/bin/ls -d $SOURCE/*/update 2> /dev/null` -if [ -d $SOURCE/$BOOT_BASE_DIR -o -d $SOURCE/$ROOT_ON_CD -o ! -z "$TMP_LS" ] ; then +TMP_LS=`/bin/ls -d "$SOURCE/*/update" 2> /dev/null` +if [ -d "$SOURCE/$BOOT_BASE_DIR" -o -d "$SOURCE/$ROOT_ON_CD" -o ! -z "$TMP_LS" ] ; then - if test -e $SOURCE/$ROOT_ON_CD/inst-sys-test ; then + if test -e "$SOURCE/$ROOT_ON_CD/inst-sys-test" ; then echo $SOURCE/$ROOT_ON_CD/inst-sys-test exist. Please remove it. exit fi - if test -f $SOURCE/$BOOT_IMAGE -o -f $SOURCE/.boot \ - -o -d $SOURCE/$BOOT_ISOLINUX \ - -o -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot \ - -o -d $SOURCE/etc -o -f $SOURCE/boot/silo.conf ; then + if test -f "$SOURCE/$BOOT_IMAGE" -o -f "$SOURCE/.boot" \ + -o -d "$SOURCE/$BOOT_ISOLINUX" \ + -o -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" \ + -o -d "$SOURCE/etc" -o -f "$SOURCE/boot/silo.conf" ; then #test -d $SOURCE2 && { echo "tmpdir $SOURCE2 already exists" ; exit 1 ; } mkdir -p $SOURCE2 || { echo "can't create tmpdir $SOURCE2" ; exit 1 ; } - chmod 755 $SOURCE2 - if [ -f $SOURCE/.boot ] ; then + chmod 755 "$SOURCE2" + if [ -f "$SOURCE/.boot" ] ; then PARAMS="$PARAMS -b .boot -c boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/$BOOT_IMAGE ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/$BOOT_IMAGE" ] ; then # needed for ia64 - xx=`filesize $SOURCE/$BOOT_IMAGE` + xx=`filesize "$SOURCE/$BOOT_IMAGE"` if [ $ "$xx" -ne 1474560 $ -a $ "$xx" -ne 2949120 $ ] ; then - if head -c 200 $SOURCE/$BOOT_IMAGE | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then + if head -c 200 "$SOURCE/$BOOT_IMAGE" | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then PARAMS="$PARAMS -hard-disk-boot" else PARAMS="$PARAMS -no-emul-boot" @@ -139,12 +139,12 @@ PARAMS="$PARAMS -sort $SORTFILE -b $BOOT_IMAGE -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -d $SOURCE/$BOOT_ISOLINUX ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -d "$SOURCE/$BOOT_ISOLINUX" ] ; then echo "$SOURCE2/$BOOT_BASE_DIR/boot.catalog 3" >$SORTFILE echo "$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE echo "$SOURCE/$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE - find $SOURCE/$BOOT_ISOLINUX -printf "%p 1\n" >>$SORTFILE + find "$SOURCE/$BOOT_ISOLINUX" -printf "%p 1\n" >>$SORTFILE # last priority wins echo "$SOURCE/$BOOT_ISOLINUX/isolinux.bin 2" >>$SORTFILE echo "sortfile has" @@ -155,8 +155,8 @@ -b $BOOT_ISOLINUX/isolinux.bin -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" ] ; then # various ppc boards, no -J option echo removing follow-symlinks and joilet from mkisofs options echo adding long filenames, translation table, Untranslated filenames @@ -191,7 +191,7 @@ fi # check now for CHRP/iSeries vs PReP/pmac if the above is false if [ "$PPC_MKISOFS_CHRPBOOT" = "no" ] ; then - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo generic chrp bootblock missing echo upgrade mkisofs @@ -199,15 +199,15 @@ else # assume thats a PReP/Pmac CD # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -227,21 +227,21 @@ fi else # new mkisofs with -chrp-boot option - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo "adding -chrp-boot for CHRP boot" PARAMS="$PARAMS -chrp-boot" fi # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -260,11 +260,11 @@ fi # end ppc boards else - if [ -d $SOURCE/etc ] ; then + if [ -d "$SOURCE/etc" ] ; then echo found $SOURCE/etc. making sure, it is at the beginning of iso image. mkdir -p $SOURCE2/etc || exit 1 else - if [ -f $SOURCE/boot/silo.conf ] ; then + if [ -f "$SOURCE/boot/silo.conf" ] ; then PARAMS="$PARAMS -silo-boot boot/second.b -s /boot/silo.conf" echo found SPARC boot config. Making CD bootable. mkdir -p $SOURCE2/boot || exit 1 @@ -276,17 +276,17 @@ echo found no boot image. No bootable CD. fi - if test -f $SOURCE/content -a -z "$TMP_LS" ; then + if test -f "$SOURCE/content" -a -z "$TMP_LS" ; then # we already collected this above APPID=$DISTIDENT - elif test -f $SOURCE/$DESCRDIR/info ; then - set -- `fgrep DIST_IDENT $SOURCE/$DESCRDIR/info` + elif test -f "$SOURCE/$DESCRDIR/info" ; then + set -- `fgrep DIST_IDENT "$SOURCE/$DESCRDIR/info"` APPID=$2 else # If we have directory "update" in the second level, we assume # this is a Patch-CD if test ! -z "$TMP_LS" ; then - if test -f $SOURCE/media.1/patches ; then + if test -f "$SOURCE/media.1/patches" ; then APPID="`cat $SOURCE/media.1/patches | sed -e "s|/ ||g" | tr " " _`" else APPID="`cat $SOURCE/.S.u.S.E-disk-* | tr " " _`" @@ -294,23 +294,23 @@ fi fi if test -z "$APPID" \ - -a -f $SOURCE/$ROOT_ON_CD/MD5SUMS -a -f $SOURCE/.S.u.S.E-disk-* ; then - APPID=`cat $SOURCE/.S.u.S.E-disk-* | tr " " - | sed -e "s@-Version-@-@"` + -a -f "$SOURCE/$ROOT_ON_CD/MD5SUMS" -a -f "$SOURCE/.S.u.S.E-disk-*" ; then + APPID=`cat "$SOURCE/.S.u.S.E-disk-*" | tr " " - | sed -e "s@-Version-@-@"` APPID="$APPID.0#0" fi APPID=`echo $APPID | tr " " -` test -n "$APPID" && PARAMS="$PARAMS -A $APPID" - if test -f $SOURCE/content ; then + if test -f "$SOURCE/content" ; then MEDIANUMBER=1 - for i in $SOURCE/media.? ; do - test -d $i || continue - MEDIADIR=`ls -d $SOURCE/media.?` + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue + MEDIADIR=`ls -d "$SOURCE/media.?"` MEDIANUMBER=${MEDIADIR##$SOURCE/media.} done VOL="0$MEDIANUMBER" - elif test -f $SOURCE/.S.u.S.E-disk-* ; then - BASE=`basename $SOURCE/.S.u.S.E-disk-*` + elif test -f "$SOURCE/.S.u.S.E-disk-*" ; then + BASE=`basename "$SOURCE/.S.u.S.E-disk-*"` VOL=`echo $BASE | cut -c 16-17` fi if test -n "$VOL" ; then @@ -344,7 +344,7 @@ mkisofs \ -p "$CD_PREPARER" \ $PUB_OPT "$CD_PUBLISHER" \ - $PARAMS -o $DEST $XPARAMS $SOURCE + $PARAMS -o "$DEST" $XPARAMS "$SOURCE" set +x Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 11:11:35 2007 @@ -390,8 +390,6 @@ } ); - y2internal("Escaped sources: %1", sources); - v["sources"] = sources; } @@ -623,6 +621,7 @@ boolean ExportPublicKey(string keyid, string dir) { + y2debug("ExportPublicKey: %1 to %2", keyid, dir); // export the public key boolean ret = GPG::ExportAsciiPublicKey(keyid, dir + "/content.key"); @@ -687,7 +686,7 @@ string meta_sha1 = SHA1Meta(dir, prod_dir); string key_sha1 = SHA1Key(dir); - string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content", dir); + string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content'", String::Quote(dir)); map out = (map)SCR::Execute(.target.bash_output, command); if (out["exit"]:-1 != 0) { @@ -1029,7 +1028,7 @@ skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:""); SCR::Execute(.target.mkdir, skel_root); - Exec(sformat("/bin/mkdir -p %1/boot/%2", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); list<integer> enabled = Pkg::SourceGetCurrent(true); if (size(enabled) == 0 ) @@ -1043,18 +1042,18 @@ { if (Config["code10"]:false) { - Exec(sformat("/bin/mkdir -p %1/boot/%2/loader", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); } else { - Exec(sformat("/bin/mkdir -p %1/boot/loader", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); } } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p %1/etc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/ppc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/suseboot", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); } // detect the base source @@ -1065,7 +1064,7 @@ foreach(integer srcid, string dir, product_map, { if (dir != "/") { - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, dir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(dir))); } } ); @@ -1159,7 +1158,7 @@ // copy the descr directory - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); CopyDirectoryRec(id, 1, descrDir, sformat("%1/%2", skel_root, UpDir(descrDir))); sp = true; @@ -1175,14 +1174,14 @@ descrDir = this_source["productData","descrdir"]:"suse/setup/descr"; dataDir = this_source["productData", "datadir"]:"suse"; y2debug("source data: %1", this_source["sourceData", "url"]:"" ); - success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir)); + success = (boolean)SCR::Execute(.target.mkdir, sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); if (!success) { - y2error("Cannot create directory: %1", sformat("%1/%2", skel_root, dataDir)); + y2error("Cannot create directory: %1", sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); return false; } - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); if (savespace) { @@ -1226,7 +1225,7 @@ // Prepare media files CopyDirectoryRec(id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %1/media.1/media.tmp && mv %1/media.1/media.tmp %1/media.1/media", String::Quote(skel_root))); } else { @@ -1326,7 +1325,7 @@ // copy descriptions string descrdir = meta[source_id, "productData","descrdir"]:"suse/setup/descr"; - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrdir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrdir))); CopyDirectoryRec(source_id, 1, descrdir, sformat("%1/%2", skel_root, UpDir(descrdir))); string datadir = meta[source_id, "productData", "datadir"]:"suse"; @@ -1345,22 +1344,22 @@ if (l_slidedir != nil && l_slidedir != "") { // copy slide show - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("/bin/cp -a %1/* %2/%3", l_slidedir, skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("/bin/cp -a -- '%1/*' '%2/%3'", String::Quote(l_slidedir), String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Slideshow is missing"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Save space - do not copy the slideshow"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } y2milestone("source: %1, descrDir: %2, skel_root: %3", source, descrDir, skel_root); @@ -1368,7 +1367,7 @@ // copy media.1 directory CopyDirectoryRec(source_id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 '%1/media.1/media' > '%1/media.1/media.tmp' && mv '%1/media.1/media.tmp' '%1/media.1/media'", String::Quote(skel_root))); // create a copy of the autoyast profile (the new profile accepts even unsigned source) string autoyast_copy = ""; @@ -1429,32 +1428,34 @@ if (autoyast_copy != "") { // save the original file and the copy - Exec(sformat("/bin/cp %1 %2/autoinst.xml", autoyast_copy, skel_root)); - Exec(sformat("/bin/cp %1 %2/autoinst.orig.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.xml'", String::Quote(autoyast_copy), String::Quote(skel_root))); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.orig.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } else { // save the original file (a copy is not available) - Exec(sformat("/bin/cp %1 %2/autoinst.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp '%1' '%2/autoinst.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } } // Media nr. integer count = 1; - Exec(sformat("/bin/echo %1 >> %2/media.1/media ", count, skel_root)); + Exec(sformat("/bin/echo %1 >> '%2/media.1/media'", count, String::Quote(skel_root))); // make the source digitally unsigned (because signed descr/packages file has been modified) if (Config["code10"]:false) { // remove the key and the checksum - Exec(sformat("/bin/rm %1/content.asc %1/content.key", skel_root)); + Exec(sformat("/bin/rm '%1/content.asc' '%1/content.key'", String::Quote(skel_root))); // remove the meta information from content file - Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content > %1/content.new", skel_root)); - Exec(sformat("/bin/mv %1/content.new %1/content", skel_root)); + Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content' > '%1/content.new'", String::Quote(skel_root))); + Exec(sformat("/bin/mv '%1/content.new' '%1/content'", String::Quote(skel_root))); // recreate the index file - Exec(sformat("/bin/rm -f %1/directory.yast && /usr/bin/create_directory.yast %1", skel_root)); +// FIXME: use create_directory when it supports parameter with spaces +// Exec(sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(skel_root))); + Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(skel_root))); } @@ -1498,7 +1499,7 @@ if (!match) { // remove the pattern - string cmd = sformat("/bin/rm %1/%2/%3", skel_root, descrDir, f); + string cmd = sformat("/bin/rm -- '%1/%2/%3'", String::Quote(skel_root), String::Quote(descrDir), String::Quote(f)); y2milestone("removing pattern %1", f); success = success && Exec(cmd); y2debug("success: %1", success); @@ -1510,11 +1511,12 @@ if (refresh_diryast) { // regenerate directory.yast and patterns file - string cmd = sformat("/bin/rm -f '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + // FIXME: string cmd = sformat("/bin/rm -f -- '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + string cmd = sformat("/bin/rm -f '%1/%2/directory.yast'; cd '%1/%2'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); - cmd = sformat("cd %1/%2; ls *.pat > %1/%2/patterns", skel_root, descrDir); + cmd = sformat("cd '%1/%2'; ls *.pat > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); } @@ -1525,6 +1527,8 @@ y2debug("success: %1", success); }); + skel_root = main_skel_root; + string addon_file = CreateAddonFile(product_map); if (size(addon_file) > 0) { @@ -1636,7 +1640,8 @@ if (success) { // update directory.yast file - string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + // FIXME string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + string command = sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir)); y2milestone("Updating %1/directory.yast ...", dir); integer updated = (integer)SCR::Execute(.target.bash, command); y2milestone("Updated: %1", updated == 0); @@ -1739,13 +1744,13 @@ SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); } cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/message %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/message' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/options.msg %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/options.msg %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/options.msg' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); @@ -1917,7 +1922,7 @@ global boolean removeDestination() { string isodir = Config["iso-directory"]:"" + "/" + Config["name"]:""; - return (integer)SCR::Execute(.target.bash, "rm -rf " + isodir ) == 0; + return (integer)SCR::Execute(.target.bash, sformat("rm -rf -- '%1'", String::Quote(isodir)) ) == 0; } global boolean confirmDestinationRemoving() @@ -2100,7 +2105,7 @@ break; } - string cpCmd = sformat("cp -a %1 %2", l_packge, dir ); + string cpCmd = sformat("cp -a '%1' '%2'", String::Quote(l_packge), String::Quote(dir) ); y2debug("%1", cpCmd); @@ -2126,13 +2131,13 @@ // regenerate the metadata if (general_info["type"]:"" == "YUM") { - ret = ret && Exec(sformat("/usr/bin/createrepo %1/%2", basedir, subdir)); + ret = ret && Exec(sformat("/usr/bin/createrepo '%1/%2'", String::Quote(basedir), String::Quote(subdir))); } else { // TODO FIXME get datadir from the source - ret = ret && Exec(sformat("cd %1/%2/%3 && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", - basedir, subdir, datadir)); + ret = ret && Exec(sformat("cd '%1/%2/%3' && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", + String::Quote(basedir), String::Quote(subdir), String::Quote(datadir))); } } ); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Mon May 28 11:11:35 2007 @@ -16,6 +16,7 @@ import "Wizard_hw"; import "Report"; import "Arch"; + import "String"; import "ProductCreator"; @@ -107,7 +108,7 @@ contents = Wizard_hw::SpacingAround(contents2, 1.5, 1.5, 1.0, 1.0); Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", - Label::BackButton(), Label::FinishButton()); + Label::BackButton(), Label::CloseButton()); if (size(overview) == 0 ) { @@ -334,7 +335,7 @@ string pub = ProductCreator::Config["publisher"]:"anon"; string prep = ProductCreator::Config["preparer"]:"anon"; - map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b %1 | awk -F' ' ' { printf $1 }'", isodir )); + map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b '%1' | awk -F' ' ' { printf $1 }'", String::Quote(isodir) )); string du = output["stdout"]:""; y2milestone("Expected size: %1", du); @@ -343,7 +344,7 @@ Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string command = sformat("/usr/lib/YaST2/bin/y2mkiso %1 %2 %3", isodir, isofile, (ProductCreator::Config["code10"]:false) ? Arch::architecture() : ""); + string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? Arch::architecture() : "")); y2milestone("command: %1", command); SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Mon May 28 11:11:35 2007 @@ -239,7 +239,8 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("cd-creator"); - if (!Package::InstallAll(["inst-source-utils", "mkisofs"])) + // .content_file agent is in yast2-instserver package - TODO: move it to yast2.rpm + if (!Package::InstallAll(["inst-source-utils", "mkisofs", "yast2-instserver"])) { Popup::Error(_("Installation of required packages failed.")); -- 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] r38156 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:21:07 2007 New Revision: 38156 URL: http://svn.opensuse.org/viewcvs/yast?rev=38156&view=rev Log: Created tag stable-2_15_27 for installation Added: tags/stable-2_15_27/installation/ - copied from r38155, 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] r38155 - /tags/stable-2_15_34/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:48 2007 New Revision: 38155 URL: http://svn.opensuse.org/viewcvs/yast?rev=38155&view=rev Log: Created tag stable-2_15_34 for network Added: tags/stable-2_15_34/network/ - copied from r38154, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38154 - in /trunk/network: ./ package/ src/installation/ src/modules/ src/routines/ testsuite/tests/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:39 2007 New Revision: 38154 URL: http://svn.opensuse.org/viewcvs/yast?rev=38154&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Added: trunk/network/src/routines/save_network.ycp - copied, changed from r37972, trunk/network/src/routines/install.ycp Removed: trunk/network/src/installation/inst_netsetup.ycp trunk/network/src/routines/install.ycp trunk/network/testsuite/tests/install.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/Makefile.am trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetworkStorage.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38154&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 10:20:39 2007 @@ -1 +1 @@ -2.15.33 +2.15.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 10:20:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/network/src/installation/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/Makefil… ============================================================================== --- trunk/network/src/installation/Makefile.am (original) +++ trunk/network/src/installation/Makefile.am Mon May 28 10:20:39 2007 @@ -8,7 +8,7 @@ client_DATA = inst_ask_net_test.ycp inst_do_net_test.ycp \ inst_hostname.ycp \ - inst_netprobe.ycp inst_netsetup.ycp + inst_netprobe.ycp EXTRA_DIST = $(ynclude_DATA) $(client_DATA) $(ybin_SCRIPTS) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon May 28 10:20:39 2007 @@ -189,11 +189,6 @@ // FIXME: MOD list<string> DeletedModules = []; /** - * /etc/install.inf data - */ -map InstallInf = $[]; - -/** * Data was modified? */ boolean modified = false; @@ -312,7 +307,7 @@ } include "network/hardware.ycp"; -include "network/install.ycp"; +//include "network/install.ycp"; include "network/routines.ycp"; include "network/runtime.ycp"; @@ -439,7 +434,7 @@ if(Abort()) return false; /* Progress step 7/9 */ ProgressNextStage(_("Reading installation information...")); - ReadInstallInf(); +// ReadInstallInf(); sleep(sl); if(Abort()) return false; @@ -1559,9 +1554,10 @@ } else { // this is the first interface, match the hardware with install.inf - +/* + // couldn't happen if (size(InstallInf)>0){ - /* Select the one from install.inf with the same MAC */ + // Select the one from install.inf with the same MAC // find H["mac"] == InstallInf["hwaddr"] if (tosel == nil ) { string hwaddr = InstallInf["hwaddr"]:""; @@ -1571,7 +1567,7 @@ y2milestone("Rule: matching hwaddr in install.inf"); } - /* Select the one from install.inf with the same module */ + // Select the one from install.inf with the same module // find H["module"] == InstallInf["module"] if (tosel == nil) { string infmodule = InstallInf["module"]:""; @@ -1580,7 +1576,9 @@ } y2milestone("Rule: matching module in install.inf"); } - } else{ + } else +*/ + { /* No install.inf -> select the first connected */ // find H["active"] == true if (tosel == nil) { @@ -1675,7 +1673,7 @@ global define boolean ProposeInterfaces () { y2milestone("Hardware=%1", Hardware); - y2milestone("InstallInf=%1", InstallInf); +// y2milestone("InstallInf=%1", InstallInf); y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1710,7 +1708,7 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { if (Arch::s390()){ - tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); +// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); } else tosel = FindMatchingDevice($[]); @@ -1720,6 +1718,7 @@ y2debug("Hardware=%1", Hardware); y2milestone ("Selected HW w/o install.inf patches: %1", tosel); +/* // do not select a card without a driver, #29296 if (tosel != nil) { @@ -1736,12 +1735,12 @@ // SelectHW relies on the detected info (eg. busid) from hwinfo // which is not in install.inf + if (InstallInf["module"]:"" != "") { y2milestone ("Using driver module from install.inf"); tosel["module"] = InstallInf["module"]:""; } - // L3 bug: 75720 // Setup module options available from /etc/install.inf string _options = InstallModuleOptions(tosel["module"]:""); @@ -1755,9 +1754,9 @@ // set layer2 status from /etc/install.inf qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false; qeth_macaddress = InstallInf["LLADDR"]:""; - } - /* Nothing detected -> use InstallInf */ + // Nothing detected -> use InstallInf + else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1775,10 +1774,12 @@ type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } + else { y2milestone("No hardware, no install.inf -> no proposal."); return false; } +*/ // here we know the hardware and could fill the interface defaults for it, // like for wifi usercontrol and for eth|wifi ifplugd. @@ -1788,24 +1789,24 @@ SetDefaultsForHW (); // #145041 - ethtool_options = InstallInf["ethtool_options"]:""; +// ethtool_options = InstallInf["ethtool_options"]:""; // #176804 - if (NetworkStorage::RootIsOnNetwork ()) + if (NetworkStorage::RootIsOnNetwork ("/")) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); } - ipaddr = InstallInf["ipaddr"]:""; - bootproto = InstallInf["bootproto"]:"static"; +// ipaddr = InstallInf["ipaddr"]:""; +// bootproto = InstallInf["bootproto"]:"static"; y2debug("ipaddr,bootproto=%1,%2", ipaddr, bootproto); if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { y2milestone("static proposal"); /* propose address setup from /etc/install.inf */ - netmask = InstallInf["netmask"]:""; +// netmask = InstallInf["netmask"]:""; if(netmask == nil || netmask == "") netmask = "255.255.255.0"; } @@ -1854,12 +1855,13 @@ return false; } +/* y2milestone ("hostname from install.inf"); if (! DNS::ReadHostDomain (InstallInf["hostname"]:"", InstallInf["domain"]:"")) { y2milestone ("hostname from dns"); - /* try to get hostname from the network */ + // try to get hostname from the network string hnent = Detection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) @@ -1876,7 +1878,7 @@ } } - +*/ return true; } @@ -1887,10 +1889,10 @@ global define boolean ProposeRoutesAndResolver () { if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { /* propose default gateway from /etc/install.inf */ - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); /* propose DNS setup from /etc/install.inf */ - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1946,6 +1948,7 @@ SelectHWMap(tosel); } /* Nothing detected -> use InstallInf */ +/* else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1955,9 +1958,10 @@ NetworkModules::Alias = InstallInf["module"]:""; NetworkModules::Options = InstallInf["options"]:""; - type = InstallInf["type"]:"eth"; +// type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } +*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1990,7 +1994,7 @@ } Commit(); }); - } + } else { y2milestone ("no interface configuration, taking it from install.inf"); @@ -2002,12 +2006,12 @@ if (autoinstall_settings["routing", "routes"]:[] == []) { y2milestone ("gateway from install.inf"); - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); } if (autoinstall_settings["dns", "nameservers"]:[] == []) { y2milestone ("nameserver from install.inf"); - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); } if (autoinstall_settings["dns", "hostname"]:"" == "") { @@ -2037,7 +2041,7 @@ global define list<map> PrepareForAutoinst() { - ReadInstallInf(); +// ReadInstallInf(); Hardware = ReadHardware("netcard"); return Hardware; } Modified: trunk/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetworkStora… ============================================================================== --- trunk/network/src/modules/NetworkStorage.ycp (original) +++ trunk/network/src/modules/NetworkStorage.ycp Mon May 28 10:20:39 2007 @@ -13,16 +13,37 @@ module "NetworkStorage"; +global string getDevice(string mount_point){ + map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1|tr -d '\n'", mount_point)); + string device=deletechars(out["stdout"]:"", "1234567890"); + y2internal("%1", device); + return device; +} + +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map<string, any> disk, (list<map<string, any> >)SCR::Read(.probe.disk), { + y2milestone("%1", disk["dev_name"]:""); +y2internal("%1", device); + if (disk["dev_name"]:""==device){ + foreach(string row, disk["dev_names"]:[], { + if (issubstring(row, "iscsi")) ret=true; + }); + } + }); + return ret; +} + /** * If the root is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. * @return root dev over network */ -global boolean RootIsOnNetwork () { +global boolean RootIsOnNetwork (string root) { // in create_interface script there is similar code (if some changes needed, don't forget check also that file) // in case that parameter "root=..." is not defined (read from /proc/cmdline) say that device is NOT network - string iscsi_cmd = " - ROOT_DISK=$(grep ' / ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); + string iscsi_cmd = sformat(" + ROOT_DISK=$(grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); if [ -n \"$(echo $ROOT_DISK|grep 'by-id\\|by-uuid\\|by-path\\|by-label')\" ] then echo by-id or by-UUID or by-path or by-label @@ -32,7 +53,6 @@ ROOTPART=${ROOT_DISK##*/} fi - echo ROOTPART=\"$ROOTPART\" # use * and .. to get to the device containing ROOTPART case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in *session*) @@ -41,7 +61,7 @@ IS_ISCSI=false ;; esac $IS_ISCSI -"; +", root); map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd); y2milestone ("%1", out); return out["exit"]:-1 == 0; Copied: trunk/network/src/routines/save_network.ycp (from r37972, trunk/network/src/routines/install.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/save_networ… ============================================================================== --- trunk/network/src/routines/install.ycp (original) +++ trunk/network/src/routines/save_network.ycp Mon May 28 10:20:39 2007 @@ -16,6 +16,16 @@ import "Hostname"; import "IP"; import "NetworkDevices"; +import "FileUtils"; +import "Netmask"; +import "NetworkStorage"; +import "Installation"; +import "String"; + +map <string, any> InstallInf = $[]; + +// global variable because chrooted environment +boolean network_disk=false; /** * Read one install.inf item @@ -26,8 +36,10 @@ define boolean ReadInstallInfItem(path install_inf, string item, string var) { if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); +//y2internal("val %1 %2", item, val); if(val == nil) return false; if(val != "") InstallInf[item] = val; +//y2internal("%1", InstallInf); return true; } @@ -42,8 +54,6 @@ */ define boolean ReadInstallInf() { - InstallInf = $[]; - /* Detect install.inf location */ path install_inf = nil; if(SCR::Read(.target.size,"/etc/install.inf") > 0) { @@ -60,15 +70,21 @@ /* Read install.inf items */ ReadInstallInfItem(install_inf, "ipaddr", "IP"); ReadInstallInfItem(install_inf, "netmask", "Netmask"); + ReadInstallInfItem(install_inf, "bcast", "Broadcast"); + ReadInstallInfItem(install_inf, "remote_ip", "Pointopoint"); + ReadInstallInfItem(install_inf, "mtu", "IP_MTU"); ReadInstallInfItem(install_inf, "bootproto", "NetConfig"); ReadInstallInfItem(install_inf, "netdevice", "Netdevice"); ReadInstallInfItem(install_inf, "gateway", "Gateway"); ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); + ReadInstallInfItem(install_inf, "domain", "Domain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "options", "Options"); +// ReadInstallInfItem(install_inf, "options", "Options"); ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); + ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); + ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); @@ -77,9 +93,8 @@ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { string devtype = NetworkDevices::device_type(netdevice); - if(devtype != nil && devtype != "") - InstallInf["type"] = devtype; - InstallInf = remove(InstallInf, "netdevice"); + if(devtype != nil && devtype != "") InstallInf["type"] = devtype; +// InstallInf = remove(InstallInf, "netdevice"); } /* Split FQ hostname */ @@ -150,6 +165,229 @@ return ""; } +map<string, any> getcfg(string options, string device){ + map <string, any> cfg=$[]; + map <string, any> output = (map <string, any>)SCR::Execute(.target.bash_output, + sformat("getcfg %1 %2", options, device)); +// if (output["exit"]:0==0){ + foreach(string row, splitstring(output["stdout"]:"", "\n"), { + row=deletechars(row, "\\\"\;"); + list<string> keyval=splitstring(row, "="); + if (size(keyval)>1) cfg[keyval[0]:""]=keyval[1]:""; + + }); +// } + y2milestone("%1 %2\n%3", options, device, cfg); + return cfg; +} + +string getHWFullPath(string hwfile){ + return sformat("%1/hwcfg-%2", "/etc/sysconfig/hardware", hwfile); +} + + +map <string,any> hwcfg=$[]; + +string CreateHardwareFile(){ + string hwfile=""; + + // read current hardware information and check if configuration file exists + hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:""); + if( tointeger(hwcfg["HWD_CONFIG_N"]:"0")==0 ){ + y2internal("hwcfg doesn't exist"); + // check if deriver is connected to bus + if (tointeger(hwcfg["HWD_BUS_N"]:"0")>0){ + string busname = hwcfg[sformat("HWD_BUSNAME_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + string busid = hwcfg[sformat("HWD_BUSID_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + if (busname == "vio" && FileUtils::IsDirectory("/proc/iSeries")){ + // Bug 159652 - LTC22358 - no hwcfg-static files created for iseries_veth + hwfile = sformat("static-0"); + y2warning("vio bus type, using %1", hwfile); + } else { + hwfile = sformat("bus-%1-%2", busname, busid); + y2internal("will create hwcfg file %1", hwfile); + } + + } else { + hwfile = sformat("static-0"); + y2error("Not connected to bus! Using %1", hwfile); + } + string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:""); + y2internal ("creating %1 file\n%2", hwfile, content); + SCR::Write(.target.string, getHWFullPath(hwfile), content); + }else { + // in case of s390 hwcfg is created by Linuxrc (uli) + y2warning("hwcfg already exists"); + hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:""; + y2internal("configuration name = %1", hwfile); + } + y2internal("Hardware file: %1", getHWFullPath(hwfile)); + + return hwfile; +} + +string getIfcName(string hwfile){ + string ifcfg=""; + string interfacetype = NetworkDevices::device_type( hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:"" ); + // for special s390 interface types write static configuration + if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){ + y2internal("special device type %1", interfacetype); + ifcfg=sformat("ifcfg-%1", hwfile); + } else { + y2internal("usual type %1", interfacetype); + // if MAC available - use it for name + if (size(hwcfg["HWD_ID"]:"")>0){ + ifcfg = sformat("ifcfg-%1-id-%2", interfacetype, hwcfg["HWD_ID"]:""); + y2internal("MAC address available - use it for name %1", ifcfg); + } else { + // in case MAC is not available, use device name (eth0) + ifcfg = sformat("ifcfg-%1", hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:""); + y2internal("MAC address not available - use device name %1", ifcfg); + } + } + y2internal("interface configuration file %1", ifcfg); + return ifcfg; +} + +void CreateIfcfg(string hwcfg, string ifcfg){ + 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"); + } + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + + if (size(InstallInf["unique"]:"")>0) + { + // write UNIQUE - #suse25739 + network_configuration = sformat("%1UNIQUE='%2'\n", network_configuration, InstallInf["unique"]:""); + // write UDI + list<map> cards=(list<map>)SCR::Read(.probe.netcard); + foreach(map card, cards, { + if (card["unique_key"]:""==InstallInf["unique"]:"") network_configuration = sformat("%1udi='%2'\n", network_configuration, card["udi"]:""); + }); + } + + if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } + + // 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"]:""); + + + y2internal("Network Configuration:\n%1\n%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); +} + +/* + * create all network files except ifcfg and hwcfg + * directly to installed system + */ + +void CreateOtherNetworkFiles(){ + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:""); + } else y2warning("No routing information in install.inf"); + + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + // create resolv.conf + if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){ + string text=sformat("domain %1 +nameserver %2", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + + // create defaultdomain + if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["domain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["domain"]:""); + } + + // 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"]:"")); + } +} + +/* + * this replaces bash script create_interface + */ +void save_network(){ + + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + SCR::Execute(.target.bash, sformat("cp /etc/sysconfig/hardware/* %1/etc/sysconfig/hardware/ 2>/dev/null", Installation::destdir)); + + // 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))); + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if(ReadInstallInf()){ + string hwcfg = CreateHardwareFile(); + string ifcfg = getIfcName(hwcfg); + + CreateIfcfg(hwcfg, ifcfg); + 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!"); + +} +save_network(); /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0