May 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57246 - /tags/stable-2_17_61/SLE-11-SP1-Stash/
by mzugec＠svn.opensuse.org 19 May '09

19 May '09

Author: mzugec Date: Tue May 19 15:42:04 2009 New Revision: 57246 URL: http://svn.opensuse.org/viewcvs/yast?rev=57246&view=rev Log: Created tag stable-2_17_61 for SLE-11-SP1-Stash/ Added: tags/stable-2_17_61/SLE-11-SP1-Stash/ -- 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] r57245 - in /branches/tmp/SLE-11-SP1-Stash/printer: VERSION package/yast2-printer.changes
by mzugec＠svn.opensuse.org 19 May '09

19 May '09

Author: mzugec Date: Tue May 19 15:41:53 2009 New Revision: 57245 URL: http://svn.opensuse.org/viewcvs/yast?rev=57245&view=rev Log: fixed: creating AY profile (bnc#504762) Modified: branches/tmp/SLE-11-SP1-Stash/printer/VERSION branches/tmp/SLE-11-SP1-Stash/printer/package/yast2-printer.changes Modified: branches/tmp/SLE-11-SP1-Stash/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/printer/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/printer/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/printer/VERSION Tue May 19 15:41:53 2009 @@ -1 +1 @@ -2.17.60 +2.17.61 Modified: branches/tmp/SLE-11-SP1-Stash/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/printer/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/printer/package/yast2-printer.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/printer/package/yast2-printer.changes Tue May 19 15:41:53 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 19 15:41:17 CEST 2009 - mzugec(a)suse.cz + +- fixed: creating AY profile (bnc#504762) +- 2.17.61 + +------------------------------------------------------------------- Mon Mar 23 19:51:54 CET 2009 - mzugec(a)suse.de - Fixed a few bugs in the "More Drivers" functionality. -- 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] r57244 - /tags/stable-2_18_16/printer/
by mzugec＠svn.opensuse.org 19 May '09

19 May '09

Author: mzugec Date: Tue May 19 15:40:31 2009 New Revision: 57244 URL: http://svn.opensuse.org/viewcvs/yast?rev=57244&view=rev Log: Created tag stable-2_18_16 for printer Added: tags/stable-2_18_16/printer/ - copied from r57243, trunk/printer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r57243 - in /trunk/printer: VERSION agents/ag_cups package/yast2-printer.changes
by mzugec＠svn.opensuse.org 19 May '09

19 May '09

Author: mzugec Date: Tue May 19 15:40:22 2009 New Revision: 57243 URL: http://svn.opensuse.org/viewcvs/yast?rev=57243&view=rev Log: fixed: creating AY profile (bnc#504762) Modified: trunk/printer/VERSION trunk/printer/agents/ag_cups trunk/printer/package/yast2-printer.changes Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=57243&r1=572… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue May 19 15:40:22 2009 @@ -1 +1 @@ -2.18.15 +2.18.16 Modified: trunk/printer/agents/ag_cups URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/agents/ag_cups?rev=57243… ============================================================================== --- trunk/printer/agents/ag_cups (original) +++ trunk/printer/agents/ag_cups Tue May 19 15:40:22 2009 @@ -14,7 +14,7 @@ sub createOrInsert { my ($line, $data_ref) = @_; - if ( $line=~/(\w*)\s+([\w\W]*)/){ + if ( $line=~/\s*(\w*)\s+([\w\W]*)/){ # add to existing list if (exists $$data_ref{$1}){ push(@{$$data_ref{$1}}, $2); Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue May 19 15:40:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 19 15:39:34 CEST 2009 - mzugec(a)suse.cz + +- fixed: creating AY profile (bnc#504762) +- 2.18.16 + +------------------------------------------------------------------- Thu Apr 30 15:07:49 CEST 2009 - jsmeix(a)suse.de - In the Print via Network dialog changed ambiguous wording -- 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] r57242 - in /trunk/ncurses/src: NCTable.cc NCTable.h NCTablePad.cc NCTablePad.h
by gs＠svn.opensuse.org 19 May '09

19 May '09

Author: gs Date: Tue May 19 14:13:55 2009 New Revision: 57242 URL: http://svn.opensuse.org/viewcvs/yast?rev=57242&view=rev Log: add the possibility to set a particular sort strategy for table sorting Modified: trunk/ncurses/src/NCTable.cc trunk/ncurses/src/NCTable.h trunk/ncurses/src/NCTablePad.cc trunk/ncurses/src/NCTablePad.h Modified: trunk/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.cc?rev=57242… ============================================================================== --- trunk/ncurses/src/NCTable.cc (original) +++ trunk/ncurses/src/NCTable.cc Tue May 19 14:13:55 2009 @@ -137,6 +137,18 @@ YTable::setTableHeader( th ); } +// +// Return table header as string vector (alignment removed) +// +void NCTable::getHeader( vector<string> & header ) +{ + header.assign( _header.size(), "" ); + + for ( unsigned int i = 0; i < _header.size(); i++ ) + { + header[ i ] = _header[i].Str().substr( 1 ); // remove alignment + } +} // Set alignment of i-th table column (left, right, center). Modified: trunk/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.h?rev=57242&… ============================================================================== --- trunk/ncurses/src/NCTable.h (original) +++ trunk/ncurses/src/NCTable.h Tue May 19 14:13:55 2009 @@ -37,6 +37,10 @@ bool bigList() const { return biglist; } void setHeader( vector <string> head ); + void getHeader( vector <string> & head ); + + //vector<NCstring> getHeader( ) const { return _header }; + virtual void setAlignment( int col, YAlignmentType al ); void setBigList( const bool big ) { biglist = big; } @@ -82,6 +86,7 @@ void stripHotkeys() { myPad()->stripHotkeys(); } + void setSortStrategy( NCTableSortStrategyBase * newStrategy ) { myPad()->setSortStrategy( newStrategy ); } protected: Modified: trunk/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.cc?rev=57… ============================================================================== --- trunk/ncurses/src/NCTablePad.cc (original) +++ trunk/ncurses/src/NCTablePad.cc Tue May 19 14:13:55 2009 @@ -33,6 +33,7 @@ , Headline( 0 ) , Items( 0 ) , citem( 0 ) + , sortStrategy ( new NCTableSortDefault ) { } @@ -316,24 +317,23 @@ return false; } -static int column = -1; - -static bool compare_column( NCTableLine* first, NCTableLine* second ) -{ - return first->GetCol( column )->Label().getText().begin()->str() - < second->GetCol( column )->Label().getText().begin()->str(); -} - +// +// Set order, means sort the table according to given column +// (call particular sort strategy). +// void NCTablePad::setOrder( int col ) { - if (column != col) + if ( col < 0 ) + return; + + if ( sortStrategy->getColumn() != col ) { - column = col; - std::sort( Items.begin(), Items.end(), compare_column ); + sortStrategy->setColumn( col ); + sortStrategy->sort( Items.begin(), Items.end(), col ); } else std::reverse( Items.begin(), Items.end() ); - + dirty = true; update(); } Modified: trunk/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.h?rev=572… ============================================================================== --- trunk/ncurses/src/NCTablePad.h (original) +++ trunk/ncurses/src/NCTablePad.h Tue May 19 14:13:55 2009 @@ -31,6 +31,59 @@ using std::vector; +class NCTableSortStrategyBase +{ +public: + NCTableSortStrategyBase( ) { _uiColumn = -1; } + + virtual ~NCTableSortStrategyBase() {} + + virtual void sort ( + vector<NCTableLine *>::iterator itemsBegin, + vector<NCTableLine *>::iterator itemsEnd, + int uiColumn + ) = 0; + int getColumn () { return _uiColumn; } + void setColumn ( int column) { _uiColumn = column; } + +private: + int _uiColumn; + +}; + +class NCTableSortDefault : public NCTableSortStrategyBase { +public: + virtual void sort ( + vector<NCTableLine *>::iterator itemsBegin, + vector<NCTableLine *>::iterator itemsEnd, + int uiColumn + ) + { + std::sort ( itemsBegin, itemsEnd, Compare(uiColumn) ); + } + +private: + class Compare + { + public: + Compare ( int uiCol) + : _uiCol ( uiCol ) + {} + + bool operator() ( NCTableLine * first, + NCTableLine * second + ) const + { + return first->GetCol( _uiCol )->Label().getText().begin()->str() + < second->GetCol( _uiCol )->Label().getText().begin()->str(); + } + private: + int _uiCol; + }; + + +}; + class NCTableTag : public NCTableCol { private: @@ -93,6 +146,8 @@ vector<NCTableLine*> Items; wpos citem; + std::auto_ptr<NCTableSortStrategyBase> sortStrategy; + void assertLine( unsigned idx ); protected: @@ -178,6 +233,13 @@ NCTableLine * ModifyLine( unsigned idx ); void stripHotkeys(); + + void setSortStrategy ( + NCTableSortStrategyBase* newSortStrategy // dyn. allocated + ) + { + sortStrategy.reset ( newSortStrategy ); + } }; -- 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] r57241 - in /trunk/bootloader: package/yast2-bootloader.changes src/clients/bootloader_proposal.ycp src/grub/misc.ycp src/modules/BootSupportCheck.ycp
by juhliarik＠svn.opensuse.org 18 May '09

18 May '09

Author: juhliarik Date: Mon May 18 17:46:56 2009 New Revision: 57241 URL: http://svn.opensuse.org/viewcvs/yast?rev=57241&view=rev Log: added fixes for soft-raids Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_proposal.ycp trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon May 18 17:46:56 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 18 17:45:52 CEST 2009 - juhliarik(a)suse.cz + +- added fix for changing device map in y2-bootloader (bnc#497944) +- added warning message if there is not valid configuration for + soft-raid (bnc#501043) + +------------------------------------------------------------------- Thu May 7 10:05:02 CEST 2009 - juhliarik(a)suse.cz - added fix for checking soft-raid devices in device.map Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Mon May 18 17:46:56 2009 @@ -120,8 +120,6 @@ ] ); } - - } //F#300779 - Install diskless client (NFS-root) Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon May 18 17:46:56 2009 @@ -185,9 +185,24 @@ list<list<string> > underlying_devs = []; list<string> devs = []; + list<string> boot_devices = []; + + // bnc#494630 - add also boot partitions from soft-raids + string boot_device = BootCommon::getBootPartition(); + if (substring (boot_device, 0, 7) == "/dev/md") + { + boot_devices = add(boot_devices, boot_device); + foreach (string dev, BootCommon::GetBootloaderDevices(), { + boot_devices = add(boot_devices, dev); + }); + } else { + + boot_devices = BootCommon::GetBootloaderDevices(); + } + // get a list of all bootloader devices or their underlying soft-RAID // devices, if necessary - underlying_devs = maplist (string dev, BootCommon::GetBootloaderDevices(), { + underlying_devs = maplist (string dev, boot_devices, { md = BootCommon::Md2Partitions(dev); if ( size(md) > 0 ) { devs = maplist (string k, integer v, md, ``(k)); Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Mon May 18 17:46:56 2009 @@ -171,58 +171,74 @@ global boolean check_BootDevice() { - boolean result = true; - string boot_device = ""; + boolean result = true; + string boot_device = ""; - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + boot_device = BootCommon::getBootPartition(); - boot_device = BootCommon::getBootPartition(); + // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice) + // AddNewProblem (_("Doesn't exist separete /boot partition")); - // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice) - // AddNewProblem (_("Doesn't exist separete /boot partition")); - - boolean found_boot = false; - // check if boot device is on raid0 - if (boot_device != "") + boolean found_boot = false; + // check if boot device is on raid0 + if (boot_device != "") + { + foreach (string k, map v, devices, { - foreach (string k, map v, devices, + foreach (map p, (list<map>)(v["partitions"]:[]), + { + if (p["device"]:"" == boot_device) { - foreach (map p, (list<map>)(v["partitions"]:[]), + if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid)) + { + AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."), + p["raid_type"]:"")); + y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:""); + result = false; + break; + } else { + // bnc#501043 added check for valid configuration + if ((p["raid_type"]:"" == "raid1") && (p["type"]:nil ==`sw_raid)) { - if (p["device"]:"" == boot_device) - { - if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid)) - { - AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."), p["raid_type"]:"")); - y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:""); - result = false; - break; - } else { - found_boot = true; - y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:""); - //break; - } - - // check if /boot directory is on supported filesystem - if (p["used_fs"]:nil == `xfs) { - AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot.")); - y2error ("The /boot directory is on an XFS filesystem"); - result = false; - break; - } else { - found_boot = true; - y2milestone ("/boot filesystem is OK"); - break; - } - - } - }); - if ((!result) || (found_boot)) - break; - }); - } - return result; + if ((tolower(p["fstype"]:"") == "md raid") && + (BootCommon::globals["boot_mbr"]:"false" != "true")) + { + result = false; + AddNewProblem (_("The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record")); + y2error("Booting from soft-raid: %1 and bootloader setting are not valid: %2", + p, BootCommon::globals); + } else { + found_boot = true; + y2milestone("Valid configuration for soft-raid"); + } + + } else { + found_boot = true; + y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:""); + } + } + // check if /boot directory is on supported filesystem + if (p["used_fs"]:nil == `xfs) + { + AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot.")); + y2error ("The /boot directory is on an XFS filesystem"); + result = false; + break; + } else { + found_boot = true; + y2milestone ("/boot filesystem is OK"); + break; + } + + } + }); + if ((!result) || (found_boot)) + break; + }); + } + return result; } /** -- 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] r57240 - in /branches/tmp/SLE-11-SP1-Stash/bootloader: package/yast2-bootloader.changes src/clients/bootloader_proposal.ycp src/grub/misc.ycp src/modules/BootGRUB.ycp src/modules/BootSupportCheck.ycp
by juhliarik＠svn.opensuse.org 18 May '09

18 May '09

Author: juhliarik Date: Mon May 18 17:27:57 2009 New Revision: 57240 URL: http://svn.opensuse.org/viewcvs/yast?rev=57240&view=rev Log: added 3 fixes for soft-raids Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/package/yast2-bootloader.changes branches/tmp/SLE-11-SP1-Stash/bootloader/src/clients/bootloader_proposal.ycp branches/tmp/SLE-11-SP1-Stash/bootloader/src/grub/misc.ycp branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootGRUB.ycp branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootSupportCheck.ycp Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/bootload… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/bootloader/package/yast2-bootloader.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/bootloader/package/yast2-bootloader.changes Mon May 18 17:27:57 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon May 18 17:26:50 CEST 2009 - juhliarik(a)suse.cz + +- added fix for checking soft-raid devices in device.map + (bnc#494630) +- added fix for changing device map in y2-bootloader (bnc#497944) +- added warning message if there is not valid configuration for + soft-raid (bnc#501043) + +------------------------------------------------------------------- Thu Apr 16 15:19:37 CEST 2009 - juhliarik(a)suse.cz - added fix for commandline interface (bnc#479069) Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/bootload… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/bootloader/src/clients/bootloader_proposal.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/bootloader/src/clients/bootloader_proposal.ycp Mon May 18 17:27:57 2009 @@ -119,7 +119,6 @@ The range is limited by BIOS to the first 8 devices."), ] ); - return ret; } Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/bootload… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/bootloader/src/grub/misc.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/bootloader/src/grub/misc.ycp Mon May 18 17:27:57 2009 @@ -185,9 +185,24 @@ list<list<string> > underlying_devs = []; list<string> devs = []; + list<string> boot_devices = []; + + // bnc#494630 - add also boot partitions from soft-raids + string boot_device = BootCommon::getBootPartition(); + if (substring (boot_device, 0, 7) == "/dev/md") + { + boot_devices = add(boot_devices, boot_device); + foreach (string dev, BootCommon::GetBootloaderDevices(), { + boot_devices = add(boot_devices, dev); + }); + } else { + + boot_devices = BootCommon::GetBootloaderDevices(); + } + // get a list of all bootloader devices or their underlying soft-RAID // devices, if necessary - underlying_devs = maplist (string dev, BootCommon::GetBootloaderDevices(), { + underlying_devs = maplist (string dev, boot_devices, { md = BootCommon::Md2Partitions(dev); if ( size(md) > 0 ) { devs = maplist (string k, integer v, md, ``(k)); @@ -1203,6 +1218,7 @@ { boolean result = false; + if (size(BootCommon::device_mapping)>8) { result = false; @@ -1242,7 +1258,7 @@ } }); } else { - y2milestone("Device map includes less than 9 devices."); + y2milestone("Device map includes less than 9 devices."); } return result; } Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/bootload… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootGRUB.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootGRUB.ycp Mon May 18 17:27:57 2009 @@ -865,14 +865,75 @@ ]; } +/** bnc#494630 GRUB configuration in installation workflow fail with more than 8 disks on software raid + * Return all disks for checking in device map + * + * @param string boot disk + * @return list<string> disk devices + */ +list <string> ReturnAllDisks(string boot_disk) +{ + list <string> ret = []; + map tm = Storage::GetTargetMap (); + map b_disk = tm[boot_disk]:$[]; + if (b_disk["type"]:nil == `CT_MD) + { + string boot_partition = BootCommon::getBootPartition(); + list b_disk_partitions = b_disk["partitions"]:[]; + foreach (map p, (list<map>)b_disk_partitions, + { + if (p["device"]:"" == boot_partition) + { + if ((size(p["devices"]:[]) > 0) && (p["type"]:nil == `sw_raid)) + { + foreach(string dev, p["devices"]:[], + { + map p_dev = Storage::GetDiskPartition (dev); + string disk_dev = p_dev["disk"]:""; + if (disk_dev != "") + ret = add(ret, disk_dev); + else + y2error("Real disk was not found for device: %1", dev); + }); + } else { + if (p["type"]:nil == `sw_raid) + y2error("soft raid partition: %1 doesn't include any devices: %2", + boot_partition, p["devices"]:[]); + else + y2error("Disk is not soft-raid %1", b_disk); + ret = add(ret, boot_disk); + + } + } + }); + } else { + y2milestone("Boot disk is not on MD-RAID"); + ret = add(ret, boot_disk); + } + y2milestone("Devices for checking if they are in device map: %1", ret); + return ret; +} + +/** bnc#494630 GRUB configuration in installation workflow fail with more than 8 disks on software raid + * Function check if boot disk is in device map + * + * @return boolean true if boot device is not in device map + */ global boolean CheckDeviceMap() { // FATE #303548 - Grub: limit device.map to devices detected by BIOS boolean ret = false; string boot_disk = BootCommon::getBootDisk(); - if (boot_disk != "") - ret = checkBootDeviceInDeviceMap(boot_disk, BootCommon::Dev2MountByDev(boot_disk)); + list <string> disks = ReturnAllDisks(boot_disk); + if (size(disks) > 0) + { + foreach(string disk, disks, + { + ret = ret || checkBootDeviceInDeviceMap(disk, BootCommon::Dev2MountByDev(disk)); + }); + + } return ret; Modified: branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/bootload… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootSupportCheck.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/bootloader/src/modules/BootSupportCheck.ycp Mon May 18 17:27:57 2009 @@ -170,58 +170,76 @@ global boolean check_BootDevice() { - boolean result = true; - string boot_device = ""; + boolean result = true; + string boot_device = ""; - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - boot_device = BootCommon::getBootPartition(); + boot_device = BootCommon::getBootPartition(); - // if (BootCommon::BootPartitionDevice == BootCommon::RootPartitionDevice) - // AddNewProblem (_("Doesn't exist separete /boot partition")); + // if (BootCommon::BootPartitionDevice == BootCommon::RootPartitionDevice) + // AddNewProblem (_("Doesn't exist separete /boot partition")); - boolean found_boot = false; - // check if boot device is on raid0 - if (boot_device != "") + boolean found_boot = false; + // check if boot device is on raid0 + if (boot_device != "") + { + foreach (string k, map v, devices, { - foreach (string k, map v, devices, + foreach (map p, (list<map>)(v["partitions"]:[]), + { + if (p["device"]:"" == boot_device) { - foreach (map p, (list<map>)(v["partitions"]:[]), + if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid)) + { + AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."), + p["raid_type"]:"")); + y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:""); + result = false; + break; + } else { + // bnc#501043 added check for valid configuration + if ((p["raid_type"]:"" == "raid1") && (p["type"]:nil ==`sw_raid)) { - if (p["device"]:"" == boot_device) - { - if ((p["raid_type"]:"" != "raid1") && (p["type"]:nil ==`sw_raid)) - { - AddNewProblem (sformat(_("The boot device is on raid type: %1. System will not boot."), p["raid_type"]:"")); - y2error("The boot device: %1 is on raid type: %2", boot_device, p["raid_type"]:""); - result = false; - break; - } else { - found_boot = true; - y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:""); - //break; - } - - // check if /boot directory is on supported filesystem - if (p["used_fs"]:nil == `xfs) { - AddNewProblem (_("The /boot directory is on an XFS filesystem. System will not boot.")); - y2error ("The /boot directory is on an XFS filesystem"); - result = false; - break; - } else { - found_boot = true; - y2milestone ("/boot filesystem is OK"); - break; - } - - } - }); - if ((!result) || (found_boot)) - break; - }); - } - return result; + if ((tolower(p["fstype"]:"") == "md raid") && + (BootCommon::globals["boot_mbr"]:"false" != "true")) + { + result = false; + AddNewProblem (_("The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record")); + y2error("Booting from soft-raid: %1 and bootloader setting are not valid: %2", + p, BootCommon::globals); + } else { + found_boot = true; + y2milestone("Valid configuration for soft-raid"); + } + + } else { + found_boot = true; + y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:""); + } + } + + // check if /boot directory is on supported filesystem + if (p["used_fs"]:nil == `xfs) + { + AddNewProblem (_("The /boot directory is on an XFS filesystem. System will not boot.")); + y2error ("The /boot directory is on an XFS filesystem"); + result = false; + break; + } else { + found_boot = true; + y2milestone ("/boot filesystem is OK"); + break; + } + + } + }); + if ((!result) || (found_boot)) + break; + }); + } + return result; } /** -- 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] r57239 - in /trunk/installation: control/control.openSUSE.xml package/yast2-installation.changes
by juhliarik＠svn.opensuse.org 18 May '09

18 May '09

Author: juhliarik Date: Mon May 18 16:50:03 2009 New Revision: 57239 URL: http://svn.opensuse.org/viewcvs/yast?rev=57239&view=rev Log: added kdump support for autoyast installation FATE#305588 Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 18 16:50:03 2009 @@ -171,6 +171,9 @@  <default_ntp_setup config:type="boolean">true</default_ntp_setup> +  + <enable_kdump config:type="boolean">true</enable_kdump> +  <debug_deploying config:type="boolean">false</debug_deploying> </globals> @@ -347,6 +350,7 @@ <clone_module>software</clone_module> <clone_module>partitioning</clone_module> <clone_module>bootloader</clone_module> + <clone_module>kdump</clone_module> </clone_modules> <texts> 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 18 16:50:03 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 18 16:46:03 CEST 2009 - juhliarik(a)suse.cz + +- added kdump support for autoyast installation (FATE#305588) + +------------------------------------------------------------------- Thu May 14 13:45:08 CEST 2009 - locilka(a)suse.cz - Installation/Upgrade newly require some packages essential for -- 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] r57238 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 18 May '09

18 May '09

Author: aschnell Date: Mon May 18 16:35:18 2009 New Revision: 57238 URL: http://svn.opensuse.org/viewcvs/yast?rev=57238&view=rev Log: - use Report intead of Popup Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon May 18 16:35:18 2009 @@ -36,6 +36,7 @@ import "Mode"; import "Partitions"; import "Popup"; + import "Report"; import "Misc"; import "HTML"; import "StorageDevices"; @@ -4344,7 +4345,7 @@ if (!PackagesProposal::SetResolvables(proposal_ID, `package, pkgs)) { y2error("PackagesProposal::SetResolvables() for %1 failed", pkgs); - Popup::Error(sformat(_("Add the following resolvables failed: %1"), pkgs)); + Report::Error(sformat(_("Add the following resolvables failed: %1"), pkgs)); } if( Stage::initial() ) -- 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] r57237 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 18 May '09

18 May '09

Author: aschnell Date: Mon May 18 16:31:20 2009 New Revision: 57237 URL: http://svn.opensuse.org/viewcvs/yast?rev=57237&view=rev Log: - added error popup (bnc #398001) Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon May 18 16:31:20 2009 @@ -4341,7 +4341,11 @@ //Set rather than Add, there might be some packs left over //from previous 'MakeProposal' we don't need now //This also covers the case when AddPackagesList returns [] or nil - PackagesProposal::SetResolvables( proposal_ID, `package, pkgs ); + if (!PackagesProposal::SetResolvables(proposal_ID, `package, pkgs)) + { + y2error("PackagesProposal::SetResolvables() for %1 failed", pkgs); + Popup::Error(sformat(_("Add the following resolvables failed: %1"), pkgs)); + } if( Stage::initial() ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0