April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56936 - in /trunk/storage/libstorage/src: Disk.cc Disk.h
by aschnell＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: aschnell Date: Thu Apr 23 15:45:02 2009 New Revision: 56936 URL: http://svn.opensuse.org/viewcvs/yast?rev=56936&view=rev Log: - added some const Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Apr 23 15:45:02 2009 @@ -583,7 +583,7 @@ bool Disk::scanPartedLine( const string& Line, unsigned& nr, unsigned long& start, unsigned long& csize, PartitionType& type, unsigned& id, - bool& boot ) + bool& boot ) const { unsigned long StartM, EndM; string PartitionType, TInfo; @@ -846,7 +846,7 @@ bool Disk::checkPartedValid(const ProcPart& pp, const string& diskname, - list<Partition*>& pl, unsigned long& range_exceed) + list<Partition*>& pl, unsigned long& range_exceed) const { unsigned ext_nr = 0; bool ret=true; @@ -1395,13 +1395,13 @@ } int Disk::createChecks( PartitionType& type, unsigned long start, - unsigned long len, bool checkRelaxed ) + unsigned long len, bool checkRelaxed ) const { y2mil("begin type " << type << " at " << start << " len " << len << " relaxed:" << checkRelaxed); unsigned fuzz = checkRelaxed ? 2 : 0; int ret = 0; Region r( start, len ); - PartPair ext = partPair(notDeletedExt); + ConstPartPair ext = partPair(notDeletedExt); if( type==PTYPE_ANY ) { if( ext.empty() || !ext.begin()->contains( Region(start,1) )) @@ -1429,9 +1429,8 @@ } if( ret==0 ) { - PartPair p = (type!=LOGICAL) ? partPair( notDeleted ) - : partPair( notDeletedLog ); - PartIter i = p.begin(); + ConstPartPair p = (type != LOGICAL) ? partPair(notDeleted) : partPair(notDeletedLog); + ConstPartIter i = p.begin(); while( i!=p.end() && !i->intersectArea( r, fuzz )) { ++i; @@ -1458,7 +1457,7 @@ } } y2mil("ret:" << ret); - return( ret ); + return ret; } int Disk::changePartitionArea( unsigned nr, unsigned long start, @@ -2014,7 +2013,7 @@ } bool -Disk::getPartedValues( Partition *p ) +Disk::getPartedValues( Partition *p ) const { bool ret = false; if( getStorage()->test() ) @@ -2060,7 +2059,7 @@ bool Disk::getPartedSectors( const Partition *p, unsigned long long& start, - unsigned long long& end ) + unsigned long long& end ) const { bool ret = false; if( getStorage()->test() ) @@ -2549,12 +2548,12 @@ return( ret ); } -const Partition * Disk::getPartitionAfter( const Partition * p ) +const Partition* Disk::getPartitionAfter(const Partition* p) const { - const Partition * ret = NULL; + const Partition* ret = NULL; y2mil( "p:" << *p ); - PartPair pp = partPair( (p->type()==LOGICAL)?notDeleted:notDeletedLog ); - for( PartIter pi=pp.begin(); pi!=pp.end(); ++pi ) + ConstPartPair pp = partPair((p->type() == LOGICAL) ? notDeleted : notDeletedLog); + for (ConstPartIter pi = pp.begin(); pi != pp.end(); ++pi) { if( !pi->created() && pi->cylStart()>p->cylStart() && @@ -2565,7 +2564,7 @@ y2mil( "ret:NULL" ); else y2mil( "ret:" << *ret ); - return( ret ); + return ret; } unsigned Disk::numPartitions() const Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Thu Apr 23 15:45:02 2009 @@ -173,13 +173,13 @@ bool scanPartedLine( const string& Line, unsigned& nr, unsigned long& start, unsigned long& csize, storage::PartitionType& type, - unsigned& id, bool& boot ); + unsigned& id, bool& boot ) const; bool checkPartedValid( const ProcPart& pp, const string& diskname, - std::list<Partition*>& pl, unsigned long& rng ); - bool getPartedValues( Partition *p ); + std::list<Partition*>& pl, unsigned long& rng ) const; + bool getPartedValues( Partition *p ) const; bool getPartedSectors( const Partition *p, unsigned long long& start, - unsigned long long& end ); - const Partition * getPartitionAfter( const Partition * p ); + unsigned long long& end ) const; + const Partition * getPartitionAfter( const Partition * p ) const; virtual void print( std::ostream& s ) const { s << *this; } virtual Container* getCopy() const { return( new Disk( *this ) ); } void getGeometry( const string& line, unsigned long& c, @@ -188,7 +188,7 @@ void changeNumbers( const PartIter& b, const PartIter& e, unsigned start, int incr ); int createChecks( storage::PartitionType& type, unsigned long start, - unsigned long len, bool checkRelaxed ); + unsigned long len, bool checkRelaxed ) const; void removePresentPartitions(); void removeFromMemory(); void enlargeGpt(); -- 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] r56935 - /trunk/packager/src/include/repositories_include.ycp
by lslezak＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: lslezak Date: Thu Apr 23 15:44:35 2009 New Revision: 56935 URL: http://svn.opensuse.org/viewcvs/yast?rev=56935&view=rev Log: - ISO over sfto is also not supported Modified: trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Thu Apr 23 15:44:35 2009 @@ -276,10 +276,10 @@ map parsed_url = URL::Parse(url); string scheme = tolower(parsed_url["scheme"]:""); - if (contains(["ftp", "http", "https"], scheme)) + if (contains(["ftp", "sftp", "http", "https"], scheme)) { // error message - _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http(s) protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); } } // popup message part 2 -- 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] r56934 - in /trunk/packager: package/yast2-packager.changes src/include/repositories_include.ycp
by lslezak＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: lslezak Date: Thu Apr 23 15:21:32 2009 New Revision: 56934 URL: http://svn.opensuse.org/viewcvs/yast?rev=56934&view=rev Log: - display an additional help when adding an ISO repository over FTP or HTTP protocol fails (bnc#341668) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Apr 23 15:21:32 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 23 15:19:17 CEST 2009 - lslezak(a)suse.cz + +- display an additional help when adding an ISO repository over + FTP or HTTP protocol fails (bnc#341668) + +------------------------------------------------------------------- Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz - Append additional RPM output to the installation log only if it Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Thu Apr 23 15:21:32 2009 @@ -270,6 +270,18 @@ // popup message part 1 string _msg1 = sformat( _("Unable to create repository from URL '%1'."), URL::HidePassword(url) ); + + if (regexpmatch(url, "\\.iso$")) + { + map parsed_url = URL::Parse(url); + string scheme = tolower(parsed_url["scheme"]:""); + + if (contains(["ftp", "http", "https"], scheme)) + { + // error message + _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http(s) protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + } + } // popup message part 2 string _msg2 = _("Try again?"); -- 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] r56933 - in /trunk/bootloader/src: grub/ modules/ routines/
by juhliarik＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: juhliarik Date: Thu Apr 23 14:56:26 2009 New Revision: 56933 URL: http://svn.opensuse.org/viewcvs/yast?rev=56933&view=rev Log: small addaptation to new perl-Bootloader and creating new module for handling storage data in yast2-bootloader Modified: trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/grub/options.ycp trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/BootStorage.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/i386.ycp trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp trunk/bootloader/src/routines/section_widgets.ycp 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 Thu Apr 23 14:56:26 2009 @@ -47,7 +47,7 @@ else if (BootCommon::globals["boot_custom"]:nil == StorageDevices::FloppyDevice()) ret = true; - else if (contains (BootCommon::getFloppyDevices (), + else if (contains (BootStorage::getFloppyDevices (), BootCommon::globals["boot_custom"]:nil)) ret = true; y2milestone ("Installing to floppy: %1", ret); @@ -143,11 +143,11 @@ // } // (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation - // if loader_device is disk device activate BootCommon::BootPartitionDevice + // if loader_device is disk device activate BootStorage::BootPartitionDevice if (num == 0) { y2milestone ("loader_device is disk device"); - p_dev = Storage::GetDiskPartition (BootCommon::BootPartitionDevice); + p_dev = Storage::GetDiskPartition (BootStorage::BootPartitionDevice); num = BootCommon::myToInteger( p_dev["nr"]:nil ); } @@ -462,10 +462,10 @@ { string result = ""; string boot_device = ""; - if ((BootCommon::BootPartitionDevice != nil) && (BootCommon::BootPartitionDevice != "")) - boot_device = BootCommon::BootPartitionDevice; + if ((BootStorage::BootPartitionDevice != nil) && (BootStorage::BootPartitionDevice != "")) + boot_device = BootStorage::BootPartitionDevice; else - boot_device = BootCommon::RootPartitionDevice; + boot_device = BootStorage::RootPartitionDevice; foreach(map p, partitions, { if (p["device"]:"" == boot_device) @@ -525,7 +525,7 @@ // - is on the first disk (with the MBR): boot_partition_is_on_mbr_disk -> true map<string,any> tm = Storage::GetTargetMap (); - map dp = Storage::GetDiskPartition (BootCommon::BootPartitionDevice); + map dp = Storage::GetDiskPartition (BootStorage::BootPartitionDevice); string boot_partition_disk = dp["disk"]:""; boolean boot_partition_is_on_mbr_disk = (boot_partition_disk == BootCommon::mbrDisk); @@ -538,8 +538,8 @@ // determine the underlying devices for the "/boot" partition (either the // BootPartitionDevice, or the devices from which the soft-RAID device for // "/boot" is built) - list<string> underlying_boot_partition_devices = [ BootCommon::BootPartitionDevice ]; - map<string,integer> md_info = BootCommon::Md2Partitions (BootCommon::BootPartitionDevice); + list<string> underlying_boot_partition_devices = [ BootStorage::BootPartitionDevice ]; + map<string,integer> md_info = BootCommon::Md2Partitions (BootStorage::BootPartitionDevice); if (md_info != nil && size (md_info) > 0) { boot_partition_is_on_mbr_disk = false; @@ -646,7 +646,7 @@ } SetBootloaderDevice(selected_location); - if (! contains (BootCommon::getPartitionList (`boot), (BootCommon::GetBootloaderDevices())[0]:nil)) + if (! contains (BootStorage::getPartitionList (`boot, "grub"), (BootCommon::GetBootloaderDevices())[0]:nil)) { selected_location = `mbr; // default to mbr SetBootloaderDevice(selected_location); @@ -701,10 +701,10 @@ map<string,any> tm = Storage::GetTargetMap (); string device = ""; - if (BootCommon::BootPartitionDevice != "") - device = BootCommon::BootPartitionDevice; + if (BootStorage::BootPartitionDevice != "") + device = BootStorage::BootPartitionDevice; else - device = BootCommon::RootPartitionDevice; + device = BootStorage::RootPartitionDevice; map dp = Storage::GetDiskPartition (device); string disk = dp["disk"]:""; @@ -748,19 +748,19 @@ y2milestone( "mountPoints %1", mp ); y2milestone( "mountdata_boot %1", mountdata_boot ); - BootCommon::RootPartitionDevice = mp["/", 0]:""; + BootStorage::RootPartitionDevice = mp["/", 0]:""; - if (BootCommon::RootPartitionDevice == "") + if (BootStorage::RootPartitionDevice == "") { y2error ("No mountpoint for / !!"); } // if /boot changed, re-configure location - BootCommon::BootPartitionDevice - = mountdata_boot[0]:BootCommon::RootPartitionDevice; + BootStorage::BootPartitionDevice + = mountdata_boot[0]:BootStorage::RootPartitionDevice; // get extended partition device (if exists) - BootCommon::ExtendedPartitionDevice = grub_GetExtendedPartitionDev(); + BootStorage::ExtendedPartitionDevice = grub_GetExtendedPartitionDev(); if (BootCommon::mbrDisk == "" || BootCommon::mbrDisk == nil) { @@ -771,7 +771,7 @@ // if no bootloader devices have been set up, or any of the set up // bootloader devices have become unavailable, then re-propose the // bootloader location. - list<string> all_boot_partitions = BootCommon::getPartitionList(`boot); + list<string> all_boot_partitions = BootStorage::getPartitionList(`boot, "grub"); list<string> bldevs = BootCommon::GetBootloaderDevices(); boolean need_location_reconfigure = false; @@ -808,22 +808,22 @@ string actual_extended = grub_GetExtendedPartitionDev(); if ( BootCommon::globals["boot_boot"]:"false" == "true" && - actual_boot != BootCommon::BootPartitionDevice ) + actual_boot != BootStorage::BootPartitionDevice ) ret = $[ "changed" : true, "reason" : (string) ret["reason"]:"" + "Selected bootloader location \"/boot\" is not on " + - BootCommon::BootPartitionDevice + + BootStorage::BootPartitionDevice + " any more.\n" ]; if ( BootCommon::globals["boot_root"]:"false" == "true" && - actual_root != BootCommon::RootPartitionDevice ) + actual_root != BootStorage::RootPartitionDevice ) ret = $[ "changed" : true, "reason" : (string) ret["reason"]:"" + "Selected bootloader location \"/\" is not on " + - BootCommon::RootPartitionDevice + + BootStorage::RootPartitionDevice + " any more.\n" ]; @@ -841,18 +841,18 @@ } if ( BootCommon::globals["boot_extended"]:"false" == "true" && - actual_extended != BootCommon::ExtendedPartitionDevice ) + actual_extended != BootStorage::ExtendedPartitionDevice ) ret = $[ "changed" : true, "reason" : (string) ret["reason"]:"" + "Selected bootloader location \"extended partition\" is not on " + - BootCommon::ExtendedPartitionDevice + + BootStorage::ExtendedPartitionDevice + " any more.\n" ]; if ( BootCommon::globals["boot_custom"]:nil != nil ) { - list all_boot_partitions = BootCommon::getPartitionList(`boot); + list all_boot_partitions = BootStorage::getPartitionList(`boot, "grub"); if ( ! contains(all_boot_partitions, BootCommon::globals["boot_custom"]:nil) ) ret = $[ @@ -906,7 +906,7 @@ )) { grub_DetectDisks (); - BootCommon::del_parts = BootCommon::getPartitionList (`deleted); + BootCommon::del_parts = BootStorage::getPartitionList (`deleted, "grub"); // check whether edd is loaded; if not: load it string lsmod_command = "lsmod | grep edd"; y2milestone ("Running command %1", lsmod_command); @@ -924,8 +924,8 @@ y2milestone("(2) globals: %1", BootCommon::globals); // refresh device map - if ((BootCommon::device_mapping == nil) - || (size (BootCommon::device_mapping) == 0) + if ((BootStorage::device_mapping == nil) + || (size (BootStorage::device_mapping) == 0) || (BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime())) { BootCommon::ProposeDeviceMap(); @@ -969,7 +969,7 @@ return false; } // find grub id in device map for chainloader device - string grub_id = BootCommon::device_mapping[disk_dev]:""; + string grub_id = BootStorage::device_mapping[disk_dev]:""; y2milestone("Disk from windows chainloader: %1 grub id from device map: %2", disk_dev, grub_id); // check if disk is the first in order... @@ -1033,18 +1033,18 @@ { boolean result = false; - if (size(BootCommon::device_mapping)>8) + if (size(BootStorage::device_mapping)>8) { result = true; - list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + list <string> bios_order = (list <string> ) Map::Values(BootStorage::device_mapping); //delete all grub devices with order more than 9 bios_order = filter(string key, bios_order, {return (size(key) < 4);}); bios_order = lsort(bios_order); y2debug("ordered values (grub devices): %1", bios_order); map<string,string> inverse_device_map = $[]; map<string,string> new_device_map = $[]; - y2milestone("Device map before reducing: %1", BootCommon::device_mapping); - foreach(string key, string value, BootCommon::device_mapping, + y2milestone("Device map before reducing: %1", BootStorage::device_mapping); + foreach(string key, string value, BootStorage::device_mapping, { inverse_device_map[value]=key; }); @@ -1065,10 +1065,10 @@ break; } }); - BootCommon::device_mapping = new_device_map; - y2milestone("Device map after reducing: %1", BootCommon::device_mapping); + BootStorage::device_mapping = new_device_map; + y2milestone("Device map after reducing: %1", BootStorage::device_mapping); } else { - y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootCommon::device_mapping); + y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootStorage::device_mapping); } return result; } @@ -1086,16 +1086,16 @@ { boolean result = false; - if (size(BootCommon::device_mapping)>8) + if (size(BootStorage::device_mapping)>8) { result = false; - list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + list <string> bios_order = (list <string> ) Map::Values(BootStorage::device_mapping); //delete all grub devices with order more than 9 bios_order = filter(string key, bios_order, {return (size(key) < 4);}); bios_order = lsort(bios_order); y2debug("ordered values (grub devices): %1", bios_order); map<string,string> inverse_device_map = $[]; - foreach(string key, string value, BootCommon::device_mapping, + foreach(string key, string value, BootStorage::device_mapping, { inverse_device_map[value]=key; }); Modified: trunk/bootloader/src/grub/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/options.ycp?… ============================================================================== --- trunk/bootloader/src/grub/options.ycp (original) +++ trunk/bootloader/src/grub/options.ycp Thu Apr 23 14:56:26 2009 @@ -316,7 +316,7 @@ }); BootCommon::mbrDisk = result[0]:""; integer index = 0; - BootCommon::device_mapping = listmap (string d, result, { + BootStorage::device_mapping = listmap (string d, result, { string indexs = tostring(index); index = index + 1; return $[ d : sformat ("hd%1", indexs)]; @@ -444,7 +444,7 @@ * @param widget string widget key */ void InitBootLoaderLocationWidget(string widget) { - list<string> boot_devices = BootCommon::getPartitionList(`boot); + list<string> boot_devices = BootStorage::getPartitionList(`boot, "grub"); list <string> list_global_target_keys = ["boot_mbr", "boot_boot", "boot_root", "boot_extended"]; foreach(string key, list_global_target_keys, { Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Thu Apr 23 14:56:26 2009 @@ -186,7 +186,6 @@ { ret = "unknown"; } - } y2milestone("Type of architecture: %1", ret); Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Apr 23 14:56:26 2009 @@ -77,52 +77,6 @@ - -/** - * Saved change time from target map - only for checkCallingDiskInfo() - */ - -global integer disk_change_time_checkCallingDiskInfo = nil; - - - -/** - * device mapping between Linux and firmware - */ -global map<string,string> device_mapping = $[]; - -/** - * device mapping between real devices and multipath - */ -global map<string,string> multipath_mapping = $[]; - - -/** - * mountpoints for perl-Bootloader - */ - -global map<string,any> mountpoints = $[]; - - -/** - * list of all partitions for perl-Bootloader - */ - -global list<list> partinfo = []; - -/** - * information about MD arrays for perl-Bootloader - */ -global map<string,list<string> > md_info = $[]; - - -/** - * Flag indicates that bios_id_missing in disk - * true if missing false if at least one disk has bios_id - */ - -global boolean bois_id_missing = true; - /** * device to save loader stage 1 to * NOTE: this variable is being phased out. The boot_* keys in the globals map @@ -152,23 +106,6 @@ /* These global variables and functions are needed in included files */ /** - * string sepresenting device name of /boot partition - * same as RootPartitionDevice if no separate /boot partition - */ -global string BootPartitionDevice = ""; - - -/** - * string representing device name of / partition - */ -global string RootPartitionDevice = ""; - -/** - * string representing device name of extended partition - */ -global string ExtendedPartitionDevice = ""; - -/** * Parameters of currently used bootloader */ global map<string, any> current_bootloader_attribs = $[]; @@ -195,11 +132,6 @@ /** - * list of installed floppy devices - */ -global list<string> floppy_devices = nil; - -/** * Option types for different bootloaders */ global map<string,map<string,string> > opt_types = $[]; @@ -476,7 +408,7 @@ if (title == "memtest86") { if (MemtestPresent ()) { ret["image"] = "/boot/memtest.bin"; - ret["__devs"] = [BootCommon::BootPartitionDevice]; + ret["__devs"] = [BootStorage::BootPartitionDevice]; return ret; } else { @@ -603,11 +535,11 @@ "image" : kernel_fn, "initrd" : initrd_fn, // try to use label or udev id for device name... FATE #302219 - "root" : BootStorage::Dev2MountByDev(RootPartitionDevice), + "root" : BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice), "append" : (title == "failsafe") ? BootArch::FailsafeKernelParams () : BootArch::DefaultKernelParams (resume), - "__devs" : [BootPartitionDevice, RootPartitionDevice], + "__devs" : [BootStorage::BootPartitionDevice, BootStorage::RootPartitionDevice], ]); if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") { @@ -645,7 +577,7 @@ map exp = $[ "global": remapGlobals(globals), "sections" : remapSections(sections), - "device_map" : remapDeviceMap(device_mapping), + "device_map" : BootStorage::remapDeviceMap(BootStorage::device_mapping), ]; if ( ! ( loader_type == "grub" ) ) { exp["repl_mbr"] = repl_mbr; @@ -671,7 +603,7 @@ repl_mbr = settings["repl_mbr"]:false; activate = settings["activate"]:false; } - device_mapping = settings["device_map"]:$[]; + BootStorage::device_mapping = settings["device_map"]:$[]; return true; } @@ -694,7 +626,7 @@ sections = GetSections (); globals = GetGlobal (); isTrustedGrub (); - device_mapping = GetDeviceMap (); + BootStorage::device_mapping = GetDeviceMap (); read_default_section_name = ""; foreach (map<string,any> s, sections, { if (s["original_name"]:"" == "linux" @@ -705,7 +637,7 @@ }); // convert device names in device map to the kernel device names - device_mapping = mapmap (string k , string v, device_mapping, { + BootStorage::device_mapping = mapmap (string k , string v, BootStorage::device_mapping, { // if we update from version 9 (SLES9), first convert old-style persistent // device names to new-style persistent device names ("p1" -> "-part1") // NOTE: this is idempotent; but other device name translation @@ -764,7 +696,8 @@ was_proposed = false; if (init) { - ProposeDeviceMap (); + if (getLoaderType (false) == "grub") + BootStorage::ProposeDeviceMap (); } } @@ -819,9 +752,9 @@ // convert device names in device map to the device names indicated by // "mountby" - y2milestone ("device map before mapping %1", device_mapping); + y2milestone ("device map before mapping %1", BootStorage::device_mapping); map<string,string> my_device_mapping = - mapmap (string k , string v, device_mapping, { + mapmap (string k , string v, BootStorage::device_mapping, { return $[BootStorage::Dev2MountByDev(k) : v]; }); y2milestone ("device map after mapping %1", my_device_mapping); @@ -832,7 +765,7 @@ // bnc #436899 ConvertXENinDomU (); - ret = ret && DefineMultipath(multipath_mapping); + ret = ret && DefineMultipath(BootStorage::multipath_mapping); ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); ret = ret && SetGlobal (my_globals); @@ -866,7 +799,7 @@ if (target_name == "mbr_md") { list<string> mbrs = maplist (string d, integer id, - Md2Partitions (BootPartitionDevice), + Md2Partitions (BootStorage::BootPartitionDevice), { map p_dev = Storage::GetDiskPartition (d); return p_dev["disk"]:""; Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO… ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Thu Apr 23 14:56:26 2009 @@ -31,6 +31,7 @@ import "BootArch"; import "BootCommon"; +import "BootStorage"; import "Installation"; import "Kernel"; import "Mode"; @@ -321,7 +322,7 @@ create_efi_entry = false; elilo_conf_filename = getEliloConfFilename (); BootCommon::DetectDisks (); - BootCommon::del_parts = BootCommon::getPartitionList (`deleted); + BootCommon::del_parts = BootStorage::getPartitionList (`deleted, "elilo"); if (BootCommon::sections == nil || size (BootCommon::sections) == 0) { Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Apr 23 14:56:26 2009 @@ -144,7 +144,7 @@ y2milestone ("Other linux parts: %1", other_l); list<string> destroyed_partitions - = BootCommon::getPartitionList (`destroyed); + = BootStorage::getPartitionList (`destroyed, "grub"); string tmpdir = (string)SCR::Read (.target.tmpdir) + "/bldetect/"; @@ -491,8 +491,8 @@ grub_DetectDisks (); boolean ret = BootCommon::Read (false, avoid_reading_device_map); // refresh device map if not read - if (BootCommon::device_mapping == nil - || size (BootCommon::device_mapping) == 0) + if (BootStorage::device_mapping == nil + || size (BootStorage::device_mapping) == 0) { BootCommon::ProposeDeviceMap (); } @@ -648,11 +648,11 @@ list<string> locations = []; if (BootCommon::globals["boot_boot"]:"" == "true") - locations = add(locations, BootCommon::BootPartitionDevice + " (\"/boot\")"); + locations = add(locations, BootStorage::BootPartitionDevice + " (\"/boot\")"); if (BootCommon::globals["boot_extended"]:"" == "true") - locations = add(locations, BootCommon::ExtendedPartitionDevice + " (extended)"); + locations = add(locations, BootStorage::ExtendedPartitionDevice + " (extended)"); if (BootCommon::globals["boot_root"]:"" == "true") - locations = add(locations, BootCommon::RootPartitionDevice + " (\"/\")"); + locations = add(locations, BootStorage::RootPartitionDevice + " (\"/\")"); if (BootCommon::globals["boot_mbr"]:"" == "true") locations = add(locations, BootCommon::mbrDisk + " (MBR)"); if (haskey (BootCommon::globals, "boot_custom")) @@ -703,7 +703,7 @@ // SetDiskInfo(), and device names in other config files can be translated // to Unix device names (#328448, this hits sections that are not // (re-)created by yast-Bootloader or later by perl-Bootloader anyway). - BootCommon::SetDeviceMap (BootCommon::device_mapping); + BootCommon::SetDeviceMap (BootStorage::device_mapping); Read (true, true); BootCommon::UpdateSections (true, CreateLinuxSection); Modified: trunk/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootLILO.… ============================================================================== --- trunk/bootloader/src/modules/BootLILO.ycp (original) +++ trunk/bootloader/src/modules/BootLILO.ycp Thu Apr 23 14:56:26 2009 @@ -25,6 +25,7 @@ import "Arch"; import "BootCommon"; +import "BootStorage"; import "Kernel"; import "Mode"; import "Pkg"; @@ -210,7 +211,7 @@ // SetDiskInfo(), and device names in other config files can be translated // to Unix device names (#328448, this hits sections that are not // (re-)created by yast-Bootloader or later by perl-Bootloader anyway). - BootCommon::SetDeviceMap (BootCommon::device_mapping); + BootCommon::SetDeviceMap (BootStorage::device_mapping); Read (true, true); BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection); @@ -274,15 +275,15 @@ list data = mp["/boot"]:(mp["/"]:[]); string bpd = data[0]:""; // ???? FIXME ???? how about LVM/MD ???? - if (bpd == BootCommon::BootPartitionDevice - && getDeviceOfRaid (BootCommon::BootPartitionDevice) - != BootCommon::BootPartitionDevice - && contains (BootCommon::getPartitionList(`boot), - BootCommon::BootPartitionDevice)) + if (bpd == BootStorage::BootPartitionDevice + && getDeviceOfRaid (BootStorage::BootPartitionDevice) + != BootStorage::BootPartitionDevice + && contains (BootStorage::getPartitionList(`boot, "lilo"), + BootStorage::BootPartitionDevice)) { y2milestone ("Creating backup copy to bootsector"); SCR::Execute (.target.bash, sformat ("/sbin/lilo -b %1", - BootCommon::BootPartitionDevice)); + BootStorage::BootPartitionDevice)); } } Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWER… ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Thu Apr 23 14:56:26 2009 @@ -193,7 +193,7 @@ } else { root_disks = [ - Storage::GetDiskPartition(BootCommon::RootPartitionDevice)["disk"]:"" + Storage::GetDiskPartition(BootStorage::RootPartitionDevice)["disk"]:"" ]; } @@ -417,7 +417,7 @@ map<string,any> CreateImageSection (string title) { map<string,any> ret = BootCommon::CreateLinuxSection(title); //Do not use translated names, as we are happy if it work with kernel device - ret["root"] = BootCommon::RootPartitionDevice; + ret["root"] = BootStorage::RootPartitionDevice; // bnc #217443 ret["optional"] = "true"; //do not use translated name FIXME this should be filtered out @@ -445,7 +445,7 @@ // does this device contain the root partition? boolean hasrootdev = ( find (map p, partitions, ``( (! p["delete"]:false) - && p["device"]:"" == BootCommon::RootPartitionDevice + && p["device"]:"" == BootStorage::RootPartitionDevice && !contains( [`lvm, `evms, `sw_raid], p["type"]:`primary ) )) != nil ); @@ -496,7 +496,7 @@ && selected_boot_partition == "") { y2milestone ("Selected pmac boot partition %1 on device with root partition %2", - partitions[0, "device"]:"", BootCommon::RootPartitionDevice); + partitions[0, "device"]:"", BootStorage::RootPartitionDevice); selected_boot_partition = partitions[0, "device"]:""; } @@ -526,7 +526,7 @@ global void LocationProposal () { BootCommon::DetectDisks (); // del_parts is used by FixSections() in lilolike.ycp (imported by BootCommon.ycp) - BootCommon::del_parts = BootCommon::getPartitionList (`deleted); + BootCommon::del_parts = BootStorage::getPartitionList (`deleted, "ppc"); if (BootCommon::DisksChanged ()) { y2milestone ("Reconfiguring locations"); @@ -541,16 +541,16 @@ switch (getBoardType()) { case ("chrp"): - BootCommon::BootPartitionDevice = prep_boot_partition; + BootStorage::BootPartitionDevice = prep_boot_partition; break; case ("prep"): - BootCommon::BootPartitionDevice = prep_boot_partition; + BootStorage::BootPartitionDevice = prep_boot_partition; break; case ("iseries"): - BootCommon::BootPartitionDevice = prep_boot_partition; + BootStorage::BootPartitionDevice = prep_boot_partition; break; case ("pmac") : - BootCommon::BootPartitionDevice = GoodPmacBootPartition(); + BootStorage::BootPartitionDevice = GoodPmacBootPartition(); break; default: y2error("Unknown ppc architecture"); @@ -571,7 +571,7 @@ // file. This may apply better to the boot_* variables in BootGRUB.ycp // though. // FIXME: what about loader_location (aka selected_location internally)? - BootCommon::loader_device = BootCommon::BootPartitionDevice; + BootCommon::loader_device = BootStorage::BootPartitionDevice; BootCommon::activate = true; y2milestone("Boot partition is %1", BootCommon::loader_device); } @@ -602,21 +602,21 @@ map<string, string> boot_map = $[]; - y2milestone("RootPartDevice is %1",BootCommon::RootPartitionDevice); + y2milestone("RootPartDevice is %1",BootStorage::RootPartitionDevice); switch(getBoardType()){ case ("chrp") : boot_map = $[ - "boot_chrp_custom" : BootCommon::BootPartitionDevice, + "boot_chrp_custom" : BootStorage::BootPartitionDevice, ]; break; case ("prep") : boot_map = $[ - "boot_prep_custom" : BootCommon::BootPartitionDevice, + "boot_prep_custom" : BootStorage::BootPartitionDevice, ]; break; case ("pmac") : boot_map = $[ - "boot_pmac_custom" : BootCommon::BootPartitionDevice, + "boot_pmac_custom" : BootStorage::BootPartitionDevice, ]; break; case ("iseries") : @@ -629,9 +629,9 @@ // If we have an empty BootPartitionDevice on iseries, this means: // do not boot from BootPartitionDevice but from some other place. // Do not pass down to perl-Bootloader, lilo fails on an empty "boot =" line. - if (BootCommon::BootPartitionDevice != nil && - BootCommon::BootPartitionDevice != "") { - boot_map["boot_iseries_custom"] = BootCommon::BootPartitionDevice; + if (BootStorage::BootPartitionDevice != nil && + BootStorage::BootPartitionDevice != "") { + boot_map["boot_iseries_custom"] = BootStorage::BootPartitionDevice; } break; default: @@ -702,25 +702,25 @@ string arch = getBoardType (); switch(arch) { case ("prep"): - BootCommon::globals["boot_prep_custom"] = BootCommon::BootPartitionDevice; + BootCommon::globals["boot_prep_custom"] = BootStorage::BootPartitionDevice; break; case ("pmac"): - BootCommon::globals["boot_pmac_custom"] = BootCommon::BootPartitionDevice; + BootCommon::globals["boot_pmac_custom"] = BootStorage::BootPartitionDevice; break; case ("iseries"): BootCommon::globals["boot_slot"] = "B"; BootCommon::globals["boot_file"] = "/tmp/suse_linux_image"; - if (BootCommon::BootPartitionDevice != nil && - BootCommon::BootPartitionDevice != "") + if (BootStorage::BootPartitionDevice != nil && + BootStorage::BootPartitionDevice != "") { - BootCommon::globals["boot_iseries_custom"] = BootCommon::BootPartitionDevice; + BootCommon::globals["boot_iseries_custom"] = BootStorage::BootPartitionDevice; } break; default: - BootCommon::globals["boot_chrp_custom"] = BootCommon::BootPartitionDevice; + BootCommon::globals["boot_chrp_custom"] = BootStorage::BootPartitionDevice; break; } Modified: trunk/bootloader/src/modules/BootStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootStora… ============================================================================== --- trunk/bootloader/src/modules/BootStorage.ycp (original) +++ trunk/bootloader/src/modules/BootStorage.ycp Thu Apr 23 14:56:26 2009 @@ -25,22 +25,27 @@ textdomain "bootloader"; import "Storage"; +import "StorageDevices"; import "Arch"; +import "Mode"; /** * Saved change time from target map - only for MapAllPartitions() */ - global integer disk_change_time_InitBootloader = nil; - /** * Saved change time from target map - only for MapAllPartitions() */ global integer disk_change_time_MapAllPartitions = nil; +/** + * Saved change time from target map - only for checkCallingDiskInfo() + */ + +global integer disk_change_time_checkCallingDiskInfo = nil; /** * bnc #468922 - problem with longtime running the parsing a huge number of disks @@ -64,6 +69,72 @@ global map<string, string> all_devices = $[]; +/** + * Storage locked + */ +boolean storage_initialized = false; + + +/** + * device mapping between real devices and multipath + */ +global map<string,string> multipath_mapping = $[]; + + +/** + * mountpoints for perl-Bootloader + */ + +global map<string,any> mountpoints = $[]; + + +/** + * list of all partitions for perl-Bootloader + */ + +global list<list> partinfo = []; + +/** + * information about MD arrays for perl-Bootloader + */ +global map<string,list<string> > md_info = $[]; + + +/** + * Flag indicates that bios_id_missing in disk + * true if missing false if at least one disk has bios_id + */ +global boolean bois_id_missing = true; + +/** + * device mapping between Linux and firmware + */ +global map<string,string> device_mapping = $[]; + + + +/** + * string sepresenting device name of /boot partition + * same as RootPartitionDevice if no separate /boot partition + */ +global string BootPartitionDevice = ""; + + +/** + * string representing device name of / partition + */ +global string RootPartitionDevice = ""; + +/** + * string representing device name of extended partition + */ +global string ExtendedPartitionDevice = ""; + +/** + * list of installed floppy devices + */ +global list<string> floppy_devices = nil; + /** FATE #302219 - Use and choose persistent device names for disk devices * Function prepare maps with mapping disks and partitions by uuid, id, path * and label. @@ -345,6 +416,650 @@ } +/** bnc #447591, 438243, 448110 multipath wrong device map + * Function maps real devices to multipath e.g. + * "/dev/sda/" : "/dev/mapper/SATA_ST3120813AS_3LS0CD7M" + * + * @return map <string, string> mapping real disk to multipath + */ + +// FIXME grub only + +map <string, string> mapRealDevicesToMultipath() +{ + map <string, string> ret = $[]; + map<string, map> tm = (map<string,map>)Storage::GetTargetMap (); + integer num_of_real_disk = 0; + foreach (string disk, map disk_info, tm, + { + if (disk_info["type"]:nil == `CT_DMMULTIPATH) + { + list <string> devices = (list <string>) disk_info["devices"]:[]; + if (size(devices) > 0) + { + foreach(string d, devices, + { + ret[d]=disk; + }); + + } + } + + if (disk_info["type"]:nil == `CT_DISK) + num_of_real_disk = num_of_real_disk +1; + if (disk_info["bios_id"]:nil != nil) + bois_id_missing = false; + }); + if (num_of_real_disk == 1) + bois_id_missing = false; + return ret; +} + + + + +/** + * Check if function was called or storage change + * partitionig of disk. It is usefull fo using cached data + * about disk. Data is send to perl-Bootloader and it includes + * info about partitions, multi path and md-raid + * + * @return false if it is posible use cached data + */ + +boolean checkCallingDiskInfo () +{ + boolean ret = false; + + // fix for problem with unintialized storage library in AutoYaST mode + // bnc #464090 + if (Mode::config() && (!storage_initialized)) + { + storage_initialized = true; + y2milestone("Init storage library in yast2-bootloader"); + Storage::InitLibstorage(true); + } + if ((disk_change_time_checkCallingDiskInfo != Storage::GetTargetChangeTime()) + || (size(partinfo) < 1)) + { + // save last change time from storage + disk_change_time_checkCallingDiskInfo = Storage::GetTargetChangeTime(); + y2milestone("disk was changed by storage or partinfo is empty: %1", size(partinfo)); + y2milestone("generate partinfo, md_info, mountpoints and multipath_mapping"); + ret = true; + } else { + ret = false; + y2milestone("Skip genarating partinfo, md_info, mountpoints and multipath_mapping"); + } + + return ret; +} + +/** + * Function init data for perl-Bootloader about disk + * It means fullfil md_info, multipath_mapping, partinfo + * and mountpoints + */ + +global void InitDiskInfo() +{ + + if (checkCallingDiskInfo()) + { + // delete variables for perl-Bootloader + md_info = $[]; + multipath_mapping = $[]; + partinfo = []; + mountpoints = $[]; + + map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); + + multipath_mapping = mapRealDevicesToMultipath(); + mountpoints = mapmap (string k, list v, + (map<string,list>)Storage::GetMountPoints (), + { + // detect all raid1 md devices and mark them in md_info + any device = v[0]:nil; + if (v[3]:"" == "raid1") + md_info[(string)device]=[]; + return $[ k : device ]; + }); + mountpoints = filter (string k, any v, mountpoints, { + string tmpdir = (string)SCR::Read (.target.tmpdir); + integer tmp_sz = size (tmpdir); + return is (v, string) && substring (k, 0, tmp_sz) != tmpdir; + }); + + y2milestone ("Detected mountpoints: %1", mountpoints); + + list<list<list> > pi = maplist (string disk, map info, tm, + { + if (info["type"]:`CT_UNKNOWN==`CT_LVM) + return []; + if (info["type"]:`CT_UNKNOWN==`CT_EVMS) + return []; + list partitions = info["partitions"]:[]; + list<list> parts = maplist (map p, (list<map>)partitions, { + string raid = ""; + if( p["used_by_type"]:`UB_NONE==`UB_MD ) + raid = p["used_by_device"]:""; + string device = p["device"]:""; + // We only pass along RAID1 devices as all other causes + // severe breakage in the bootloader stack + if (raid != "") { + if (haskey (md_info, raid)) { + list<string> members = md_info[raid]:[]; + members = add (members, device); + md_info[raid] = members; + } + } + any nr = p["nr"]:nil; + if (nr == nil) + nr = 0; + string nr_str = sformat ("%1", nr); + + + return [ device, disk, nr_str, tostring(p["fsid"]:0), + p["fstype"]:"unknown", tostring(p["type"]:nil), + tostring(p["region", 0]:0), tostring(p["region", 1]:0) + ]; + }); + return parts; + }); + partinfo = flatten (pi); + partinfo = filter (list p, partinfo, {return p != nil && p != [];}); + list<list> partinfo_mountby = []; + // adding moundby (by-id) via user preference + foreach(list partition, partinfo, { + list tmp =[]; + string mount_by = BootStorage::Dev2MountByDev(tostring(partition[0]:"")); + if (mount_by != tostring(partition[0]:"")) + { + tmp = add(partition, mount_by); + } else { + tmp = partition; + } + partinfo_mountby = add(partinfo_mountby, tmp); + }); + // y2milestone("added mountby: %1", partinfo_mountby); + + partinfo = partinfo_mountby; + + } + +} + + +/*** helper functions for ProposeDeviceMap: ***/ +/** + * Returns true if any device from list devices is in device_mapping + * marked as hd0. + */ +boolean isHd0(list<string> devices) +{ + boolean ret = false; + + foreach (string value, devices, + { + if (device_mapping[value]:"" == "hd0"){ + ret = true; + } + }); + + return ret; +} + +/** + * Returns first key from mapping associated with value. + * Example: + * map = $[ "a" : "1", + * "b" : "2", + * "c" : "3", + * "d" : "2"]; + * getDeviceFromMapping("1", map) -> "a" + * getDeviceFromMapping("2", map) -> "b" + */ +string getKey(string value, map<string, string> mapping) +{ + string ret = ""; + + foreach (string key, string val, mapping, + { + if (value == val){ + ret = key; + return; + } + }); + + return ret; +} + +/** + * This function changes order of devices in device_mapping. + * All devices listed in bad_devices are maped to "hdN" are moved to the end + * (with changed number N). And second step is putting device with boot partition + * on top (i.e. device_mapping[dev_with_boot] = "hd0"). + * + * Example: + * device_mapping = $[ "/dev/sda" : "hd0", + * "/dev/sdb" : "hd1", + * "/dev/sdc" : "hd2", + * "/dev/sdd" : "hd3", + * "/dev/sde" : "hd4" ]; + * bad_devices = [ "/dev/sda", "/dev/sdc" ]; + * + * changeOrderInDeviceMapping(bad_devices); + * // after call, device_mapping is: + * device_mapping -> $[ "/dev/sda" : "hd3", + * "/dev/sdb" : "hd0", + * "/dev/sdc" : "hd4", + * "/dev/sdd" : "hd1", + * "/dev/sde" : "hd2" ]; + */ +void changeOrderInDeviceMapping(list<string> bad_devices) +{ + integer cur_id = 0; + list keys = []; + string value = ""; + string tmp = ""; + string tmp2 = ""; + + // get keys from device_mapping, it's not possible to use foreach over keys and values + // of device_mapping directly, because during the loop device_mapping is changing. + foreach (string key, string value, device_mapping, { keys = add(keys, key); }); + + // put bad_devices at bottom + foreach (string key, (list<string>)keys, + { + value = device_mapping[key]:""; + + // if device is mapped on hdX and this device is _not_ in bad_devices + if (substring(value, 0, 2) == "hd" + && !contains(bad_devices, key)){ + // get device name of mapped on "hd"+cur_id + tmp = getKey("hd" + tostring(cur_id), device_mapping); + + // swap tmp and key devices (swap their mapping) + device_mapping[tmp] = value; + device_mapping[key] = "hd" + tostring(cur_id); + + cur_id = cur_id + 1; + } + }); + +} +/*** helper functions END ***/ + +/** + * Generate device map proposal, store it in internal variables. + * + * FATE #302075: + * When user is installing from USB media or any non IDE disk or bios simply + * set any non IDE disk as first and user is not installing on this removable + * (non IDE) disk, the order of disks proposed by bios must be changed because + * of future remove of USB disk. + * This function must find right place for bootloader (which is most probably + * boot sector of boot partition (where /boot dir is located)) and change the + * order of disks in device map. + * This method is only heuristic because order of disks after remove of usb + * disk can't be determined by any method. + * + * Algorithm for solving problem with usb disk propsed by bios as hd0: + * if usbDiskDevice == hd0 && BootDevice != usbDiskDevice: + * change order of disks in device_mappings to have BootDevice as hd0 + */ +// FIXME: remove that function from here, as it is grub only +// NOTE: there is a local copy in routines/grub/misc.ycp now +global void ProposeDeviceMap () { + list<string> usb_disks = []; // contains those usb removable disks + + device_mapping = $[]; + multipath_mapping = $[]; + + map<string,map> targetMap = $[]; + if (Mode::config ()) + y2milestone ("Skipping device map proposing in Config mode"); + else + targetMap = (map<string,map>)Storage::GetTargetMap(); + + // filter out members of BIOS RAIDs and multipath devices + targetMap = filter (string k, map v, targetMap, { + return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH; + }); + // filter out non-disk devices + targetMap = filter (string k, map v, targetMap, { + return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK + || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH; + }); + + y2milestone ("Target map: %1", targetMap); + + // add devices with known bios_id + // collect BIOS IDs which are used + map ids = $[]; + foreach (string target_dev, map target, targetMap, { + string bios_id = target["bios_id"]:""; + if (bios_id != "") + { + integer index = tointeger (bios_id) - tointeger ("0x80"); + string grub_dev = sformat ("hd%1", index); + // FATE #303548 - doesn't add disk with same bios_id with different name (multipath machine) + if (! ids[index]:false) + { + device_mapping[target_dev] = grub_dev; + ids[index] = true; + } + } + }); + // and guess other devices + // don't use already used BIOS IDs + foreach (string target_dev, map target, targetMap, { + string bios_id = target["bios_id"]:""; + if (bios_id == "") + { + integer index = 0; + while (ids[index]:false) + index = index + 1; + string grub_dev = sformat ("hd%1", index); + device_mapping[target_dev] = grub_dev; + ids[index] = true; + } + }); + + // Fill usb_disks list with usb removable devices. + // + // It's not easy to determine how to identify removable usb devices. Now + // it tests if driver of device is usb-storage. If you find better + // algorithm how to find removable usb devices, put it here into foreach + // to apply this algorithm on all devices. + foreach (string target_dev, map target, targetMap, + { + string driver = target["driver"]:""; + if (driver == "usb-storage"){ + usb_disks = add(usb_disks, target_dev); + } + }); + y2milestone("Found usb discs: %1", usb_disks); + + // change order in device_mapping if usb disk is hd0 + // (FATE #302075) + if (isHd0(usb_disks) && BootPartitionDevice != getKey("hd0", device_mapping)){ + y2milestone ("Detected device mapping: %1", device_mapping); + y2milestone("Changing order in device mapping needed..."); + changeOrderInDeviceMapping(usb_disks); + } + + if (size(device_mapping) == 1) + bois_id_missing = false; + if (StorageDevices::FloppyPresent()) + device_mapping[StorageDevices::FloppyDevice()] = "fd0"; + + y2milestone ("Detected device mapping: %1", device_mapping); + + multipath_mapping = mapRealDevicesToMultipath(); + + y2milestone ("Detected multipath mapping: %1", multipath_mapping); + +} + +/** + * Get the order of disks according to BIOS mapping + * @return a list of all disks in the order BIOS sees them + */ +global list<string> DisksOrder () { + if (device_mapping == nil || size (device_mapping) == 0) + { + ProposeDeviceMap (); + } + map<string,string> devmap_rev = mapmap (string k, string v, device_mapping, + { + return $[ v : k ]; + }); + devmap_rev = filter (string k, string v, devmap_rev, { + return substring (k, 0, 2) == "hd"; + }); + list<string> order = maplist (string k, string v, devmap_rev, { + return v; + }); + return order; +} + + +/** + * Function remap device map to device name (/dev/sda) + * or to label (ufo_disk) + * @param map<string,string> device map + * @return map<string,string> new device map + */ + +global map<string,string> remapDeviceMap(map<string,string> device_map) +{ + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; + if (by_mount == `label) + return device_map; + + map<string,string> ret = $[]; + // convert device names in device map to the device names by device or label + ret = mapmap (string k , string v, device_mapping, + { + return $[BootStorage::MountByDev2Dev(k) : v]; + }); + + return ret; +} + +/** + * Get the list of installed floppy drives + * @return a list of floppy devices + */ +global list<string> getFloppyDevices () +{ + if (floppy_devices == nil) + { + list<map> floppies = (list<map>) SCR::Read (.probe.floppy); + floppies = filter (map f, floppies, + ``(f["model"]:"Floppy Disk" == "Floppy Disk")); + floppy_devices = maplist (map f, floppies, + ``(f["dev_name"]:"")); + floppy_devices = filter (string f, floppy_devices, ``(f != "")); + } + return floppy_devices; +} + +/** + * Returns list of partitions with "mount by" hints. Goes through the list + * of partitions passed as a parameter and creates a list of partitions with + * hints according to the current partitioning requested from + * yast2-storage. To be used in a combobox or menu. + * + * @param parts_to_get list<string> partitions to list + * @return a list of strings containing a partition name and a hint (if applicable) + */ +global define list<string> getHintedPartitionList(list<string> parts_to_get) +{ + y2milestone ("getHintedPartitionList: %1", parts_to_get); + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + + // make a map: "/dev/hda1" -> info_map_for_this_partition + map<string,map> partitions = $[]; + foreach (string k, map v, devices, ``{ + foreach (map p, (list<map>)(v["partitions"]:[]), ``{ + partitions[p["device"]:""] = p; + }); + }); + y2milestone ("getHintedPartitionList: partitions %1", partitions); + + symbol mountby = `device; + list<string> ret = maplist (string dev, parts_to_get, ``{ + mountby = (symbol) partitions[dev, "mountby"]:nil; + if ( mountby == `uuid ) + { + return sformat ("%1 (mount by UUID: %2)", dev, + partitions[dev, "uuid"]:nil != nil ? + partitions[dev, "uuid"]:"" : + "<UUID to be created later during format>"); + } else if ( mountby == `label ) + { + return sformat ("%1 (mount by LABEL: %2)", dev, partitions[dev, "label"]:""); + } else if ( mountby == `id ) + { + return sformat ("%1 (mount by ID: %2)", dev, partitions[dev, "udev_id", 0]:""); + } else if ( mountby == `path ) + { + return sformat ("%1 (mount by PATH: %2)", dev, partitions[dev, "udev_path"]:""); + } else if ( mountby == nil || mountby == `device ) + { + return dev; + } + }); + + y2milestone ("getHintedPartitionList: ret %1", ret); + return ret; +} + +/** + * Returns list of partitions. Requests current partitioning from + * yast2-storage and creates list of partition for combobox, menu or other + * purpose. + * @param type symbol + * `boot - for bootloader installation + * `root - for kernel root + * `boot_other - for bootable partitions of other systems + * `all - all partitions + * `parts_old - all partitions, except those what will be created + * during isntallation + * `deleted - all partitions deleted in current proposal + * `kept - all partitions that won't be deleted, new created or formatted + * `destroyed - all partition which are new, deleted or formatted + * @return a list of strings + */ +global define list<string> getPartitionList(symbol type, string bl) +{ + y2milestone ("getPartitionList: %1", type); + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + list<map> partitions = []; + foreach (string k, map v, devices, ``{ + if ((type == `boot) && (bl == "grub")) + { + // check if device is in device map + if (haskey(device_mapping, k) || (haskey(device_mapping, Dev2MountByDev(k)))) + partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); + } else { + partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); + } + }); + list<string> floppies = getFloppyDevices (); + + devices = filter (string k, map v, devices, + ``(v["type"]:`CT_UNKNOWN != `CT_LVM)); + + if (type == `boot || type == `boot_other) + { + devices = filter (string k, map v, devices, { + if ((v["type"]:`CT_UNKNOWN == `CT_DISK) || + (v["type"]:`CT_UNKNOWN == `CT_DMRAID)) + return true; + else + return false; + }); + } + list<string> all_disks = (list<string>) maplist (string k, map v, devices, + { + return k; + }); + + + + if (type == `deleted) + return maplist (map x, filter (map p, partitions, ``(p["delete"]:false)), + ``{return x["device"]:""; + }); + else if (type == `destroyed) + { + return maplist (map x, filter (map p, partitions, { + return p["delete"]:false || p["format"]:false + || p["create"]:false; + }), + { + return x["device"]:""; + }); + } + partitions = filter (map p, partitions, ``(! p["delete"]:false)); + // filter out disk which are not in device map + if ((bl == "grub") && (type == `boot)) + all_disks = (list<string>) filter(string k, all_disks, { + if (haskey(device_mapping, k) || (haskey(device_mapping, Dev2MountByDev(k)))) + return true; + else + return false; + }); + list<string> ret = all_disks; + if (type == `boot_other || type == `root || type == `parts_old + || type == `kept) + ret = []; + + if (type == `boot) + { + partitions = filter (map p, partitions, + ``(p["type"]:`primary == `primary + || p["type"]:`primary == `extended + || p["type"]:`primary == `logical + || p["type"]:`primary == `sw_raid) + ); + // FIXME this checking is performed on 3 places, one function should + // be developed for it + partitions = filter (map p, partitions, { + symbol fs = (symbol)(p["used_fs"]:p["detected_fs"]:nil); + if (fs == `xfs) + return false; + return true; + }); + } + else if (type == `root) + { + partitions = filter (map p, partitions, + ``(p["type"]:`primary != `extended)); + } + else if (type == `parts_old) + { + partitions = filter (map p, partitions, ``(! p["create"]:false)); + } + else if (type == `kept) + { + partitions = filter (map p, partitions, { + return ! (p["create"]:false || p["format"]:false); + }); + } + if (type != `all && type != `parts_old && type != `kept) + { + partitions = filter (map p, partitions, + ``(p["fstype"]:"" != "Linux swap")); + } + if (type == `boot) + { + partitions = filter (map p, partitions, + ``(p["fstype"]:"" == "Linux native" + || p["fstype"]:"" == "Extended" + || p["fstype"]:"" == "Linux RAID" + || p["fstype"]:"" == "MD Raid" + || p["fstype"]:"" == "DM RAID")); + } + list<string>partition_names + = maplist (map p, partitions, ``((string)(p["device"]:""))); + partition_names = filter (string p, partition_names, ``(p != "")); + partition_names = (list<string>)merge (partition_names, floppies); + ret = (list<string>)union (ret, partition_names); + ret = (list<string>)toset (ret); + return (list<string>)ret; +} + + } 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 Thu Apr 23 14:56:26 2009 @@ -24,6 +24,7 @@ import "Arch"; import "Storage"; import "BootCommon"; +import "BootStorage"; /** * List of problems found during last check @@ -137,7 +138,7 @@ boolean GptPartitionTable () { boolean ret = true; map tm = Storage::GetTargetMap (); - list<string> devices = [ BootCommon::BootPartitionDevice ]; + list<string> devices = [ BootStorage::BootPartitionDevice ]; // TODO add more devices foreach (string dev, devices, { map p_dev = Storage::GetDiskPartition (dev); @@ -178,7 +179,7 @@ boot_device = BootCommon::getBootPartition(); - // if (BootCommon::BootPartitionDevice == BootCommon::RootPartitionDevice) + // if (BootStorage::BootPartitionDevice == BootStorage::RootPartitionDevice) // AddNewProblem (_("Doesn't exist separete /boot partition")); boolean found_boot = false; @@ -234,7 +235,7 @@ boolean CheckBios_ID() { boolean ret = true; - if (BootCommon::bois_id_missing) + if (BootStorage::bois_id_missing) { AddNewProblem (_("It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"")); ret = false; Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Thu Apr 23 14:56:26 2009 @@ -23,6 +23,7 @@ import "Arch"; import "BootCommon"; + import "BootStorage"; import "Installation"; import "Initrd"; import "Kernel"; @@ -1231,7 +1232,7 @@ */ global define string getRootDevice () { ReadOrProposeIfNeeded (); - return BootCommon::RootPartitionDevice; + return BootStorage::RootPartitionDevice; } /** @@ -1240,7 +1241,7 @@ */ global define void setRootDevice (string device) { ReadOrProposeIfNeeded (); - BootCommon::RootPartitionDevice = device; + BootStorage::RootPartitionDevice = device; } /** @@ -1249,7 +1250,7 @@ */ global define string getBootDevice () { ReadOrProposeIfNeeded (); - return BootCommon::BootPartitionDevice; + return BootStorage::BootPartitionDevice; } /** @@ -1258,7 +1259,7 @@ */ global define void setBootDevice (string device) { ReadOrProposeIfNeeded (); - BootCommon::BootPartitionDevice = device; + BootStorage::BootPartitionDevice = device; } /** Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_w… ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Thu Apr 23 14:56:26 2009 @@ -115,7 +115,7 @@ { type = _("Image"); string image = s["image"]:""; - string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + string root = (BootStorage::getHintedPartitionList ([s["root"]:""]))[0]:""; boolean elilo = Bootloader::getLoaderType () == "elilo"; info = (image != "" && image != nil) ? sformat ("%1 (%2%3)", image, elilo ? "" : BootCommon::splitPath (image)[0]:"", @@ -124,7 +124,7 @@ else if (s["type"]:"" == "xen"){ type = _("Xen"); string image = s["image"]:""; - string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:""; + string root = (BootStorage::getHintedPartitionList ([s["root"]:""]))[0]:""; boolean elilo = Bootloader::getLoaderType () == "elilo"; info = (image != "" && image != nil) ? sformat ("%1 (%2%3)", image, elilo ? "" : BootCommon::splitPath (image)[0]:"", Modified: trunk/bootloader/src/routines/i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/i386.ycp… ============================================================================== --- trunk/bootloader/src/routines/i386.ycp (original) +++ trunk/bootloader/src/routines/i386.ycp Thu Apr 23 14:56:26 2009 @@ -148,7 +148,7 @@ if (! was_proposed) { DetectDisks (); - del_parts = getPartitionList (`deleted); + del_parts = BootStorage::getPartitionList (`deleted, getLoaderType(false)); // check whether edd is loaded; if not: load it string lsmod_command = "lsmod | grep edd"; y2milestone ("Running command %1", lsmod_command); @@ -165,8 +165,9 @@ } // refresh device map - if (device_mapping == nil - || size (device_mapping) == 0) + if ((BootStorage::device_mapping == nil + || size (BootStorage::device_mapping) == 0) + && (getLoaderType(false) == "grub")) { ProposeDeviceMap (); } Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_ifac… ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Thu Apr 23 14:56:26 2009 @@ -33,44 +33,13 @@ */ string library_initialized = nil; -/** - * Storage locked - */ - -boolean storage_initialized = false; /** * Declarations... */ global boolean DefineMultipath(map<string,string> multipath_map); -boolean checkCallingDiskInfo () -{ - boolean ret = false; - - // fix for problem with unintialized storage library in AutoYaST mode - // bnc #464090 - if (Mode::config() && (!storage_initialized)) - { - storage_initialized = true; - y2milestone("Init storage library in yast2-bootloader"); - Storage::InitLibstorage(true); - } - if ((disk_change_time_checkCallingDiskInfo != Storage::GetTargetChangeTime()) - || (size(partinfo) < 1)) - { - // save last change time from storage - disk_change_time_checkCallingDiskInfo = Storage::GetTargetChangeTime(); - y2milestone("disk was changed by storage or partinfo is empty: %1", size(partinfo)); - y2milestone("generate partinfo, md_info, mountpoints and multipath_mapping"); - ret = true; - } else { - ret = false; - y2milestone("Skip genarating partinfo, md_info, mountpoints and multipath_mapping"); - } - return ret; -} /** @@ -81,104 +50,16 @@ // FIXME: this should be done directly in perl-Bootloader through LibStorage.pm global void SetDiskInfo () { - if (checkCallingDiskInfo()) - { - // delete variables for perl-Bootloader - md_info = $[]; - multipath_mapping = $[]; - partinfo = []; - mountpoints = $[]; - - map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); - - - multipath_mapping = BootCommon::mapRealDevicesToMultipath(); - mountpoints = mapmap (string k, list v, - (map<string,list>)Storage::GetMountPoints (), - { - // detect all raid1 md devices and mark them in md_info - any device = v[0]:nil; - if (v[3]:"" == "raid1") - md_info[(string)device]=[]; - return $[ k : device ]; - }); - mountpoints = filter (string k, any v, mountpoints, { - string tmpdir = (string)SCR::Read (.target.tmpdir); - integer tmp_sz = size (tmpdir); - return is (v, string) && substring (k, 0, tmp_sz) != tmpdir; - }); - - y2milestone ("Detected mountpoints: %1", mountpoints); - - list<list<list> > pi = maplist (string disk, map info, tm, - { - if (info["type"]:`CT_UNKNOWN==`CT_LVM) - return []; - if (info["type"]:`CT_UNKNOWN==`CT_EVMS) - return []; - list partitions = info["partitions"]:[]; - list<list> parts = maplist (map p, (list<map>)partitions, { - string raid = ""; - if( p["used_by_type"]:`UB_NONE==`UB_MD ) - raid = p["used_by_device"]:""; - string device = p["device"]:""; - // We only pass along RAID1 devices as all other causes - // severe breakage in the bootloader stack - if (raid != "") { - if (haskey (md_info, raid)) { - list<string> members = md_info[raid]:[]; - members = add (members, device); - md_info[raid] = members; - } - } - any nr = p["nr"]:nil; - if (nr == nil) - nr = 0; - string nr_str = sformat ("%1", nr); - /* FIXME: And the other information about the disk ?: - p["fsid"] = LibStorage::PartitionInfo::swig_id_get(info); - p["fstype"] = Partitions::FsIdToString( p["fsid"]:0 ); - p["region"] = [ LibStorage::PartitionInfo::swig_cylStart_get(info), - LibStorage::PartitionInfo::swig_cylSize_get(info) ]; - p["type"] = toSymbol( conv_ptype, t ); - p["boot"] = true; - */ - - return [ device, disk, nr_str, tostring(p["fsid"]:0), - p["fstype"]:"unknown", tostring(p["type"]:nil), - tostring(p["region", 0]:0), tostring(p["region", 1]:0) - ]; - }); - return parts; - }); - partinfo = flatten (pi); - partinfo = filter (list p, partinfo, {return p != nil && p != [];}); - list<list> partinfo_mountby = []; - // adding moundby (by-id) via user preference - foreach(list partition, partinfo, { - list tmp =[]; - string mount_by = BootStorage::Dev2MountByDev(tostring(partition[0]:"")); - if (mount_by != tostring(partition[0]:"")) - { - tmp = add(partition, mount_by); - } else { - tmp = partition; - } - partinfo_mountby = add(partinfo_mountby, tmp); - }); - // y2milestone("added mountby: %1", partinfo_mountby); - - partinfo = partinfo_mountby; - } + BootStorage::InitDiskInfo(); - y2milestone ("Information about partitioning: %1", partinfo); - y2milestone ("Information about MD arrays: %1", md_info); - y2milestone ("Mapping real disk to multipath: %1", multipath_mapping); - - System::Bootloader_API::setMountPoints ((map<string,string>) mountpoints); - System::Bootloader_API::setPartitions ((list<list<string> >) partinfo); - System::Bootloader_API::setMDArrays ((map<string,list<string> >) md_info); - DefineMultipath(multipath_mapping); + y2milestone ("Information about partitioning: %1", BootStorage::partinfo); + y2milestone ("Information about MD arrays: %1", BootStorage::md_info); + y2milestone ("Mapping real disk to multipath: %1", BootStorage::multipath_mapping); + + System::Bootloader_API::setMountPoints ((map<string,string>) BootStorage::mountpoints); + System::Bootloader_API::setPartitions ((list<list<string> >) BootStorage::partinfo); + System::Bootloader_API::setMDArrays ((map<string,list<string> >) BootStorage::md_info); + DefineMultipath(BootStorage::multipath_mapping); } /** Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Apr 23 14:56:26 2009 @@ -47,8 +47,8 @@ // don't change configuration if '/' and '/boot' were not changed // and location is "floppy", "mbr" or "boot" - if (actual_boot == BootCommon::BootPartitionDevice - && actual_root == BootCommon::RootPartitionDevice + if (actual_boot == BootStorage::BootPartitionDevice + && actual_root == BootStorage::RootPartitionDevice && selected_location != "custom" && selected_location != "" && selected_location != nil) @@ -56,7 +56,7 @@ return false; } - list all_partitions = BootCommon::getPartitionList(`boot); + list all_partitions = BootStorage::getPartitionList(`boot, getLoaderType(false)); if (!contains(all_partitions, BootCommon::loader_device)) { @@ -100,10 +100,10 @@ { string result = ""; string boot_device = ""; - if ((BootCommon::BootPartitionDevice != nil) && (BootCommon::BootPartitionDevice != "")) - boot_device = BootCommon::BootPartitionDevice; + if ((BootStorage::BootPartitionDevice != nil) && (BootStorage::BootPartitionDevice != "")) + boot_device = BootStorage::BootPartitionDevice; else - boot_device = BootCommon::RootPartitionDevice; + boot_device = BootStorage::RootPartitionDevice; foreach(map p, partitions, { if (p["device"]:"" == boot_device) @@ -162,15 +162,15 @@ // - is primary: is_logical -> false // - is on the first disk (with the MBR): disk_is_mbr -> true map<string,any> tm = Storage::GetTargetMap (); - map dp = Storage::GetDiskPartition (BootPartitionDevice); + map dp = Storage::GetDiskPartition (BootStorage::BootPartitionDevice); string disk = dp["disk"]:""; boolean disk_is_mbr = disk == mbrDisk; map dm = tm[disk]:$[]; list<map> partitions = dm["partitions"]:[]; boolean is_logical = false; string extended = nil; - list<string> needed_devices = [ BootPartitionDevice ]; - map<string,integer> md_info = Md2Partitions (BootPartitionDevice); + list<string> needed_devices = [ BootStorage::BootPartitionDevice ]; + map<string,integer> md_info = Md2Partitions (BootStorage::BootPartitionDevice); if (md_info != nil && size (md_info) > 0) { disk_is_mbr = false; @@ -208,7 +208,7 @@ if (disk_is_mbr && ! is_logical) { selected_location = "boot"; - loader_device = BootPartitionDevice; + loader_device = BootStorage::BootPartitionDevice; activate = true; activate_changed = true; // examine_mbr.pl returns @@ -247,10 +247,10 @@ if (is_logical && extended != nil) loader_device = extended; else - loader_device = BootPartitionDevice; + loader_device = BootStorage::BootPartitionDevice; selected_location = "boot"; } - if (! contains (getPartitionList (`boot), loader_device)) + if (! contains (BootStorage::getPartitionList (`boot, getLoaderType(false)), loader_device)) { selected_location = "mbr"; // default to mbr loader_device = BootCommon::mbrDisk; @@ -301,16 +301,16 @@ y2milestone( "mountPoints %1", mp ); y2milestone( "mountdata_boot %1", mountdata_boot ); - BootCommon::RootPartitionDevice = mp["/", 0]:""; + BootStorage::RootPartitionDevice = mp["/", 0]:""; - if (BootCommon::RootPartitionDevice == "") + if (BootStorage::RootPartitionDevice == "") { y2error ("No mountpoint for / !!"); } // if /boot changed, re-configure location - BootCommon::BootPartitionDevice - = mountdata_boot[0]:BootCommon::RootPartitionDevice; + BootStorage::BootPartitionDevice + = mountdata_boot[0]:BootStorage::RootPartitionDevice; if (BootCommon::mbrDisk == "" || BootCommon::mbrDisk == nil) { @@ -319,7 +319,7 @@ } if (loader_device == nil || loader_device == "" - || ! contains (getPartitionList (`boot), loader_device)) + || ! contains (BootStorage::getPartitionList (`boot, getLoaderType(false)), loader_device)) ConfigureLocation (); } @@ -515,7 +515,7 @@ * Fix section of lilo-like bootloader */ global void FixSections (void() create_sections) { - list<string> parts = getPartitionList(`parts_old); + list<string> parts = BootStorage::getPartitionList(`parts_old, getLoaderType(false)); if (partitioning_last_change != Storage::GetTargetChangeTime() && BootCommon::files_edited) @@ -999,13 +999,13 @@ * Read device map and store it in internal structures */ global void UpdateDeviceMap () { - device_mapping = mapmap (string unix, string fw, device_mapping, { + BootStorage::device_mapping = mapmap (string unix, string fw, BootStorage::device_mapping, { y2milestone ("Updating device in devmap entry %1 -> %2", unix, fw); unix = BootCommon::UpdateDevice (unix); return $[ unix : fw ]; }); - y2milestone ("Updated device map: %1", device_mapping); + y2milestone ("Updated device map: %1", BootStorage::device_mapping); } /** @@ -1107,256 +1107,6 @@ } -/*** helper functions for ProposeDeviceMap: ***/ -/** - * Returns true if any device from list devices is in device_mapping - * marked as hd0. - */ -boolean isHd0(list<string> devices) -{ - boolean ret = false; - - foreach (string value, devices, - { - if (device_mapping[value]:"" == "hd0"){ - ret = true; - } - }); - - return ret; -} - -/** - * Returns first key from mapping associated with value. - * Example: - * map = $[ "a" : "1", - * "b" : "2", - * "c" : "3", - * "d" : "2"]; - * getDeviceFromMapping("1", map) -> "a" - * getDeviceFromMapping("2", map) -> "b" - */ -string getKey(string value, map<string, string> mapping) -{ - string ret = ""; - - foreach (string key, string val, mapping, - { - if (value == val){ - ret = key; - return; - } - }); - - return ret; -} - -/** - * This function changes order of devices in device_mapping. - * All devices listed in bad_devices are maped to "hdN" are moved to the end - * (with changed number N). And second step is putting device with boot partition - * on top (i.e. device_mapping[dev_with_boot] = "hd0"). - * - * Example: - * device_mapping = $[ "/dev/sda" : "hd0", - * "/dev/sdb" : "hd1", - * "/dev/sdc" : "hd2", - * "/dev/sdd" : "hd3", - * "/dev/sde" : "hd4" ]; - * bad_devices = [ "/dev/sda", "/dev/sdc" ]; - * - * changeOrderInDeviceMapping(bad_devices); - * // after call, device_mapping is: - * device_mapping -> $[ "/dev/sda" : "hd3", - * "/dev/sdb" : "hd0", - * "/dev/sdc" : "hd4", - * "/dev/sdd" : "hd1", - * "/dev/sde" : "hd2" ]; - */ -void changeOrderInDeviceMapping(list<string> bad_devices) -{ - integer cur_id = 0; - list keys = []; - string value = ""; - string tmp = ""; - string tmp2 = ""; - - // get keys from device_mapping, it's not possible to use foreach over keys and values - // of device_mapping directly, because during the loop device_mapping is changing. - foreach (string key, string value, device_mapping, { keys = add(keys, key); }); - - // put bad_devices at bottom - foreach (string key, (list<string>)keys, - { - value = device_mapping[key]:""; - - // if device is mapped on hdX and this device is _not_ in bad_devices - if (substring(value, 0, 2) == "hd" - && !contains(bad_devices, key)){ - // get device name of mapped on "hd"+cur_id - tmp = getKey("hd" + tostring(cur_id), device_mapping); - - // swap tmp and key devices (swap their mapping) - device_mapping[tmp] = value; - device_mapping[key] = "hd" + tostring(cur_id); - - cur_id = cur_id + 1; - } - }); - - // put device with boot partition on the top: - /* - tmp = (regexptokenize(BootCommon::BootPartitionDevice, "([a-z/]+)[0-9]*"))[0]:""; - if (haskey(device_mapping, tmp) && device_mapping[tmp]:"" != "hd0"){ - y2debug("Putting device with boot partition (%1) on the top.", tmp); - - tmp2 = getKey("hd0", device_mapping); - device_mapping[tmp2] = device_mapping[tmp]:""; - device_mapping[tmp] = "hd0"; - }*/ -} -/*** helper functions END ***/ - -/** - * Generate device map proposal, store it in internal variables. - * - * FATE #302075: - * When user is installing from USB media or any non IDE disk or bios simply - * set any non IDE disk as first and user is not installing on this removable - * (non IDE) disk, the order of disks proposed by bios must be changed because - * of future remove of USB disk. - * This function must find right place for bootloader (which is most probably - * boot sector of boot partition (where /boot dir is located)) and change the - * order of disks in device map. - * This method is only heuristic because order of disks after remove of usb - * disk can't be determined by any method. - * - * Algorithm for solving problem with usb disk propsed by bios as hd0: - * if usbDiskDevice == hd0 && BootDevice != usbDiskDevice: - * change order of disks in device_mappings to have BootDevice as hd0 - */ -// FIXME: remove that function from here, as it is grub only -// NOTE: there is a local copy in routines/grub/misc.ycp now -global void ProposeDeviceMap () { - list<string> usb_disks = []; // contains those usb removable disks - - device_mapping = $[]; - multipath_mapping = $[]; - - if (getLoaderType (false) == "grub") - { - map<string,map> targetMap = $[]; - if (Mode::config ()) - y2milestone ("Skipping device map proposing in Config mode"); - else - targetMap = (map<string,map>)Storage::GetTargetMap(); - - // filter out members of BIOS RAIDs and multipath devices - targetMap = filter (string k, map v, targetMap, { - return v["used_by_type"]:nil != `UB_DMRAID && v["used_by_type"]:nil != `UB_DMMULTIPATH; - }); - // filter out non-disk devices - targetMap = filter (string k, map v, targetMap, { - return v["type"]:`CT_UNKNOWN==`CT_DMRAID || v["type"]:`CT_UNKNOWN==`CT_DISK - || v["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH; - }); - - y2milestone ("Target map: %1", targetMap); - - // add devices with known bios_id - // collect BIOS IDs which are used - map ids = $[]; - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id != "") - { - integer index = tointeger (bios_id) - tointeger ("0x80"); - string grub_dev = sformat ("hd%1", index); - // FATE #303548 - doesn't add disk with same bios_id with different name (multipath machine) - if (! ids[index]:false) - { - device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - } - }); - // and guess other devices - // don't use already used BIOS IDs - foreach (string target_dev, map target, targetMap, { - string bios_id = target["bios_id"]:""; - if (bios_id == "") - { - integer index = 0; - while (ids[index]:false) - index = index + 1; - string grub_dev = sformat ("hd%1", index); - device_mapping[target_dev] = grub_dev; - ids[index] = true; - } - }); - - // Fill usb_disks list with usb removable devices. - // - // It's not easy to determine how to identify removable usb devices. Now - // it tests if driver of device is usb-storage. If you find better - // algorithm how to find removable usb devices, put it here into foreach - // to apply this algorithm on all devices. - foreach (string target_dev, map target, targetMap, - { - string driver = target["driver"]:""; - if (driver == "usb-storage"){ - usb_disks = add(usb_disks, target_dev); - } - }); - y2milestone("Found usb discs: %1", usb_disks); - - // change order in device_mapping if usb disk is hd0 - // (FATE #302075) - if (isHd0(usb_disks) - && BootCommon::BootPartitionDevice != getKey("hd0", device_mapping)){ - y2milestone ("Detected device mapping: %1", device_mapping); - y2milestone("Changing order in device mapping needed..."); - changeOrderInDeviceMapping(usb_disks); - } - - if (size(device_mapping) == 1) - bois_id_missing = false; - if (StorageDevices::FloppyPresent()) - device_mapping[StorageDevices::FloppyDevice()] = "fd0"; - - y2milestone ("Detected device mapping: %1", device_mapping); - - multipath_mapping = BootCommon::mapRealDevicesToMultipath(); - - y2milestone ("Detected multipath mapping: %1", multipath_mapping); - - } else { - y2milestone("Skip creating device map for bootloader: %1", getLoaderType (false)); - } -} - -/** - * Get the order of disks according to BIOS mapping - * @return a list of all disks in the order BIOS sees them - */ -global list<string> DisksOrder () { - if (device_mapping == nil || size (device_mapping) == 0) - { - ProposeDeviceMap (); - } - map<string,string> devmap_rev = mapmap (string k, string v, - BootCommon::device_mapping, - { - return $[ v : k ]; - }); - devmap_rev = filter (string k, string v, devmap_rev, { - return substring (k, 0, 2) == "hd"; - }); - list<string> order = maplist (string k, string v, devmap_rev, { - return v; - }); - return order; -} /** * Get the summary of disks order for the proposal Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Apr 23 14:56:26 2009 @@ -131,53 +131,6 @@ Misc::boot_msg = msg; } - /** - * Get the list of installed floppy drives - * @return a list of floppy devices - */ - global list<string> getFloppyDevices () ``{ - if (floppy_devices == nil) - { - list<map> floppies = (list<map>) SCR::Read (.probe.floppy); - floppies = filter (map f, floppies, - ``(f["model"]:"Floppy Disk" == "Floppy Disk")); - floppy_devices = maplist (map f, floppies, - ``(f["dev_name"]:"")); - floppy_devices = filter (string f, floppy_devices, ``(f != "")); - } - return floppy_devices; - } - - - -/** - * Function remap device map to device name (/dev/sda) - * or to label (ufo_disk) - * @param map<string,string> device map - * @return map<string,string> new device map - */ - -global map<string,string> remapDeviceMap(map<string,string> device_map) -{ - symbol by_mount = nil; - if (Arch::ppc()) - by_mount = `id; - else - by_mount = Storage::GetDefaultMountBy(); - - //by_mount = `id; - if (by_mount == `label) - return device_map; - - map<string,string> ret = $[]; - // convert device names in device map to the device names by device or label - ret = mapmap (string k , string v, device_mapping, - { - return $[BootStorage::MountByDev2Dev(k) : v]; - }); - - return ret; -} /** * Function remap globals settings "boot_custom" device name (/dev/sda) @@ -324,192 +277,6 @@ /** - * Returns list of partitions with "mount by" hints. Goes through the list - * of partitions passed as a parameter and creates a list of partitions with - * hints according to the current partitioning requested from - * yast2-storage. To be used in a combobox or menu. - * - * @param parts_to_get list<string> partitions to list - * @return a list of strings containing a partition name and a hint (if applicable) - */ - global define list<string> getHintedPartitionList(list<string> parts_to_get) ``{ - y2milestone ("getHintedPartitionList: %1", parts_to_get); - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - - // make a map: "/dev/hda1" -> info_map_for_this_partition - map<string,map> partitions = $[]; - foreach (string k, map v, devices, ``{ - foreach (map p, (list<map>)(v["partitions"]:[]), ``{ - partitions[p["device"]:""] = p; - }); - }); - y2milestone ("getHintedPartitionList: partitions %1", partitions); - - symbol mountby = `device; - list<string> ret = maplist (string dev, parts_to_get, ``{ - mountby = (symbol) partitions[dev, "mountby"]:nil; - if ( mountby == `uuid ) - { - return sformat ("%1 (mount by UUID: %2)", dev, - partitions[dev, "uuid"]:nil != nil ? - partitions[dev, "uuid"]:"" : - "<UUID to be created later during format>"); - } else if ( mountby == `label ) - { - return sformat ("%1 (mount by LABEL: %2)", dev, partitions[dev, "label"]:""); - } else if ( mountby == `id ) - { - return sformat ("%1 (mount by ID: %2)", dev, partitions[dev, "udev_id", 0]:""); - } else if ( mountby == `path ) - { - return sformat ("%1 (mount by PATH: %2)", dev, partitions[dev, "udev_path"]:""); - } else if ( mountby == nil || mountby == `device ) - { - return dev; - } - }); - - y2milestone ("getHintedPartitionList: ret %1", ret); - return ret; - } - - /** - * Returns list of partitions. Requests current partitioning from - * yast2-storage and creates list of partition for combobox, menu or other - * purpose. - * @param type symbol - * `boot - for bootloader installation - * `root - for kernel root - * `boot_other - for bootable partitions of other systems - * `all - all partitions - * `parts_old - all partitions, except those what will be created - * during isntallation - * `deleted - all partitions deleted in current proposal - * `kept - all partitions that won't be deleted, new created or formatted - * `destroyed - all partition which are new, deleted or formatted - * @return a list of strings - */ - global define list<string> getPartitionList(symbol type) ``{ - y2milestone ("getPartitionList: %1", type); - string bl = getLoaderType(false); - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - list<map> partitions = []; - foreach (string k, map v, devices, ``{ - if ((type == `boot) && (bl == "grub")) - { - // check if device is in device map - if (haskey(device_mapping, k) || (haskey(device_mapping, BootStorage::Dev2MountByDev(k)))) - partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); - } else { - partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); - } - }); - list<string> floppies = getFloppyDevices (); - - devices = filter (string k, map v, devices, - ``(v["type"]:`CT_UNKNOWN != `CT_LVM)); - - if (type == `boot || type == `boot_other) - { - devices = filter (string k, map v, devices, { - if ((v["type"]:`CT_UNKNOWN == `CT_DISK) || - (v["type"]:`CT_UNKNOWN == `CT_DMRAID)) - return true; - else - return false; - }); - } - list<string> all_disks = (list<string>) maplist (string k, map v, devices, - { - return k; - }); - - - - if (type == `deleted) - return maplist (map x, filter (map p, partitions, ``(p["delete"]:false)), - ``{return x["device"]:""; - }); - else if (type == `destroyed) - { - return maplist (map x, filter (map p, partitions, { - return p["delete"]:false || p["format"]:false - || p["create"]:false; - }), - { - return x["device"]:""; - }); - } - partitions = filter (map p, partitions, ``(! p["delete"]:false)); - // filter out disk which are not in device map - if ((bl == "grub") && (type == `boot)) - all_disks = (list<string>) filter(string k, all_disks, { - if (haskey(device_mapping, k) || (haskey(device_mapping, BootStorage::Dev2MountByDev(k)))) - return true; - else - return false; - }); - list<string> ret = all_disks; - if (type == `boot_other || type == `root || type == `parts_old - || type == `kept) - ret = []; - - if (type == `boot) - { - partitions = filter (map p, partitions, - ``(p["type"]:`primary == `primary - || p["type"]:`primary == `extended - || p["type"]:`primary == `logical - || p["type"]:`primary == `sw_raid) - ); - // FIXME this checking is performed on 3 places, one function should - // be developed for it - partitions = filter (map p, partitions, { - symbol fs = (symbol)(p["used_fs"]:p["detected_fs"]:nil); - if (fs == `xfs) - return false; - return true; - }); - } - else if (type == `root) - { - partitions = filter (map p, partitions, - ``(p["type"]:`primary != `extended)); - } - else if (type == `parts_old) - { - partitions = filter (map p, partitions, ``(! p["create"]:false)); - } - else if (type == `kept) - { - partitions = filter (map p, partitions, { - return ! (p["create"]:false || p["format"]:false); - }); - } - if (type != `all && type != `parts_old && type != `kept) - { - partitions = filter (map p, partitions, - ``(p["fstype"]:"" != "Linux swap")); - } - if (type == `boot) - { - partitions = filter (map p, partitions, - ``(p["fstype"]:"" == "Linux native" - || p["fstype"]:"" == "Extended" - || p["fstype"]:"" == "Linux RAID" - || p["fstype"]:"" == "MD Raid" - || p["fstype"]:"" == "DM RAID")); - } - list<string>partition_names - = maplist (map p, partitions, ``((string)(p["device"]:""))); - partition_names = filter (string p, partition_names, ``(p != "")); - partition_names = (list<string>)merge (partition_names, floppies); - ret = (list<string>)union (ret, partition_names); - ret = (list<string>)toset (ret); - return (list<string>)ret; - } - - /** * returns true if char is blank (newline, tab or space) * @param s single char string * @return boolean blank/non blank @@ -580,9 +347,9 @@ if (BootCommon::selected_location == "mbr") return BootCommon::mbrDisk; if (BootCommon::selected_location == "boot") - return BootCommon::BootPartitionDevice; + return BootStorage::BootPartitionDevice; if (BootCommon::selected_location == "root") - return BootCommon::RootPartitionDevice; + return BootStorage::RootPartitionDevice; if (BootCommon::selected_location == "floppy") return StorageDevices::FloppyDevice(); if (BootCommon::selected_location == "mbr_md") @@ -600,17 +367,17 @@ global define list<string> GetBootloaderDevices () ``{ list<string> ret = []; if (BootCommon::globals["boot_boot"]:"false" == "true") { - ret = add(ret, BootCommon::BootPartitionDevice); + ret = add(ret, BootStorage::BootPartitionDevice); } if (BootCommon::globals["boot_root"]:"false" == "true") { - ret = add(ret, BootCommon::RootPartitionDevice); + ret = add(ret, BootStorage::RootPartitionDevice); } if (BootCommon::globals["boot_mbr"]:"false" == "true") { ret = add(ret, BootCommon::mbrDisk); } if ( haskey(BootCommon::globals, "boot_extended") && BootCommon::globals["boot_extended"]:"false" == "true" ) { - ret = add(ret, BootCommon::ExtendedPartitionDevice); + ret = add(ret, BootStorage::ExtendedPartitionDevice); } // FIXME: floppy support is probably obsolete if ( haskey(BootCommon::globals, "boot_floppy") && @@ -660,7 +427,7 @@ ret = false; else if (loader_device == StorageDevices::FloppyDevice()) ret = true; - else if (contains (getFloppyDevices (), loader_device)) + else if (contains (BootStorage::getFloppyDevices (), loader_device)) ret = true; y2milestone ("Installing to floppy: %1", ret); return ret; @@ -899,7 +666,7 @@ map<string,integer> md = $[]; if (BootCommon::loader_device == "mbr_md") { - md = Md2Partitions (BootCommon::BootPartitionDevice); + md = Md2Partitions (BootStorage::BootPartitionDevice); } else { @@ -912,7 +679,7 @@ } list<map<string,any> > ret = maplist (string partition, partitions, { return getPartitionToActivate ( - BootCommon::BootPartitionDevice, + BootStorage::BootPartitionDevice, partition); }); return toset (ret); @@ -928,7 +695,7 @@ map<string,integer> md = $[]; if (BootCommon::loader_device == "mbr_md") { - md = Md2Partitions (BootCommon::BootPartitionDevice); + md = Md2Partitions (BootStorage::BootPartitionDevice); } else { @@ -936,7 +703,7 @@ } list<string> mbrs = maplist (string d, integer b, md, { d = getPartitionToActivate ( - BootCommon::BootPartitionDevice, d + BootStorage::BootPartitionDevice, d )["mbr"]:mbrDisk; return d; }); @@ -1369,8 +1136,8 @@ { DetectDisks (); y2milestone ("Boot partition device: %1", - BootCommon::BootPartitionDevice); - map dev = Storage::GetDiskPartition( BootCommon::BootPartitionDevice); + BootStorage::BootPartitionDevice); + map dev = Storage::GetDiskPartition( BootStorage::BootPartitionDevice); y2milestone ("Disk info: %1", dev); // MD, but not mirroring is OK // FIXME: type detection by name deprecated @@ -1381,7 +1148,7 @@ list<map> parts = md["partitions"]:[]; map info = $[]; foreach (map p, parts, { - if (p["device"]:"" == BootPartitionDevice) + if (p["device"]:"" == BootStorage::BootPartitionDevice) info = p; }); if (tolower (info["raid_type"]:"") != "raid1") @@ -1706,10 +1473,10 @@ global string getBootPartition() { string boot_device = ""; - if (BootCommon::BootPartitionDevice != "") - boot_device = BootCommon::BootPartitionDevice; - else if (BootCommon::RootPartitionDevice != "") - boot_device = BootCommon::RootPartitionDevice; + if (BootStorage::BootPartitionDevice != "") + boot_device = BootStorage::BootPartitionDevice; + else if (BootStorage::RootPartitionDevice != "") + boot_device = BootStorage::RootPartitionDevice; return boot_device; } @@ -1906,44 +1673,7 @@ } } -/** bnc #447591, 438243, 448110 multipath wrong device map - * Function maps real devices to multipath e.g. - * "/dev/sda/" : "/dev/mapper/SATA_ST3120813AS_3LS0CD7M" - * - * @return map <string, string> mapping real disk to multipath - */ - -// FIXME grub only -map <string, string> mapRealDevicesToMultipath() -{ - map <string, string> ret = $[]; - map<string, map> tm = (map<string,map>)Storage::GetTargetMap (); - integer num_of_real_disk = 0; - foreach (string disk, map disk_info, tm, - { - if (disk_info["type"]:nil == `CT_DMMULTIPATH) - { - list <string> devices = (list <string>) disk_info["devices"]:[]; - if (size(devices) > 0) - { - foreach(string d, devices, - { - ret[d]=disk; - }); - - } - } - - if (disk_info["type"]:nil == `CT_DISK) - num_of_real_disk = num_of_real_disk +1; - if (disk_info["bios_id"]:nil != nil) - bois_id_missing = false; - }); - if (num_of_real_disk == 1) - bois_id_missing = false; - return ret; -} /** bnc #450153 - support for installation kernel from add-on * fucntion call client from add-on and update proposal for Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Thu Apr 23 14:56:26 2009 @@ -29,6 +29,7 @@ import "Storage"; import "StorageDevices"; import "Bootloader"; +import "BootStorage"; import "Popup"; import "FileUtils"; @@ -303,14 +304,14 @@ */ void RootDeviceInit (string widget) { y2milestone ("RootDeviceInit: %1", widget); - list<string> available = BootCommon::getPartitionList (`root); + list<string> available = BootStorage::getPartitionList (`root, Bootloader::getLoaderType()); // if we mount any of these devices by id, label etc., we add a hint to // that effect to the item y2milestone ("RootDeviceInit: getHintedPartitionList for %1", available); - available = BootCommon::getHintedPartitionList (available); + available = BootStorage::getHintedPartitionList (available); UI::ChangeWidget (`id (widget), `Items, available); UI::ChangeWidget (`id (widget), `Value, - (BootCommon::getHintedPartitionList ([BootCommon::current_section[widget]:""]))[0]:""); + (BootStorage::getHintedPartitionList ([BootCommon::current_section[widget]:""]))[0]:""); } /** @@ -336,10 +337,10 @@ string current = (splitstring( (string)UI::QueryWidget (`id (widget), `Value), " "))[0]:""; // check against the list of existing partitions - list<string> available = BootCommon::getPartitionList (`root); + list<string> available = BootStorage::getPartitionList (`root, Bootloader::getLoaderType()); if (contains(available, current)) UI::ChangeWidget (`id (widget), `Value, - (BootCommon::getHintedPartitionList ([current]))[0]:""); + (BootStorage::getHintedPartitionList ([current]))[0]:""); return nil; } @@ -372,7 +373,7 @@ * @param widget any id of the widget */ void ChainloaderInit (string widget) { - list<string> available = BootCommon::getPartitionList (`boot_other); + list<string> available = BootStorage::getPartitionList (`boot_other, Bootloader::getLoaderType()); UI::ChangeWidget (`id (widget), `Items, available); SectionOptionInit (widget); } -- 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] r56932 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: kmachalkova Date: Thu Apr 23 12:59:35 2009 New Revision: 56932 URL: http://svn.opensuse.org/viewcvs/yast?rev=56932&view=rev Log: Function buttons for HDs (finally they do something useful) Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Thu Apr 23 12:59:35 2009 @@ -8,6 +8,7 @@ textdomain "storage"; import "Arch"; + import "TreePanel"; import "Region"; import "Mode"; import "Stage"; @@ -68,6 +69,42 @@ ); } + void HandleHdButtons( string device, map event ) + { + map dev = Storage::GetDiskPartition( device ); + string disk = (string) dev["disk"]:nil; + // FIXME: is this necessary & sufficient condition? + boolean is_disk = (dev["nr"]:"" == ""); + + switch (Event::IsWidgetActivated(event)) + { + case `add: + EpCreatePartition( disk ); + break; + case `edit: + if ( is_disk ) + TreePanel::SwitchToNew( disk ); + else + EpEditPartition( device ); + break; + + case `resize: + if ( is_disk ) + Popup::Error(_("Hard disks, BIOS RAIDs and multipath +devices cannot be resized.")); + else + EpResizePartition ( device ); + break; + + case `delete: + if ( is_disk ) + EpDeleteDisk( device ); + else + EpDeletePartition ( device, UI::WidgetExists(`id(`table)) ? `table : `overview ); + break; + } + } + void CreateHdMainPanel(any user_data) { symbol Predicate(map disk, map partition) @@ -113,10 +150,13 @@ void HandleHdMainPanel(any user_data, map event) { + string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); + + HandleHdButtons( device, event ); + switch (Event::IsWidgetContextMenuActivated(event)) { case `table: - string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); EpContextMenuDevice(device); break; } @@ -272,24 +312,7 @@ string disk_device = (string) user_data; string part_device = (string) UI::QueryWidget(`id(`table), `CurrentItem); - switch (Event::IsWidgetActivated(event)) - { - case `add: - EpCreatePartition(disk_device); - break; - - case `edit: - EpEditPartition(part_device); - break; - - case `resize: - EpResizePartition(part_device); - break; - - case `delete: - EpDeletePartition(part_device, `table); - break; - } + HandleHdButtons( part_device, event ); switch (Event::IsMenu(event)) { @@ -427,21 +450,7 @@ { string part_device = (string) user_data; - switch (Event::IsWidgetActivated(event)) - { - case `edit: - EpEditPartition(part_device); - break; - - case `resize: - EpResizePartition(part_device); - break; - - case `delete: - EpDeletePartition(part_device, `overview); - break; - } - + HandleHdButtons( part_device, event); UI::SetFocus(`id(`text)); } } -- 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] r56931 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: aschnell Date: Thu Apr 23 12:32:38 2009 New Revision: 56931 URL: http://svn.opensuse.org/viewcvs/yast?rev=56931&view=rev Log: - added check Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Apr 23 12:32:38 2009 @@ -5368,6 +5368,10 @@ used, win, efi, ret)) { } + else if (vol->getUsedByType() != UB_NONE) + { + ret = false; + } else { bool needUmount = 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] r56930 - /tags/stable-2_18_5/country/
by jsuchome＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: jsuchome Date: Thu Apr 23 11:32:13 2009 New Revision: 56930 URL: http://svn.opensuse.org/viewcvs/yast?rev=56930&view=rev Log: Created tag stable-2_18_5 for country Added: tags/stable-2_18_5/country/ - copied from r56929, trunk/country/ -- 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] r56929 - in /trunk/country: VERSION language/src/language.ycp package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: jsuchome Date: Thu Apr 23 11:32:06 2009 New Revision: 56929 URL: http://svn.opensuse.org/viewcvs/yast?rev=56929&view=rev Log: - before NTP sync, save the current time zone (bnc#467318) - before updating boot menu, switch the UI language (bnc#446982) - 2.18.5 Modified: trunk/country/VERSION trunk/country/language/src/language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=56929&r1=569… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Apr 23 11:32:06 2009 @@ -1 +1 @@ -2.18.4 +2.18.5 Modified: trunk/country/language/src/language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/language.yc… ============================================================================== --- trunk/country/language/src/language.ycp (original) +++ trunk/country/language/src/language.ycp Thu Apr 23 11:32:06 2009 @@ -120,6 +120,10 @@ Progress::NextStage (); + // switch the UI to new language (after packages installation), so + // the texts in GfxMenu can be translated (bnc#446982) + Language::WfmSetLanguage (); + GfxMenu::Update(); if (Keyboard::Modified ()) @@ -147,7 +151,7 @@ Wizard::CreateDialog(); - // set the language accoring to Language.ycp initialization + // set the language according to Language.ycp initialization Language::WfmSetLanguage (); Wizard::OpenOKDialog(); Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Apr 23 11:32:06 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 23 08:46:45 CEST 2009 - jsuchome(a)suse.cz + +- before NTP sync, save the current time zone (bnc#467318) +- before updating boot menu, switch the UI language (bnc#446982) +- 2.18.5 + +------------------------------------------------------------------- Thu Apr 16 10:53:38 CEST 2009 - jsuchome(a)suse.cz - adapted testsuite for date call change (bnc#445670) Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Apr 23 11:32:06 2009 @@ -124,7 +124,7 @@ // check current time and show it in the time widgets void show_current_time () { - map val = Timezone::GetDateTimeMap(); + map val = Timezone::GetDateTimeMap (); hour = val["hour"]:""; minute = val["minute"]:""; second = val["second"]:""; @@ -288,10 +288,17 @@ if (ret == `accept && ntp_rb) { + // before the sync, save the time zone (bnc#467318) + Timezone::Set (Timezone::timezone, Stage::initial () && !Mode::live_installation ()); // true: go on, exit; false: loop on boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]); if (!ntp_handled) ret = `retry; // loop on + else + { + // after sync, show real time in the widget + Timezone::diff = 0; + } } if (ret == `accept && !ntp_rb) { -- 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] r56928 - in /trunk/storage/libstorage/src: Storage.cc Storage.h StorageTmpl.h Volume.cc
by aschnell＠svn.opensuse.org 23 Apr '09

23 Apr '09

Author: aschnell Date: Thu Apr 23 11:27:48 2009 New Revision: 56928 URL: http://svn.opensuse.org/viewcvs/yast?rev=56928&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTmpl.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Apr 23 11:27:48 2009 @@ -2437,7 +2437,7 @@ if( ignoreFs ) vol->setIgnoreFs(); ret = cont->resizeVolume( &(*vol), newSizeMb*1024 ); - eraseFreeInfo( vol->device() ); + eraseCachedFreeInfo(vol->device()); y2mil( "vol:" << *vol ); } else @@ -5352,10 +5352,10 @@ bool -Storage::getFreeInfo( const string& device, unsigned long long& resize_free, - unsigned long long& df_free, - unsigned long long& used, bool& win, bool& efi, - bool use_cache ) +Storage::getFreeInfo(const string& device, unsigned long long& resize_free, + unsigned long long& df_free, + unsigned long long& used, bool& win, bool& efi, + bool use_cache) { bool ret = false; assertInit(); @@ -5364,8 +5364,8 @@ VolIterator vol; if( findVolume( device, vol ) ) { - if( use_cache && getFreeInf( vol->device(), df_free, resize_free, - used, win, efi, ret )) + if (use_cache && getCachedFreeInfo(vol->device(), df_free, resize_free, + used, win, efi, ret)) { } else @@ -5472,8 +5472,7 @@ if( !ret ) vol->crUnsetup(); } - setFreeInfo( vol->device(), df_free, resize_free, used, win, efi, - ret ); + setCachedFreeInfo(vol->device(), df_free, resize_free, used, win, efi, ret); } } if( ret ) @@ -5482,25 +5481,27 @@ return( ret ); } -void Storage::setFreeInfo( const string& device, unsigned long long df_free, - unsigned long long resize_free, + +void +Storage::setCachedFreeInfo(const string& device, unsigned long long df_free, + unsigned long long resize_free, unsigned long long used, bool win, bool efi, - bool resize_ok ) - { + bool resize_ok) +{ y2mil("device:" << device << " df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << " win:" << win << " efi:" << efi); - FreeInfo inf( df_free, resize_free, used, win, efi, resize_ok ); - freeInfo[device] = inf; - } + mapInsertOrReplace(freeInfo, device, FreeInfo(df_free, resize_free, used, win, efi, resize_ok)); +} + bool -Storage::getFreeInf( const string& device, unsigned long long& df_free, - unsigned long long& resize_free, - unsigned long long& used, bool& win, bool& efi, - bool& resize_ok ) - { - map<string,FreeInfo>::iterator i = freeInfo.find( device ); +Storage::getCachedFreeInfo(const string& device, unsigned long long& df_free, + unsigned long long& resize_free, + unsigned long long& used, bool& win, bool& efi, + bool& resize_ok) const +{ + map<string, FreeInfo>::const_iterator i = freeInfo.find(device); bool ret = i!=freeInfo.end(); if( ret ) { @@ -5515,16 +5516,18 @@ if( ret ) y2mil("df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << " win:" << win << " efi:" << efi << " resize_ok:" << resize_ok); - return( ret ); - } + return ret; +} + void -Storage::eraseFreeInfo( const string& device ) - { +Storage::eraseCachedFreeInfo(const string& device) +{ map<string,FreeInfo>::iterator i = freeInfo.find( device ); if( i!=freeInfo.end() ) freeInfo.erase(i); - } +} + int Storage::createBackupState( const string& name ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Thu Apr 23 11:27:48 2009 @@ -183,6 +183,7 @@ { return( d.type()==storage::NFSC ); } static bool isDm( const Container&d ) { return( d.type()==storage::DM ); } + struct FreeInfo { unsigned long long resize_free; @@ -191,7 +192,6 @@ bool win; bool efi; bool rok; - FreeInfo() { resize_free=df_free=used=0; efi=win=rok=false; } FreeInfo( unsigned long long df, unsigned long long resize, unsigned long long usd, bool w=false, bool e=false, @@ -444,7 +444,7 @@ void getCommitInfos(list<CommitInfo>& infos) const; const string& getLastAction() const { return lastAction; } const string& getExtendedErrorMessage() const { return extendedError; } - void eraseFreeInfo( const string& device ); + void eraseCachedFreeInfo(const string& device); static void waitForDevice(); static int waitForDevice(const string& device); @@ -1694,14 +1694,14 @@ string backupStates() const; void detectObjects(); void deleteBackups(); - void setFreeInfo( const string& device, unsigned long long df_free, - unsigned long long resize_free, - unsigned long long used, bool win, bool efi, - bool resize_ok ); - bool getFreeInf( const string& device, unsigned long long& df_free, - unsigned long long& resize_free, - unsigned long long& used, bool& win, bool& efi, - bool& resize_ok ); + void setCachedFreeInfo(const string& device, unsigned long long df_free, + unsigned long long resize_free, + unsigned long long used, bool win, bool efi, + bool resize_ok); + bool getCachedFreeInfo(const string& device, unsigned long long& df_free, + unsigned long long& resize_free, + unsigned long long& used, bool& win, bool& efi, + bool& resize_ok) const; // protected internal member variables Lock lock; Modified: trunk/storage/libstorage/src/StorageTmpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTm… ============================================================================== --- trunk/storage/libstorage/src/StorageTmpl.h (original) +++ trunk/storage/libstorage/src/StorageTmpl.h Thu Apr 23 11:27:48 2009 @@ -213,6 +213,17 @@ } + template<typename Map, typename Key, typename Value> + typename Map::iterator mapInsertOrReplace(Map& m, const Key& k, const Value& v) + { + typename Map::iterator pos = m.lower_bound(k); + if (pos != m.end() && !typename Map::key_compare()(k, pos->first)) + pos->second = v; + else + pos = m.insert(pos, typename Map::value_type(k, v)); + return pos; + } + template <class T, unsigned int sz> inline unsigned int lengthof (T (&)[sz]) { return sz; } Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Apr 23 11:27:48 2009 @@ -2186,7 +2186,7 @@ { crUnsetup(); } - cont->getStorage()->eraseFreeInfo(dev); + cont->getStorage()->eraseCachedFreeInfo(dev); cont->getStorage()->removeDmTableTo(*this); y2mil("ret:" << ret); 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] r56927 - /trunk/bootloader/src/modules/BootStorage.ycp
by juhliarik＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: juhliarik Date: Wed Apr 22 17:52:36 2009 New Revision: 56927 URL: http://svn.opensuse.org/viewcvs/yast?rev=56927&view=rev Log: updated function for converting persistend device names to kernel names and back Modified: trunk/bootloader/src/modules/BootStorage.ycp Modified: trunk/bootloader/src/modules/BootStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootStora… ============================================================================== --- trunk/bootloader/src/modules/BootStorage.ycp (original) +++ trunk/bootloader/src/modules/BootStorage.ycp Wed Apr 22 17:52:36 2009 @@ -57,14 +57,10 @@ map<string,map> target_map = $[]; -global map<string,string> uuid_partitions = $[]; -global map<string,string> id_partitions = $[]; -global map<string,string> label_partitions = $[]; -global map<string,string> path_partitions = $[]; - -global map<string,string> uuid_disks = $[]; -global map<string,string> id_disks = $[]; -global map<string,string> path_disks = $[]; +/** + * mapping all devices udev-name to kernel name + * importnat for init fucntion of perl-Bootloader + */ global map<string, string> all_devices = $[]; @@ -83,21 +79,18 @@ if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) { dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; - uuid_disks[dev_by_something]= k; all_devices[dev_by_something]= k; } // map disk by path if ((v["path"]:nil != "") && (v["path"]:nil != nil)) { dev_by_something = "/dev/disk/by-path/"+v["path"]:""; - path_disks[dev_by_something]= k; all_devices[dev_by_something]= k; } // map disk by id if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) { dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; - id_disks[dev_by_something] = k; all_devices[dev_by_something]= k; } // map partitions from disk... @@ -108,7 +101,6 @@ if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) { dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; - uuid_partitions[dev_by_something]= p["device"]:""; all_devices[dev_by_something]= p["device"]:""; } @@ -116,7 +108,6 @@ if ((p["path"]:nil != "") && (p["path"]:nil != nil)) { dev_by_something = "/dev/disk/by-path/"+p["path"]:""; - path_partitions[dev_by_something]= p["device"]:""; all_devices[dev_by_something]= p["device"]:""; } @@ -124,7 +115,6 @@ if ((p["label"]:nil != "") && (p["label"]:nil != nil)) { dev_by_something = "/dev/disk/by-label/"+p["label"]:""; - label_partitions[dev_by_something]= p["device"]:""; all_devices[dev_by_something]= p["device"]:""; } @@ -132,21 +122,14 @@ if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) { dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; - id_partitions[dev_by_something] = p["device"]:""; all_devices[dev_by_something]= p["device"]:""; } }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), }); // end of foreach (string k, map v, devices, - y2milestone("disks mapping by-id: %1", id_disks); - y2milestone("disks mapping by-uuid: %1", uuid_disks); - y2milestone("disks mapping by-path: %1", path_disks); - - y2milestone("partitions mapping by-id: %1", id_partitions); - y2milestone("partitions mapping by-uuid: %1", uuid_partitions); - y2milestone("partitions mapping by-path: %1", path_partitions); - y2milestone("partitions mapping by-label: %1", label_partitions); + y2debug("device name mapping to kernel names: %1", all_devices); + } @@ -172,50 +155,8 @@ string ret = dev; // check if it is device name by id - if (search(dev, "/dev/disk/by-id/") != nil) - { - if (haskey(id_partitions, dev)) - ret = id_partitions[dev]:""; - - if (haskey(id_disks, dev)) - ret = id_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - // check if it is device name by uuid - if (search(dev, "/dev/disk/by-uuid/") != nil) - { - if (haskey(uuid_partitions, dev)) - ret = uuid_partitions[dev]:""; - - if (haskey(uuid_disks, dev)) - ret = uuid_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - // check if it is device name by path - if (search(dev, "/dev/disk/by-path/") != nil) - { - if (haskey(path_partitions, dev)) - ret = path_partitions[dev]:""; - - if (haskey(path_disks, dev)) - ret = path_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - // check if it is device name by label - // only partition are supported - if (search(dev, "/dev/disk/by-label/") != nil) - { - if (haskey(label_partitions, dev)) - ret = label_partitions[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } + if (haskey(all_devices, dev)) + ret = all_devices[dev]:""; y2milestone("Device %1 was converted to: %2", dev, ret); return ret; @@ -295,23 +236,33 @@ { y2milestone ("Dev2MountByDev: %1", dev); - // (`id,`uuid,`path,`device,`label) - symbol by_mount = nil; - if (Arch::ppc()) - by_mount = `id; - else - by_mount = Storage::GetDefaultMountBy(); - - //by_mount = `id; - y2milestone("Default mount by is %1", by_mount); - // add all_partitions to partitions if (MapAllPartitions()) y2milestone("Init all_partitions was done"); map<string,map> partitions = all_partitions; map<string,map> devices = target_map; - + + // (`id,`uuid,`path,`device,`label) + symbol by_mount = nil; + + // bnc#458018 accept different mount-by for partition + // created by user + if (!Arch::ppc()) + { + by_mount = Storage::GetDefaultMountBy(); + if (haskey(partitions, dev)) + { + symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil; + if ((partition_mount_by != nil)) + by_mount = partition_mount_by; + } + + } else { + by_mount = `id; + } + + y2milestone("Mount-by: %1", by_mount); string ret = dev; switch(by_mount) { -- 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] r56926 - /tags/branch-SLE-10-SP3-2_13_114/yast2/
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:10:52 2009 New Revision: 56926 URL: http://svn.opensuse.org/viewcvs/yast?rev=56926&view=rev Log: Created tag branch-SLE-10-SP3-2_13_114 for yast2 Added: tags/branch-SLE-10-SP3-2_13_114/yast2/ (props changed) - copied from r56925, branches/SuSE-SLE-10-SP3-Branch/yast2/ -- 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] r56925 - /tags/branch-SLE-10-SP3-2_13_114/
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:10:50 2009 New Revision: 56925 URL: http://svn.opensuse.org/viewcvs/yast?rev=56925&view=rev Log: Created tag branch-SLE-10-SP3-2_13_114 Added: tags/branch-SLE-10-SP3-2_13_114/ -- 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] r56924 - in /branches/SuSE-SLE-10-SP3-Branch/yast2: ./ VERSION library/packages/src/PackageCallbacksInit.ycp package/yast2.changes yast2.spec.in
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:09:34 2009 New Revision: 56924 URL: http://svn.opensuse.org/viewcvs/yast?rev=56924&view=rev Log: - register new callbacks Pkg::CallbackSourceCreateInit/Destroy() and Pkg::CallbackSourceReportInit/Destroy() (#251726) - 2.13.114 Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/ (props changed) branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION branches/SuSE-SLE-10-SP3-Branch/yast2/library/packages/src/PackageCallbacksInit.ycp branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes branches/SuSE-SLE-10-SP3-Branch/yast2/yast2.spec.in Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION Wed Apr 22 17:09:34 2009 @@ -1 +1 @@ -2.13.113 +2.13.114 Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/library/packages/src/PackageCallbacksInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/library/packages/src/PackageCallbacksInit.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/library/packages/src/PackageCallbacksInit.ycp Wed Apr 22 17:09:34 2009 @@ -65,6 +65,8 @@ Pkg::CallbackSourceCreateProgress("PackageCallbacks::SourceCreateProgress"); Pkg::CallbackSourceCreateError("PackageCallbacks::SourceCreateError"); Pkg::CallbackSourceCreateEnd("PackageCallbacks::SourceCreateEnd"); + Pkg::CallbackSourceCreateInit("PackageCallbacks::SourceCreateInit"); + Pkg::CallbackSourceCreateDestroy("PackageCallbacks::SourceCreateDestroy"); // source probing callbacks Pkg::CallbackSourceProbeStart("PackageCallbacks::SourceProbeStart"); @@ -79,6 +81,8 @@ Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); Pkg::CallbackSourceReportError("PackageCallbacks::SourceReportError"); Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit"); + Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy"); // @see bugzilla #183821 Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes Wed Apr 22 17:09:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 22 16:47:14 CEST 2009 - lslezak(a)suse.cz + +- register new callbacks Pkg::CallbackSourceCreateInit/Destroy() + and Pkg::CallbackSourceReportInit/Destroy() (#251726) +- 2.13.114 + +------------------------------------------------------------------- Thu Apr 9 10:04:19 CEST 2009 - lslezak(a)suse.cz - PackageSystem.ycp - check nil result of Pkg::PkgCommit() call Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/yast2.spec.in (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/yast2.spec.in Wed Apr 22 17:09:34 2009 @@ -5,8 +5,8 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # any-agent .etc.fstab: Omit Requires: yast2-core >= 2.13.43 -# Pkg::CallbackAcceptNonTrustedGpgKey() -Requires: yast2-pkg-bindings >= 2.13.111 +# Pkg::CallbackSourceCreateInit/Destroy() +Requires: yast2-pkg-bindings >= 2.13.125 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab -- 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] r56923 - /trunk/qt-pkg/src/YQPkgSearchFilterView.cc
by mlandres＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: mlandres Date: Wed Apr 22 17:09:14 2009 New Revision: 56923 URL: http://svn.opensuse.org/viewcvs/yast?rev=56923&view=rev Log: Remove useless query.matchFiles call Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Wed Apr 22 17:09:14 2009 @@ -270,11 +270,7 @@ if ( _searchInSummary->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::summary ); if ( _searchInRequires->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:requires") ); if ( _searchInProvides->isChecked() ) query.addAttribute( zypp::sat::SolvAttr("solvable:provides") ); - if ( _searchInFileList->isChecked() ) - { - query.addAttribute( zypp::sat::SolvAttr::filelist ); - query.matchFiles(); - } + if ( _searchInFileList->isChecked() ) query.addAttribute( zypp::sat::SolvAttr::filelist ); // always look in keywords so FATE #120368 is implemented // but make this configurable later -- 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] r56922 - /tags/branch-SLE-10-SP3-2_13_182/packager/
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:03:27 2009 New Revision: 56922 URL: http://svn.opensuse.org/viewcvs/yast?rev=56922&view=rev Log: Created tag branch-SLE-10-SP3-2_13_182 for packager Added: tags/branch-SLE-10-SP3-2_13_182/packager/ (props changed) - copied from r56921, branches/SuSE-SLE-10-SP3-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56921 - /tags/branch-SLE-10-SP3-2_13_182/
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:03:25 2009 New Revision: 56921 URL: http://svn.opensuse.org/viewcvs/yast?rev=56921&view=rev Log: Created tag branch-SLE-10-SP3-2_13_182 Added: tags/branch-SLE-10-SP3-2_13_182/ -- 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] r56920 - in /branches/SuSE-SLE-10-SP3-Branch/packager: ./ VERSION package/yast2-packager.changes src/modules/PackageCallbacks.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 17:03:15 2009 New Revision: 56920 URL: http://svn.opensuse.org/viewcvs/yast?rev=56920&view=rev Log: - Pkg::CallbackSourceCreateInit/Destroy() and Pkg::CallbackSourceReportInit() handlers (#251726) - 2.13.182 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/ (props changed) branches/SuSE-SLE-10-SP3-Branch/packager/VERSION branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp branches/SuSE-SLE-10-SP3-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/VERSION Wed Apr 22 17:03:15 2009 @@ -1 +1 @@ -2.13.181 +2.13.182 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Apr 22 17:03:15 2009 @@ -3,6 +3,9 @@ - callbacks - close download popup and source progress popup if an error occurrs (#216950) +- Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() handlers (#251726) +- 2.13.182 ------------------------------------------------------------------- Fri Apr 10 18:34:12 CEST 2009 - lslezak(a)suse.cz Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp Wed Apr 22 17:03:15 2009 @@ -49,6 +49,9 @@ string back_string = "\b\b\b\b\b\b\b\b\b\b"; string clear_string = back_string + " " + back_string; + // max. length of the text in the source popup window + integer max_size = 60; + //-------------------------------------------------------------------------- // defaults @@ -779,84 +782,50 @@ return ret; } -void OpenSourcePopup(string text) +void OpenSourcePopup() { - integer max_size = 60; - if (_source_open == 0) { - // the popup doesn't exist - y2milestone("Opening source progress popup: %1", text); - - // if the text is too long then display only part of the message - // and then refresh the label to the full string - // reason: display a small popup, but user can resize it to see - // the full message - string display = text; - boolean refresh_label = false; - - // Qt UI uses bold font, the string must be shortened even more - integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5; - - if (size(display) > max_size - ui_adjustment) - { - display = ProcessMessage(display, max_size - ui_adjustment); - } - - // truncate long text - if (size(display) > max_size - ui_adjustment) - { - // ellipsis appended to a truncated text (if it's too long) - string ellipsis = _("..."); - display = substring(display, 0, max_size - ui_adjustment - 1 - size(ellipsis)) + ellipsis; - refresh_label = true; - } - UI::OpenDialog( `VBox( `HSpacing(max_size), - `Heading(`id(`label_source_popup), `opt(`hstretch), display), + `Heading(`id(`label_source_popup), `opt(`hstretch), " "), `ProgressBar (`id (`progress), " ", 100, 0) ) ); - - // set the full text if needed - if (refresh_label) - { - UI::ChangeWidget(`label, `Value, text); - } } - else - { - // Qt uses proportional font, the string might be longer - integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6; - if (size(text) > max_size + ui_adjustment) - { - text = ProcessMessage(text, max_size + ui_adjustment); - } + _source_open = _source_open + 1; + y2milestone("OpenSourcePopup: _source_open: %1", _source_open); +} + +void SetHeaderSourcePopup(string text) +{ + // Qt UI uses bold font, the string must be shortened even more + integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5; - // refresh the labels in the popup - UI::ChangeWidget(`progress, `Label, text); - // reset the progressbar - UI::ChangeWidget(`progress, `Value, 0); - y2milestone("OpenSourcePopup: new label: %1", text); + if (size(text) > max_size - ui_adjustment) + { + text = ProcessMessage(text, max_size - ui_adjustment); } - _source_open = _source_open + 1; - y2milestone("OpenSourcePopup: _source_open: %1", _source_open); + UI::ChangeWidget(`label_source_popup, `Value, text); + y2milestone("SourcePopup: new header: %1", text); } -boolean SourcePopupSetProgress(integer value) +void SetLabelSourcePopup(string text) { - if (_source_open > 0) + // Qt uses proportional font, the string might be longer + integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6; + + if (size(text) > max_size + ui_adjustment) { - UI::ChangeWidget (`id (`progress), `Value, value); - any input = UI::PollInput (); - if (input == `abort) - return false; + text = ProcessMessage(text, max_size + ui_adjustment); } - return true; + + // refresh the label in the popup + UI::ChangeWidget(`progress, `Label, text); + y2milestone("SourcePopup: new label: %1", text); } // is the top level window source popup? @@ -866,6 +835,18 @@ UI::WidgetExists(`id(`label_source_popup)); } +boolean SourcePopupSetProgress(integer value) +{ + if (_source_open > 0 && IsSourcePopup()) + { + UI::ChangeWidget (`id (`progress), `Value, value); + any input = UI::PollInput (); + if (input == `abort) + return false; + } + return true; +} + void CloseSourcePopup() { if (!IsSourcePopup()) @@ -876,9 +857,6 @@ _source_open = _source_open - 1; - // set 100% progress - SourcePopupSetProgress(100); - if (_source_open == 0) { y2milestone("Closing source progress popup"); @@ -887,26 +865,23 @@ y2milestone("CloseSourcePopup: _source_open: %1", _source_open); } -// completely close the source popup window (all instances) -// should be called if an error occurrs -void CloseSourcePopupAll() + +global void SourceCreateInit() { - if (!IsSourcePopup()) - { - y2error("The toplevel dialog is not a source popup dialog!"); - return; - } + y2milestone ("SourceCreateInit"); - _source_open = 0; + OpenSourcePopup(); +} - // set 100% progress - SourcePopupSetProgress(100); +global void SourceCreateDestroy() +{ + y2milestone ("SourceCreateDestroy"); - y2milestone("Closing source progress popup - all instances"); - UI::CloseDialog(); + CloseSourcePopup(); } -global void SourceCreateStart(string url) { +global void SourceCreateStart(string url) +{ y2milestone ("SourceCreateStart: %1", url); // popup label (%1 is source URL) @@ -917,7 +892,16 @@ } else { - OpenSourcePopup(sformat(_("Creating source %1"), url)); + y2internal("_source_open: %1", _source_open); + + if (_source_open == 1) + { + SetHeaderSourcePopup(msg); + } + else + { + SetLabelSourcePopup(msg); + } } } @@ -983,14 +967,13 @@ UI::CloseDialog (); y2milestone ("Source create error: Returning %1", ret); - CloseSourcePopupAll(); - return ret; } global void SourceCreateEnd(string url, symbol error, string description) { - CloseSourcePopup(); + // set 100% progress + SourcePopupSetProgress(100); y2milestone ("Source create end: error: url: %1, error: %2, description: %3", url, error, description); } @@ -1009,8 +992,18 @@ } else { - OpenSourcePopup(_("Probing source...")); - OpenSourcePopup(sformat(_("Probing source %1"), url)); + OpenSourcePopup(); + + string msg = sformat(_("Probing source %1"), url); + + if (_source_open == 1) + { + SetHeaderSourcePopup(msg); + } + else + { + SetLabelSourcePopup(msg); + } } } @@ -1109,7 +1102,16 @@ } else { - OpenSourcePopup(task); + y2internal("_source_open: %1", _source_open); + + if (_source_open == 1) + { + SetHeaderSourcePopup(task); + } + else + { + SetLabelSourcePopup(task); + } } } @@ -1174,16 +1176,27 @@ UI::CloseDialog (); y2milestone ("Source report error: Returning %1", ret); - CloseSourcePopupAll(); - return ret; } global void SourceReportEnd(integer src_id, string url, string task, symbol error, string description) { - CloseSourcePopup(); - y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, url, task, error, description); + + // set 100% progress + SourcePopupSetProgress(100); +} + +global void SourceReportInit() +{ + y2milestone("Source report init"); + OpenSourcePopup(); +} + +global void SourceReportDestroy() +{ + y2milestone("Source report destroy"); + CloseSourcePopup(); } /** at start of delta providal Modified: branches/SuSE-SLE-10-SP3-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/yast2-packager.spec.in Wed Apr 22 17:03:15 2009 @@ -4,8 +4,8 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-slp Requires: checkmedia yast2-country -# Pkg::SourceGetBrokenSources() -Requires: yast2-pkg-bindings >= 2.13.121 +# Pkg::CallbackSourceCreateInit/Destroy callbacks +Requires: yast2-pkg-bindings >= 2.13.125 # URL::FormatURL() Requires: yast2 >= 2.13.97 Requires: yast2-storage -- 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] r56919 - in /branches/SuSE-SLE-10-SP3-Branch/packager: ./ package/yast2-packager.changes src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 16:32:53 2009 New Revision: 56919 URL: http://svn.opensuse.org/viewcvs/yast?rev=56919&view=rev Log: - callbacks - close download popup and source progress popup if an error occurrs (#216950) Modified: branches/SuSE-SLE-10-SP3-Branch/packager/ (props changed) branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Apr 22 16:32:53 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 22 13:41:58 CEST 2009 - lslezak(a)suse.cz + +- callbacks - close download popup and source progress popup if + an error occurrs (#216950) + +------------------------------------------------------------------- Fri Apr 10 18:34:12 CEST 2009 - lslezak(a)suse.cz - copy /etc/shadow from inst-sys to the target during installation Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/PackageCallbacks.ycp Wed Apr 22 16:32:53 2009 @@ -90,6 +90,11 @@ CommandLine::PrintVerbose(sformat(_("Downloading package %1 (%2)..."), name, sz)); } else { + if (_provide_popup) + { + UI::CloseDialog(); + } + // popup heading term providebox = ProgressBox (_("Downloading Package"), name, sz); UI::OpenDialog(providebox); @@ -176,7 +181,10 @@ { y2milestone("DoneProvide: %1", error); if (_provide_popup) + { UI::CloseDialog(); + _provide_popup = false; + } if (Mode::commandline()) { @@ -189,7 +197,6 @@ provide_aborted = false; return "CANCEL"; } - _provide_popup = false; if (error != 0) { @@ -677,6 +684,12 @@ UI::CloseDialog(); + if (_provide_popup) + { + UI::CloseDialog(); + _provide_popup = false; + } + if (!Mode::normal ()) { import "SlideShow"; @@ -802,7 +815,7 @@ UI::OpenDialog( `VBox( `HSpacing(max_size), - `Heading(`id(`label), `opt(`hstretch), display), + `Heading(`id(`label_source_popup), `opt(`hstretch), display), `ProgressBar (`id (`progress), " ", 100, 0) ) ); @@ -846,8 +859,21 @@ return true; } +// is the top level window source popup? +boolean IsSourcePopup() +{ + return UI::WidgetExists(`id(`progress)) && + UI::WidgetExists(`id(`label_source_popup)); +} + void CloseSourcePopup() { + if (!IsSourcePopup()) + { + y2error("The toplevel dialog is not a source popup dialog!"); + return; + } + _source_open = _source_open - 1; // set 100% progress @@ -861,6 +887,25 @@ y2milestone("CloseSourcePopup: _source_open: %1", _source_open); } +// completely close the source popup window (all instances) +// should be called if an error occurrs +void CloseSourcePopupAll() +{ + if (!IsSourcePopup()) + { + y2error("The toplevel dialog is not a source popup dialog!"); + return; + } + + _source_open = 0; + + // set 100% progress + SourcePopupSetProgress(100); + + y2milestone("Closing source progress popup - all instances"); + UI::CloseDialog(); +} + global void SourceCreateStart(string url) { y2milestone ("SourceCreateStart: %1", url); @@ -938,13 +983,7 @@ UI::CloseDialog (); y2milestone ("Source create error: Returning %1", ret); - if (ret == `RETRY) - { - // The start callback will be evaluated again, - // but the end callback will be called just once. - // This call replaces the missing end callback. - CloseSourcePopup(); - } + CloseSourcePopupAll(); return ret; } @@ -1135,13 +1174,7 @@ UI::CloseDialog (); y2milestone ("Source report error: Returning %1", ret); - if (ret == `RETRY) - { - // The start callback will be evaluated again, - // but the end callback will be called just once. - // This call replaces the missing end callback. - CloseSourcePopup(); - } + CloseSourcePopupAll(); 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] r56918 - /tags/branch-SLE-10-SP3-2_13_125/pkg-bindings/
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 16:25:18 2009 New Revision: 56918 URL: http://svn.opensuse.org/viewcvs/yast?rev=56918&view=rev Log: Created tag branch-SLE-10-SP3-2_13_125 for pkg-bindings Added: tags/branch-SLE-10-SP3-2_13_125/pkg-bindings/ (props changed) - copied from r56917, branches/SuSE-SLE-10-SP3-Branch/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] r56917 - in /branches/SuSE-SLE-10-SP3-Branch/pkg-bindings: ./ VERSION package/yast2-pkg-bindings.changes src/Callbacks.YCP.h src/Callbacks.cc src/PkgModuleFunctions.h src/Source.cc
by lslezak＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: lslezak Date: Wed Apr 22 16:25:13 2009 New Revision: 56917 URL: http://svn.opensuse.org/viewcvs/yast?rev=56917&view=rev Log: - new callbacks Pkg::CallbackSourceCreateInit/Destroy() and Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp callbacks (#251726) - 2.13.125 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/ (props changed) branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.YCP.h branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.cc branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/PkgModuleFunctions.h branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION Wed Apr 22 16:25:13 2009 @@ -1 +1 @@ -2.13.124 +2.13.125 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Wed Apr 22 16:25:13 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Apr 22 13:30:43 CEST 2009 - lslezak(a)suse.cz + +- new callbacks Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp + callbacks (#251726) +- 2.13.125 + +------------------------------------------------------------------- Fri Mar 27 13:57:53 CET 2009 - lslezak(a)suse.cz - Fixed Pkg::SourceCreate() - make the new alias unique - timestamp Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.YCP.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.YCP.h (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.YCP.h Wed Apr 22 16:25:13 2009 @@ -72,6 +72,7 @@ CB_StartPackage, CB_ProgressPackage, CB_DonePackage, CB_SourceCreateStart, CB_SourceCreateProgress, CB_SourceCreateError, CB_SourceCreateEnd, + CB_SourceCreateInit, CB_SourceCreateDestroy, CB_StartSourceRefresh, CB_ErrorSourceRefresh, CB_DoneSourceRefresh, CB_ProgressSourceRefresh, CB_StartDeltaDownload, CB_ProgressDeltaDownload, CB_ProblemDeltaDownload, @@ -81,7 +82,7 @@ CB_StartDownload, CB_ProgressDownload, CB_DoneDownload, CB_SourceProbeStart, CB_SourceProbeFailed, CB_SourceProbeSucceeded, CB_SourceProbeEnd, CB_SourceProbeProgress, CB_SourceProbeError, - CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd, + CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd, CB_SourceReportInit, CB_SourceReportDestroy, CB_ScriptStart, CB_ScriptProgress, CB_ScriptProblem, CB_ScriptFinish, CB_Message, @@ -136,6 +137,8 @@ ENUM_OUT( SourceCreateProgress ); ENUM_OUT( SourceCreateError ); ENUM_OUT( SourceCreateEnd ); + ENUM_OUT( SourceCreateInit ); + ENUM_OUT( SourceCreateDestroy ); ENUM_OUT( SourceProbeStart ); ENUM_OUT( SourceProbeFailed ); @@ -148,6 +151,8 @@ ENUM_OUT( SourceReportProgress ); ENUM_OUT( SourceReportError ); ENUM_OUT( SourceReportEnd ); + ENUM_OUT( SourceReportInit ); + ENUM_OUT( SourceReportDestroy ); ENUM_OUT( StartSourceRefresh ); ENUM_OUT( ErrorSourceRefresh ); Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Callbacks.cc Wed Apr 22 16:25:13 2009 @@ -87,10 +87,12 @@ virtual void reportbegin() { + y2milestone("Convert DB Init Callback"); } virtual void reportend() { + y2milestone("Convert DB Destroy Callback"); } virtual void start(zypp::Pathname pname) { @@ -911,6 +913,28 @@ { SourceCreateReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {} + virtual void reportbegin() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceCreateInit ) ); + y2debug("Source Create begin"); + + if (callback._set) + { + callback.evaluate(); + } + } + + virtual void reportend() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceCreateDestroy ) ); + y2debug("Source Create destroy"); + + if (callback._set) + { + callback.evaluate(); + } + } + virtual void start( const zypp::Url &url ) { CB callback( ycpcb( YCPCallbacks::CB_SourceCreateStart ) ); @@ -1130,6 +1154,28 @@ struct SourceReport : public Recipient, public zypp::callback::ReceiveReport<zypp::source::SourceReport> { + virtual void reportbegin() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceReportInit ) ); + y2debug("Source Report begin"); + + if (callback._set) + { + callback.evaluate(); + } + } + + virtual void reportend() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceReportDestroy ) ); + y2debug("Source Report end"); + + if (callback._set) + { + callback.evaluate(); + } + } + SourceReport( RecipientCtl & construct_r ) : Recipient( construct_r ) {} virtual void start( zypp::Source_Ref source, const std::string &task ) @@ -2040,6 +2086,25 @@ } +YCPValue PkgModuleFunctions::CallbackSourceReportInit( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceReportInit, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceReportDestroy( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceReportDestroy, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceCreateInit( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceCreateInit, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceCreateDestroy( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceCreateDestroy, func ); +} /** * @builtin CallbackSourceProbeStart Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/PkgModuleFunctions.h (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/PkgModuleFunctions.h Wed Apr 22 16:25:13 2009 @@ -113,6 +113,8 @@ // callback related funcions void CallSourceReportStart(const std::string &text); void CallSourceReportEnd(const std::string &text); + void CallSourceReportInit(); + void CallSourceReportDestroy(); // After all, APPL_HIGH might be more appropriate, because we suggest // the user what he should do and if it does not work, it's his job to @@ -222,6 +224,10 @@ YCPValue CallbackSourceCreateError( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceCreateEnd( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceCreateInit( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceCreateDestroy( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceProbeStart( const YCPString& func); @@ -237,6 +243,10 @@ YCPValue CallbackSourceProbeError( const YCPString& func); /* TYPEINFO: void(string) */ + YCPValue CallbackSourceReportInit( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceReportDestroy( const YCPString& func); + /* TYPEINFO: void(string) */ YCPValue CallbackSourceReportStart( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceReportProgress( const YCPString& func); Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Wed Apr 22 16:25:13 2009 @@ -88,6 +88,31 @@ } } +void PkgModuleFunctions::CallSourceReportInit() +{ + // get the YCP callback handler for init event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportInit); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + +void PkgModuleFunctions::CallSourceReportDestroy() +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportDestroy); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} /** * Logging helper: * call zypp::SourceManager::sourceManager()->findSource @@ -138,6 +163,7 @@ YCPValue PkgModuleFunctions::SourceRestore() { + CallSourceReportInit(); CallSourceReportStart(_("Downloading files...")); bool success = true; @@ -173,6 +199,7 @@ } CallSourceReportEnd(_("Downloading files...")); + CallSourceReportDestroy(); return YCPBoolean(success); } @@ -211,6 +238,7 @@ { bool success = true; + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); std::list<zypp::SourceManager::SourceId> ids; @@ -271,6 +299,7 @@ } CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); return YCPBoolean(success); } @@ -712,6 +741,7 @@ YCPValue PkgModuleFunctions::SourceProvideFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f) { + CallSourceReportInit(); CallSourceReportStart(_("Downloading file...")); zypp::Source_Ref src; @@ -741,6 +771,7 @@ } CallSourceReportEnd(_("Downloading file...")); + CallSourceReportDestroy(); if (found) { @@ -770,6 +801,7 @@ YCPValue PkgModuleFunctions::SourceProvideOptionalFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f) { + CallSourceReportInit(); CallSourceReportStart(_("Downloading files...")); YCPValue ret; @@ -813,6 +845,7 @@ CallSourceReportEnd(_("Downloading files...")); + CallSourceReportDestroy(); if (found) { @@ -1349,9 +1382,11 @@ src.enable(); + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); zypp_ptr()->addResolvables (src.resolvables()); CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); // return the id of the first product if ( ret == -1 ) @@ -1376,9 +1411,11 @@ src.enable(); + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); zypp_ptr()->addResolvables (src.resolvables()); CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); } catch ( const zypp::Exception& excpt) { -- 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] r56916 - /trunk/bootloader/package/yast2-bootloader.changes
by jreidinger＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jreidinger Date: Wed Apr 22 15:48:39 2009 New Revision: 56916 URL: http://svn.opensuse.org/viewcvs/yast?rev=56916&view=rev Log: changes Modified: trunk/bootloader/package/yast2-bootloader.changes 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 Wed Apr 22 15:48:39 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 22 15:47:26 CEST 2009 - jreidinger(a)suse.cz + +- code clean +- add interface for new perl-Bootloader MBR tools +- add missing short-cuts for widgets + +------------------------------------------------------------------- Thu Apr 16 14:52:23 CEST 2009 - juhliarik(a)suse.cz - added fix for commandline interface (bnc#479069) -- 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] r56915 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: kmachalkova Date: Wed Apr 22 15:06:42 2009 New Revision: 56915 URL: http://svn.opensuse.org/viewcvs/yast?rev=56915&view=rev Log: argh, syntax err :( + removing no longer used button handler Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Apr 22 15:06:42 2009 @@ -144,7 +144,7 @@ `PushButton(`id(`smart), _("Health Test (SMART)...")), // push button text (do not translate 'hdparm', it is the name of the tool) `PushButton(`id(`hdparm), _("Properties (hdparm)...")), - `HStretch(), + `HStretch() ) ) ); @@ -163,12 +163,6 @@ switch (Event::IsWidgetActivated(event)) { - case `delete: - { - EpDeleteDisk(disk_device); - break; - } - case `smart: { map<string, map> target_map = Storage::GetTargetMap(); -- 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] r56914 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: kmachalkova Date: Wed Apr 22 14:46:35 2009 New Revision: 56914 URL: http://svn.opensuse.org/viewcvs/yast?rev=56914&view=rev Log: s/Smart/SMART/g, s/HD parm/hdparm/g more descriptive button labels Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Apr 22 14:46:35 2009 @@ -140,11 +140,11 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text (do not translate 'SMART', it is the name of the tool) + `PushButton(`id(`smart), _("Health Test (SMART)...")), + // push button text (do not translate 'hdparm', it is the name of the tool) + `PushButton(`id(`hdparm), _("Properties (hdparm)...")), `HStretch(), - // push button text - `PushButton(`id(`smart), _("Smart...")), - // push button text - `PushButton(`id(`hdparm), _("HD Parm...")) ) ) ); @@ -175,7 +175,7 @@ map disk = target_map[disk_device]:$[]; if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") { - Popup::Error(_("Smart is not available for this disk.")); + Popup::Error(_("SMART is not available for this disk.")); break; } DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); @@ -188,7 +188,7 @@ map disk = target_map[disk_device]:$[]; if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") { - Popup::Error(_("HD Parm is not available for this disk.")); + Popup::Error(_("hdparm is not available for this disk.")); break; } DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); -- 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] r56913 - in /trunk/bootloader/src/modules: BootCommon.ycp Bootloader_API.pm
by jreidinger＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jreidinger Date: Wed Apr 22 14:35:00 2009 New Revision: 56913 URL: http://svn.opensuse.org/viewcvs/yast?rev=56913&view=rev Log: fix deprecated find, add interface for new perl-Bootloader calls Modified: trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/Bootloader_API.pm Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Wed Apr 22 14:35:00 2009 @@ -566,7 +566,7 @@ // trying to find "vga" option foreach ( string key, cmd, { - if (find(key, "vga=") != -1) + if (issubstring(key, "vga=")) vga = key; y2milestone("key: %1", key); }); Modified: trunk/bootloader/src/modules/Bootloader_API.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader_API.pm (original) +++ trunk/bootloader/src/modules/Bootloader_API.pm Wed Apr 22 14:35:00 2009 @@ -326,6 +326,32 @@ return $ret; } +#MBR utilities +BEGIN { $TYPEINFO{detectThinkpadMBR} = ["function", "boolean","string"]; } +sub detectThinkpadMBR($) { + my ($pass) = @_; + my $ret = $lib_ref->DetectThinkpadMBR($pass); + DumpLog(); + return $ret; +} + +BEGIN { $TYPEINFO{writeThinkpadMBR} = ["function", "boolean","string"]; } +sub writeThinkpadMBR($) { + my ($pass) = @_; + my $ret = $lib_ref->WriteThinkpadMBR($pass); + + DumpLog(); + return $ret; +} + +BEGIN { $TYPEINFO{examineMBR} = ["function", "string","string"]; } +sub examineMBR($) { + my ($pass) = @_; + my $ret = $lib_ref->ExamineMBR($pass); + + DumpLog(); + return $ret; +} # import fails if we cannot create the object $lib_ref; -- 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] r56912 - in /branches/tmp/mzugec/SuSE-Code-11-Branch/yast2: ./ VERSION library/network/src/NetworkInterfaces.ycp package/yast2.changes
by mzugec＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: mzugec Date: Wed Apr 22 14:27:25 2009 New Revision: 56912 URL: http://svn.opensuse.org/viewcvs/yast?rev=56912&view=rev Log: fixed:remove interface alias (bnc#471253) Added: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/ - copied from r56911, branches/SuSE-Code-11-Branch/yast2/ Modified: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/VERSION branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/library/network/src/NetworkInterfaces.ycp branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/package/yast2.changes Modified: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/SuSE-Code-11-Branc… ============================================================================== --- branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/VERSION Wed Apr 22 14:27:25 2009 @@ -1 +1 @@ -2.17.68 +2.17.69 Modified: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/SuSE-Code-11-Branc… ============================================================================== --- branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/library/network/src/NetworkInterfaces.ycp Wed Apr 22 14:27:25 2009 @@ -698,7 +698,7 @@ path base = add (.network.value, dev); // look in OriginalDevs because we need to catch all variables // of the alias - foreach (string key, any dummy, OriginalDevs[typ, num, "_aliases", anum]:$[], { + foreach (string key, any dummy, OriginalDevs[typ, dev, "_aliases", anum]:$[], { path p = add (base, key + "_" + anum); y2debug ("deleting: %1", p); SCR::Write (p, nil); @@ -739,7 +739,7 @@ // writing, but we create it in 2 ways so it's // better here. Actually it does not work because // the edit dialog nukes LABEL :-( - boolean seen_label = false; +// boolean seen_label = false; if (size(amap["IPADDR"]:"")>0 && size(amap["NETMASK"]:"")>0){ amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", Netmask::ToBits(amap["NETMASK"]:"")); amap=remove(amap, "NETMASK"); @@ -755,13 +755,15 @@ maplist(string ak, string av, amap, { string akk = ak + "_" + anum; ShellSafeWrite (topath (p + akk), av); - seen_label = seen_label || ak == "LABEL"; +// seen_label = seen_label || ak == "LABEL"; }); +/* if (!seen_label) { ShellSafeWrite (topath (p + ("LABEL_" + anum)), anum); } +*/ }); } /* Write regular keys */ Modified: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/SuSE-Code-11-Branc… ============================================================================== --- branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/package/yast2.changes Wed Apr 22 14:27:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 22 14:22:57 CEST 2009 - mzugec(a)suse.cz + +- fixed:remove interface alias (bnc#471253) +- 2.17.69 + +------------------------------------------------------------------- Mon Feb 23 12:41:52 CET 2009 - locilka(a)suse.cz - Fixing ProductControl to avoid leaving a workflow with the `auto -- 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] r56911 - /branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/
by mzugec＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: mzugec Date: Wed Apr 22 14:13:32 2009 New Revision: 56911 URL: http://svn.opensuse.org/viewcvs/yast?rev=56911&view=rev Log: - Removed: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/ -- 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] r56910 - /trunk/bootloader/yast2-bootloader.spec.in
by jreidinger＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jreidinger Date: Wed Apr 22 14:12:42 2009 New Revision: 56910 URL: http://svn.opensuse.org/viewcvs/yast?rev=56910&view=rev Log: update dependencies for new bootloader Modified: trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec… ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Wed Apr 22 14:12:42 2009 @@ -9,13 +9,13 @@ Requires: yast2 >= 2.18.14 Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 -Requires: perl-Bootloader >= 0.4.80 +Requires: perl-Bootloader >= 0.5.0 Requires: yast2-core >= 2.18.6 Requires: yast2-storage parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 BuildRequires: yast2-packager >= 2.17.24 BuildRequires: yast2-pkg-bindings >= 2.17.25 -BuildRequires: perl-Bootloader >= 0.4.91 +BuildRequires: perl-Bootloader >= 0.5.0 BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 -- 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] r56909 - /branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/
by mzugec＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: mzugec Date: Wed Apr 22 14:02:47 2009 New Revision: 56909 URL: http://svn.opensuse.org/viewcvs/yast?rev=56909&view=rev Log: / Added: branches/tmp/mzugec/SuSE-Code-11-Branch/yast2/ -- 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] r56908 - in /trunk/bootloader/src: modules/ routines/
by juhliarik＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: juhliarik Date: Wed Apr 22 13:48:59 2009 New Revision: 56908 URL: http://svn.opensuse.org/viewcvs/yast?rev=56908&view=rev Log: added new module for handling storage devices and adapting to new perl-Bootloader Added: trunk/bootloader/src/modules/BootStorage.ycp Modified: trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/modules/Bootloader_API.pm trunk/bootloader/src/modules/Makefile.am trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Wed Apr 22 13:48:59 2009 @@ -152,7 +152,48 @@ return (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()); } -} // EOF + +/** + * Return architecture as string + * @return string type of architecture e.g. "i386" + */ +global string StrArch () +{ + string ret = Arch::architecture(); + if ((ret == "ppc") || (ret == "ppc64")) + { + if (Arch::board_iseries ()) + { + ret = "iseries"; + } + else if (Arch::board_prep ()) + { + ret = "prep"; + } + else if (Arch::board_chrp ()) + { + ret = "chrp"; + } + else if (Arch::board_mac_new ()) + { + ret = "pmac"; + } + else if (Arch::board_mac_old ()) + { + ret = "pmac"; + } + else + { + ret = "unknown"; + } + + } + + y2milestone("Type of architecture: %1", ret); + return ret; +} + +} /* * Local variables: Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Wed Apr 22 13:48:59 2009 @@ -35,6 +35,7 @@ import "Popup"; import "Package"; import "PackagesProposal"; +import "BootStorage"; import "Linuxrc"; @@ -74,11 +75,7 @@ global integer cached_settings_base_data_change_time = nil; -/** - * Saved change time from target map - only for MapAllPartitions() - */ -global integer disk_change_time_MapAllPartitions = nil; /** @@ -364,20 +361,6 @@ "zipl", "ppc"]; -/** - * bnc #468922 - problem with longtime running the parsing a huge number of disks - * map<string,map> the map of all partitions with info about it -> - * necessary for Dev2MountByDev() in routines/misc.ycp - */ -global map<string,map> all_partitions = $[]; - -/** - * bnc #468922 - problem with longtime running the parsing a huge number of disks - * map<string,map> target map try to minimalize calling Storage::GetTargetMap() - * - */ -map<string,map> target_map = $[]; - global define string getLoaderType (boolean recheck); global define list<string> getBootloaders (); global define list<string> Summary (); @@ -506,7 +489,7 @@ : ""; // try to use label or udev id for device name... FATE #302219 if ((resume != "") && (resume != nil)) - resume = Dev2MountByDev(resume); + resume = BootStorage::Dev2MountByDev(resume); // FIXME: @@ -620,7 +603,7 @@ "image" : kernel_fn, "initrd" : initrd_fn, // try to use label or udev id for device name... FATE #302219 - "root" : Dev2MountByDev(RootPartitionDevice), + "root" : BootStorage::Dev2MountByDev(RootPartitionDevice), "append" : (title == "failsafe") ? BootArch::FailsafeKernelParams () : BootArch::DefaultKernelParams (resume), @@ -658,7 +641,7 @@ * @return bootloader settings */ global define map Export () { - MapDevices(); + map exp = $[ "global": remapGlobals(globals), "sections" : remapSections(sections), @@ -731,7 +714,7 @@ k = Storage::SLES9PersistentDevNames(k); y2milestone( "devmap: dev name after SLES9 persistent dev name translation: %1", k); } - return $[Dev2MountByDev(k) : v]; + return $[BootStorage::Dev2MountByDev(k) : v]; }); // convert custom boot device names in globals to the kernel device names @@ -744,7 +727,7 @@ v = Storage::SLES9PersistentDevNames(v); y2milestone( "globals: dev name after SLES9 persistent dev name translation: %1", v); } - return $[k : Dev2MountByDev(v)]; + return $[k : BootStorage::Dev2MountByDev(v)]; } else { return $[k : v]; } @@ -760,7 +743,7 @@ rdev = Storage::SLES9PersistentDevNames(rdev); y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); } - s["root"] = Dev2MountByDev(rdev); + s["root"] = BootStorage::Dev2MountByDev(rdev); return s; }); return true; @@ -828,7 +811,7 @@ // convert the stage1_dev map<string,string> my_globals = mapmap (string k , string v, globals, { if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" ))) - return $[k : BootCommon::Dev2MountByDev(v)]; + return $[k : BootStorage::Dev2MountByDev(v)]; else return $[k : v]; }); @@ -839,8 +822,7 @@ y2milestone ("device map before mapping %1", device_mapping); map<string,string> my_device_mapping = mapmap (string k , string v, device_mapping, { - //return $[BootCommon::Dev2MountByDev(k) : v]; - return $[BootCommon::Dev2MountByDev(k) : v]; + return $[BootStorage::Dev2MountByDev(k) : v]; }); y2milestone ("device map after mapping %1", my_device_mapping); if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Wed Apr 22 13:48:59 2009 @@ -26,6 +26,7 @@ import "Arch"; import "BootCommon"; +import "BootStorage"; import "Kernel"; import "Mode"; import "Stage"; @@ -318,7 +319,7 @@ { // set up the new section entry map<string,any> new_sect = $[ - "root" : BootCommon::Dev2MountByDev(dev), + "root" : BootStorage::Dev2MountByDev(dev), "__changed" : true, "__auto" : true, "__devs" : [dev] @@ -328,7 +329,7 @@ { // mountable bootable => chainloader (label: to be decided) new_sect["noverifyroot"] = "true"; - new_sect["chainloader"] = BootCommon::Dev2MountByDev(dev); + new_sect["chainloader"] = BootStorage::Dev2MountByDev(dev); new_sect["blockoffset"] = "1"; new_sect["type"] = "other"; } @@ -402,7 +403,7 @@ "name" : BootCommon::translateSectionTitle (label), "type" : "other", "original_name" : label, - "chainloader" : BootCommon::Dev2MountByDev(dev), + "chainloader" : BootStorage::Dev2MountByDev(dev), "__changed" : true, "__auto" : true, "__devs" : [dev], @@ -420,7 +421,7 @@ "name" : BootCommon::translateSectionTitle("hard disk"), "original_name" : "hard_disk", "type" : "other", - "chainloader" : BootCommon::Dev2MountByDev(BootCommon::mbrDisk), + "chainloader" : BootStorage::Dev2MountByDev(BootCommon::mbrDisk), "__changed" : true, "__auto" : true, "__devs" : [], @@ -829,7 +830,7 @@ boolean ret = false; string boot_disk = BootCommon::getBootDisk(); if (boot_disk != "") - ret = checkBootDeviceInDeviceMap(boot_disk, BootCommon::Dev2MountByDev(boot_disk)); + ret = checkBootDeviceInDeviceMap(boot_disk, BootStorage::Dev2MountByDev(boot_disk)); return ret; Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWER… ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Wed Apr 22 13:48:59 2009 @@ -27,6 +27,7 @@ import "Arch"; import "BootArch"; import "BootCommon"; +import "BootStorage"; import "Installation"; import "Kernel"; import "Mode"; @@ -908,7 +909,7 @@ // convert map<string,string> my_globals = mapmap (string k , string v, BootCommon::globals, { if ((k == "stage1_dev") || (regexpmatch(k, "^boot_.*custom$" ))) - return $[k : BootCommon::Dev2MountByDev(v)]; + return $[k : BootStorage::Dev2MountByDev(v)]; else return $[k : v]; }); Added: trunk/bootloader/src/modules/BootStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootStora… ============================================================================== --- trunk/bootloader/src/modules/BootStorage.ycp (added) +++ trunk/bootloader/src/modules/BootStorage.ycp Wed Apr 22 13:48:59 2009 @@ -0,0 +1,399 @@ +/** + * File: + * modules/BootStorage.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Module includes specific functions for handling storage data. + * The idea is handling all storage data necessary for bootloader + * in one module. + * + * Authors: + * Jozef Uhliarik <juhliarik(a)suse.cz> + * + * + * + * + */ + +{ + +module "BootStorage"; + +textdomain "bootloader"; + +import "Storage"; +import "Arch"; + + +/** + * Saved change time from target map - only for MapAllPartitions() + */ + +global integer disk_change_time_InitBootloader = nil; + + +/** + * Saved change time from target map - only for MapAllPartitions() + */ + +global integer disk_change_time_MapAllPartitions = nil; + + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> the map of all partitions with info about it -> + * necessary for Dev2MountByDev() in routines/misc.ycp + */ +global map<string,map> all_partitions = $[]; + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> target map try to minimalize calling Storage::GetTargetMap() + * + */ +map<string,map> target_map = $[]; + + +global map<string,string> uuid_partitions = $[]; +global map<string,string> id_partitions = $[]; +global map<string,string> label_partitions = $[]; +global map<string,string> path_partitions = $[]; + +global map<string,string> uuid_disks = $[]; +global map<string,string> id_disks = $[]; +global map<string,string> path_disks = $[]; +global map<string, string> all_devices = $[]; + + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Function prepare maps with mapping disks and partitions by uuid, id, path + * and label. + * + */ +void MapDevices() +{ + string dev_by_something = ""; + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + foreach (string k, map v, devices, + { + // map disk by uuid + if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; + uuid_disks[dev_by_something]= k; + all_devices[dev_by_something]= k; + } + // map disk by path + if ((v["path"]:nil != "") && (v["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+v["path"]:""; + path_disks[dev_by_something]= k; + all_devices[dev_by_something]= k; + } + // map disk by id + if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; + id_disks[dev_by_something] = k; + all_devices[dev_by_something]= k; + } + // map partitions from disk... + + foreach (map p, (list<map>)(v["partitions"]:[]), + { + // map partition by uuid + if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; + uuid_partitions[dev_by_something]= p["device"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["path"]:nil != "") && (p["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+p["path"]:""; + path_partitions[dev_by_something]= p["device"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map partition by label + if ((p["label"]:nil != "") && (p["label"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-label/"+p["label"]:""; + label_partitions[dev_by_something]= p["device"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map disk by id + if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; + id_partitions[dev_by_something] = p["device"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), + }); // end of foreach (string k, map v, devices, + + y2milestone("disks mapping by-id: %1", id_disks); + y2milestone("disks mapping by-uuid: %1", uuid_disks); + y2milestone("disks mapping by-path: %1", path_disks); + + y2milestone("partitions mapping by-id: %1", id_partitions); + y2milestone("partitions mapping by-uuid: %1", uuid_partitions); + y2milestone("partitions mapping by-path: %1", path_partitions); + y2milestone("partitions mapping by-label: %1", label_partitions); +} + + + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a "/dev/disk/by-" device name to the corresponding kernel + * device name, if a mapping for this name can be found in the map from + * yast2-storage. If the given device name is not a "/dev/disk/by-" device + * name, it is left unchanged. Also, if the information about the device + * name cannot be found in the target map from yast2-storage, the device + * name is left unchanged. + * + * @param dev string device name + * @return string kernel device name + */ + +global define string MountByDev2Dev(string dev) +{ + y2milestone ("MountByDev2Dev: %1", dev); + + if (!regexpmatch(dev, "^/dev/disk/by-")) + return dev; + string ret = dev; + + // check if it is device name by id + if (search(dev, "/dev/disk/by-id/") != nil) + { + if (haskey(id_partitions, dev)) + ret = id_partitions[dev]:""; + + if (haskey(id_disks, dev)) + ret = id_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by uuid + if (search(dev, "/dev/disk/by-uuid/") != nil) + { + if (haskey(uuid_partitions, dev)) + ret = uuid_partitions[dev]:""; + + if (haskey(uuid_disks, dev)) + ret = uuid_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by path + if (search(dev, "/dev/disk/by-path/") != nil) + { + if (haskey(path_partitions, dev)) + ret = path_partitions[dev]:""; + + if (haskey(path_disks, dev)) + ret = path_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by label + // only partition are supported + if (search(dev, "/dev/disk/by-label/") != nil) + { + if (haskey(label_partitions, dev)) + ret = label_partitions[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; +} + + + + + +/** + * Init and fullfil internal data for perl-Bootloader + * + * @return true if init reset/fullfil data or false and used cached data + */ + +global boolean InitMapDevices () +{ + boolean ret = false; + if (disk_change_time_InitBootloader != Storage::GetTargetChangeTime()) + { + y2milestone("Init internal data from storage"); + MapDevices(); + disk_change_time_InitBootloader = Storage::GetTargetChangeTime(); + ret = true; + } + + return ret; +} + + + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * Function initialize all_partitions only if storage change + * partitioning of disk + * true if init all_partitions + */ + +boolean MapAllPartitions() +{ + boolean ret = false; + if ((disk_change_time_MapAllPartitions != Storage::GetTargetChangeTime()) + || (size(all_partitions) < 1) || (size(target_map) < 1)) + { + // save last change time from storage for MapAllPartitions() + disk_change_time_MapAllPartitions = Storage::GetTargetChangeTime(); + + all_partitions = $[]; + target_map = $[]; + // get target map + target_map = (map<string,map>)Storage::GetTargetMap(); + // map all partitions + foreach (string k, map v, target_map, + { + foreach (map p, (list<map>)(v["partitions"]:[]), + { + all_partitions[p["device"]:""] = p; + }); + }); + ret = true; + } + + return ret; +} + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a device name to the corresponding device name it should be + * mounted by, according to the "mountby" setting for the device from + * yast2-storage. As a safeguard against problems, if the "mountby" device + * name does not exist in the information from yast2-storage, it will + * fallback to the "kernel name" ("/dev/sdXY"). + * + * @param dev string device name + * @return string device name according to "mountby" + */ +global define string Dev2MountByDev(string dev) +{ + y2milestone ("Dev2MountByDev: %1", dev); + + // (`id,`uuid,`path,`device,`label) + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; + y2milestone("Default mount by is %1", by_mount); + + // add all_partitions to partitions + if (MapAllPartitions()) + y2milestone("Init all_partitions was done"); + + map<string,map> partitions = all_partitions; + map<string,map> devices = target_map; + + string ret = dev; + switch(by_mount) + { + // convert to udev_id + case (`id): + // partitions + if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + break; + + // convert to uuid + case (`uuid): + // partitions + if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + break; + + // convert to udev_path + case (`path): + // partitions + if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + break; + + // convert to label + case (`label): + // partitions + if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) + { + ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); + y2milestone ("Device name: %1 is converted to label: %2", dev, ret); + return ret; + } + // disks + y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); + return ret; + break; + + // convert to device or uknown type + default: + y2warning ("Convert %1 to `device or unknwn type, result: %2", dev, ret); + return ret; + break; + } + + return ret; +} + + + + +} Modified: trunk/bootloader/src/modules/Bootloader_API.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader_API.pm (original) +++ trunk/bootloader/src/modules/Bootloader_API.pm Wed Apr 22 13:48:59 2009 @@ -50,11 +50,11 @@ } -BEGIN { $TYPEINFO{setLoaderType} = ["function", "void", "string"]; } +BEGIN { $TYPEINFO{setLoaderType} = ["function", "void", "string", "string"]; } # do library initialization for a specific bootloader type sub setLoaderType($) { - my ($lt) = @_; - my $ret = $lib_ref->SetLoaderType($lt); + my ($lt, $arch) = @_; + my $ret = $lib_ref->SetLoaderType($lt, $arch); @lines_cache = (); $lines_cache_index = 0; @@ -62,6 +62,16 @@ return $ret; } +BEGIN { $TYPEINFO{defineUdevMapping} = ["function", "integer", ["map", "string", "string"]]; } +# do library initialization for a specific bootloader type +sub defineUdevMapping($) { + my ($udev_mapping) = @_; + my $ret = $lib_ref->DefineUdevMapping($udev_mapping); + + DumpLog(); + return $ret; +} + BEGIN { $TYPEINFO{updateBootloader} = ["function", "boolean", "boolean"]; } sub updateBootloader() { my ($avoid_init) = @_; Modified: trunk/bootloader/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Makefile.… ============================================================================== --- trunk/bootloader/src/modules/Makefile.am (original) +++ trunk/bootloader/src/modules/Makefile.am Wed Apr 22 13:48:59 2009 @@ -15,7 +15,8 @@ BootPOWERLILO.ycp \ BootZIPL.ycp \ Bootloader_API.pm \ - BootSupportCheck.ycp + BootSupportCheck.ycp \ + BootStorage.ycp Bootloader_API.pm: test -f Bootloader_API.pm || exit 1 Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_ifac… ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Wed Apr 22 13:48:59 2009 @@ -61,7 +61,7 @@ { // save last change time from storage disk_change_time_checkCallingDiskInfo = Storage::GetTargetChangeTime(); - y2milestone("disk was changes by storage or partinfo is empty: %1", size(partinfo)); + y2milestone("disk was changed by storage or partinfo is empty: %1", size(partinfo)); y2milestone("generate partinfo, md_info, mountpoints and multipath_mapping"); ret = true; } else { @@ -157,7 +157,7 @@ // adding moundby (by-id) via user preference foreach(list partition, partinfo, { list tmp =[]; - string mount_by = BootCommon::Dev2MountByDev(tostring(partition[0]:"")); + string mount_by = BootStorage::Dev2MountByDev(tostring(partition[0]:"")); if (mount_by != tostring(partition[0]:"")) { tmp = add(partition, mount_by); @@ -191,8 +191,13 @@ if (!force && loader == library_initialized) return false; + BootStorage::InitMapDevices (); y2milestone ("Initializing lib for %1", loader); - System::Bootloader_API::setLoaderType (loader); + string architecture = BootArch::StrArch(); + System::Bootloader_API::setLoaderType (loader, architecture); + integer out = System::Bootloader_API::defineUdevMapping(BootStorage::all_devices); + if (out == nil) + y2error("perl-Bootloader library was not initialized"); y2milestone ("Putting partitioning into library"); // pass all needed disk/partition information to library SetDiskInfo(); Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Wed Apr 22 13:48:59 2009 @@ -640,7 +640,7 @@ // bnc# 335526 - Installing memtest with lilo screws up installation if (search(s["original_name"]:"", "memtest") == nil) { - append = setKernelParamToLine (append, "resume", BootCommon::Dev2MountByDev(getLargestSwapPartition ())); + append = setKernelParamToLine (append, "resume", BootStorage::Dev2MountByDev(getLargestSwapPartition ())); s["append"] = append; } } @@ -763,7 +763,7 @@ if (! haskey (BootCommon::getSwapPartitions (), resume)) { append = setKernelParamToLine (append, - "resume", BootCommon::Dev2MountByDev(getLargestSwapPartition ())); + "resume", BootStorage::Dev2MountByDev(getLargestSwapPartition ())); s["append"] = append; linux_resume_added = true; } @@ -822,14 +822,14 @@ s = $[ "name": label, "original_name": sect_type, - "root": BootCommon::Dev2MountByDev(dev) + "root": BootStorage::Dev2MountByDev(dev) ]; if (dev != nil && IsPartitionBootable(dev)) { // bootable => chainloader s["noverifyroot"] = "true"; - s["chainloader"] = BootCommon::Dev2MountByDev(dev); + s["chainloader"] = BootStorage::Dev2MountByDev(dev); s["blockoffset"] = "1"; s["type"] = "other"; y2milestone ("Updating section \"%1\" booting other installation to use chainloader entry", s["name"]:""); @@ -959,7 +959,7 @@ y2milestone ("Updating resume device of section %1", label); resume = BootCommon::UpdateDevice (resume); option = BootCommon::setKernelParamToLine ( - option, "resume", BootCommon::Dev2MountByDev(resume)); + option, "resume", BootStorage::Dev2MountByDev(resume)); } } s["append"] = option; Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Wed Apr 22 13:48:59 2009 @@ -148,160 +148,8 @@ return floppy_devices; } -global map<string,string> uuid_partitions = $[]; -global map<string,string> id_partitions = $[]; -global map<string,string> label_partitions = $[]; -global map<string,string> path_partitions = $[]; - -global map<string,string> uuid_disks = $[]; -global map<string,string> id_disks = $[]; -global map<string,string> path_disks = $[]; - -/** FATE #302219 - Use and choose persistent device names for disk devices - * Function prepare maps with mapping disks and partitions by uuid, id, path - * and label. - * - */ - -global void MapDevices() -{ - string dev_by_something = ""; - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - foreach (string k, map v, devices, - { - // map disk by uuid - if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) - { - dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; - uuid_disks[dev_by_something]= k; - } - // map disk by path - if ((v["path"]:nil != "") && (v["path"]:nil != nil)) - { - dev_by_something = "/dev/disk/by-path/"+v["path"]:""; - path_disks[dev_by_something]= k; - } - // map disk by id - if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) - { - dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; - id_disks[dev_by_something] = k; - } - // map partitions from disk... - - foreach (map p, (list<map>)(v["partitions"]:[]), - { - // map partition by uuid - if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) - { - dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; - uuid_partitions[dev_by_something]= p["device"]:""; - } - - // map partition by path - if ((p["path"]:nil != "") && (p["path"]:nil != nil)) - { - dev_by_something = "/dev/disk/by-path/"+p["path"]:""; - path_partitions[dev_by_something]= p["device"]:""; - } - - // map partition by label - if ((p["label"]:nil != "") && (p["label"]:nil != nil)) - { - dev_by_something = "/dev/disk/by-label/"+p["label"]:""; - label_partitions[dev_by_something]= p["device"]:""; - } - - // map disk by id - if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) - { - dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; - id_partitions[dev_by_something] = p["device"]:""; - } - - }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), - }); // end of foreach (string k, map v, devices, - y2milestone("disks mapping by-id: %1", id_disks); - y2milestone("disks mapping by-uuid: %1", uuid_disks); - y2milestone("disks mapping by-path: %1", path_disks); - - y2milestone("partitions mapping by-id: %1", id_partitions); - y2milestone("partitions mapping by-uuid: %1", uuid_partitions); - y2milestone("partitions mapping by-path: %1", path_partitions); - y2milestone("partitions mapping by-label: %1", label_partitions); -} - - -/** FATE #302219 - Use and choose persistent device names for disk devices - * Converts a "/dev/disk/by-" device name to the corresponding kernel - * device name, if a mapping for this name can be found in the map from - * yast2-storage. If the given device name is not a "/dev/disk/by-" device - * name, it is left unchanged. Also, if the information about the device - * name cannot be found in the target map from yast2-storage, the device - * name is left unchanged. - * - * @param dev string device name - * @return string kernel device name - */ - -global define string MountByDev2Dev(string dev) -{ - y2milestone ("MountByDev2Dev: %1", dev); - - if (!regexpmatch(dev, "^/dev/disk/by-")) - return dev; - string ret = dev; - - // check if it is device name by id - if (search(dev, "/dev/disk/by-id/") != nil) - { - if (haskey(id_partitions, dev)) - ret = id_partitions[dev]:""; - - if (haskey(id_disks, dev)) - ret = id_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - // check if it is device name by uuid - if (search(dev, "/dev/disk/by-uuid/") != nil) - { - if (haskey(uuid_partitions, dev)) - ret = uuid_partitions[dev]:""; - - if (haskey(uuid_disks, dev)) - ret = uuid_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - // check if it is device name by path - if (search(dev, "/dev/disk/by-path/") != nil) - { - if (haskey(path_partitions, dev)) - ret = path_partitions[dev]:""; - - if (haskey(path_disks, dev)) - ret = path_disks[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - // check if it is device name by label - // only partition are supported - if (search(dev, "/dev/disk/by-label/") != nil) - { - if (haskey(label_partitions, dev)) - ret = label_partitions[dev]:""; - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; - } - - y2milestone("Device %1 was converted to: %2", dev, ret); - return ret; -} /** * Function remap device map to device name (/dev/sda) * or to label (ufo_disk) @@ -325,7 +173,7 @@ // convert device names in device map to the device names by device or label ret = mapmap (string k , string v, device_mapping, { - return $[BootCommon::MountByDev2Dev(k) : v]; + return $[BootStorage::MountByDev2Dev(k) : v]; }); return ret; @@ -352,27 +200,27 @@ if (haskey(globals_set, "boot_custom")) { - globals_set["boot_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_custom"]:""); + globals_set["boot_custom"] = BootStorage::MountByDev2Dev(globals_set["boot_custom"]:""); } if (haskey(globals_set, "boot_chrp_custom")) { - globals_set["boot_chrp_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_chrp_custom"]:""); + globals_set["boot_chrp_custom"] = BootStorage::MountByDev2Dev(globals_set["boot_chrp_custom"]:""); } if (haskey(globals_set, "boot_pmac_custom")) { - globals_set["boot_pmac_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_pmac_custom"]:""); + globals_set["boot_pmac_custom"] = BootStorage::MountByDev2Dev(globals_set["boot_pmac_custom"]:""); } if (haskey(globals_set, "boot_iseries_custom")) { - globals_set["boot_iseries_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_iseries_custom"]:""); + globals_set["boot_iseries_custom"] = BootStorage::MountByDev2Dev(globals_set["boot_iseries_custom"]:""); } if (haskey(globals_set, "boot_prep_custom")) { - globals_set["boot_prep_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_prep_custom"]:""); + globals_set["boot_prep_custom"] = BootStorage::MountByDev2Dev(globals_set["boot_prep_custom"]:""); } return globals_set; } @@ -403,7 +251,7 @@ y2debug("value of resume: %1",resume_arg[1]:""); if (dev != "") { - string resume = "resume="+BootCommon::MountByDev2Dev(dev); + string resume = "resume="+BootStorage::MountByDev2Dev(dev); y2debug("remap resume: %1",resume); new_append = add(new_append, resume); } else { @@ -456,7 +304,7 @@ if (s["root"]:"" != "") { string rdev = s["root"]:""; - s["root"] = BootCommon::MountByDev2Dev(rdev); + s["root"] = BootStorage::MountByDev2Dev(rdev); if (s["append"]:"" != "") s["append"] = remapResume(s["append"]:""); @@ -465,7 +313,7 @@ } if (s["chainloader"]:"" != "") - s["chainloader"] = BootCommon::MountByDev2Dev(s["chainloader"]:""); + s["chainloader"] = BootStorage::MountByDev2Dev(s["chainloader"]:""); return s; }); @@ -473,151 +321,7 @@ return temp_sec; } -/** - * bnc #468922 - problem with longtime running the parsing a huge number of disks - * Function initialize BootCommon::all_partitions only if storage change - * partitioning of disk - * true if init all_partitions - */ - -boolean MapAllPartitions() -{ - boolean ret = false; - if ((disk_change_time_MapAllPartitions != Storage::GetTargetChangeTime()) - || (size(BootCommon::all_partitions) < 1) || (size(BootCommon::target_map) < 1)) - { - // save last change time from storage for MapAllPartitions() - disk_change_time_MapAllPartitions = Storage::GetTargetChangeTime(); - - BootCommon::all_partitions = $[]; - BootCommon::target_map = $[]; - // get target map - BootCommon::target_map = (map<string,map>)Storage::GetTargetMap(); - // map all partitions - foreach (string k, map v, BootCommon::target_map, - { - foreach (map p, (list<map>)(v["partitions"]:[]), - { - all_partitions[p["device"]:""] = p; - }); - }); - ret = true; - } - - return ret; -} -/** FATE #302219 - Use and choose persistent device names for disk devices - * Converts a device name to the corresponding device name it should be - * mounted by, according to the "mountby" setting for the device from - * yast2-storage. As a safeguard against problems, if the "mountby" device - * name does not exist in the information from yast2-storage, it will - * fallback to the "kernel name" ("/dev/sdXY"). - * - * @param dev string device name - * @return string device name according to "mountby" - */ -global define string Dev2MountByDev(string dev) -{ - y2milestone ("Dev2MountByDev: %1", dev); - - // (`id,`uuid,`path,`device,`label) - symbol by_mount = nil; - if (Arch::ppc()) - by_mount = `id; - else - by_mount = Storage::GetDefaultMountBy(); - - //by_mount = `id; - y2milestone("Default mount by is %1", by_mount); - - // add all_partitions to partitions - if (MapAllPartitions()) - y2milestone("Init BootCommon::all_partitions was done"); - - map<string,map> partitions = BootCommon::all_partitions; - map<string,map> devices = BootCommon::target_map; - - string ret = dev; - switch(by_mount) - { - // convert to udev_id - case (`id): - // partitions - if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) - { - ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); - y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); - return ret; - } - // disks - if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != "")) - { - ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); - y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); - return ret; - } - break; - - // convert to uuid - case (`uuid): - // partitions - if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) - { - ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); - y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); - return ret; - } - // disks - if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != "")) - { - ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); - y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); - return ret; - } - break; - - // convert to udev_path - case (`path): - // partitions - if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) - { - ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); - y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); - return ret; - } - // disks - if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != "")) - { - ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); - y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); - return ret; - } - break; - - // convert to label - case (`label): - // partitions - if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) - { - ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); - y2milestone ("Device name: %1 is converted to label: %2", dev, ret); - return ret; - } - // disks - y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); - return ret; - break; - - // convert to device or uknown type - default: - y2warning ("Convert %1 to `device or unknwn type, result: %2", dev, ret); - return ret; - break; - } - - return ret; -} /** * Returns list of partitions with "mount by" hints. Goes through the list @@ -694,7 +398,7 @@ if ((type == `boot) && (bl == "grub")) { // check if device is in device map - if (haskey(device_mapping, k) || (haskey(device_mapping, Dev2MountByDev(k)))) + if (haskey(device_mapping, k) || (haskey(device_mapping, BootStorage::Dev2MountByDev(k)))) partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); } else { partitions = (list<map>)merge (partitions, (list<map>)(v["partitions"]:[])); @@ -740,7 +444,7 @@ // filter out disk which are not in device map if ((bl == "grub") && (type == `boot)) all_disks = (list<string>) filter(string k, all_disks, { - if (haskey(device_mapping, k) || (haskey(device_mapping, Dev2MountByDev(k)))) + if (haskey(device_mapping, k) || (haskey(device_mapping, BootStorage::Dev2MountByDev(k)))) return true; else return false; @@ -1782,7 +1486,7 @@ if (search(key, "resume=") != nil) { list <string> tmp = splitstring(key,"="); - key = Dev2MountByDev(tmp[1]:""); + key = BootStorage::Dev2MountByDev(tmp[1]:""); } if (search(default_append, key) != nil) deuce = deuce +1; -- 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] r56907 - /trunk/storage/storage/src/include/ep-lvm.ycp
by kmachalkova＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: kmachalkova Date: Wed Apr 22 13:42:26 2009 New Revision: 56907 URL: http://svn.opensuse.org/viewcvs/yast?rev=56907&view=rev Log: Function buttons for LVMs (pretty dumb so far) Modified: trunk/storage/storage/src/include/ep-lvm.ycp Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Wed Apr 22 13:42:26 2009 @@ -19,7 +19,7 @@ `item(`id(`delete), _("Delete")) ]); switch (widget) - { + { case `add: EpCreateLogicalVolume(device); break; @@ -57,6 +57,17 @@ } } + term LvmButtonBox() + { + return `HBox( + // push button text + `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), + // push button text + `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), + // push button text + `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) + ); + } void CreateLvmMainPanel(any user_data) { @@ -73,6 +84,10 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + list <term> mb_items = [ `item(`id(`group), _("Volume Group")) ]; + + if ( !isempty(table_contents) ) + mb_items = add( mb_items, `item(`id(`volume), _("Logical Volume")) ); UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( @@ -83,7 +98,8 @@ table_header, table_contents), `HBox( // push button text - `PushButton(`id(`add), `opt(`key_F3), _("Add Volume Group...")), + `MenuButton(`id(`add), `opt(`key_F3), _("Add..."), mb_items), + LvmButtonBox(), `HStretch() ) ) @@ -130,16 +146,8 @@ UI::ReplaceWidget(`tab_panel, `VBox( - `HStretch(), - StorageFields::Overview(fields, target_map, device), - `HBox( - // push button text - `PushButton(`id(`resize), _("Resize...")), - // push button text - `PushButton(`id(`delete), _("Delete...")), - `HStretch() - ) - ) + StorageFields::Overview(fields, target_map, device) + ) ); // helptext @@ -194,12 +202,7 @@ `HBox( // push button text `PushButton(`id(`add), `opt(`key_F3), _("Add...")), - // push button text - `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + LvmButtonBox(), `HStretch() ) ) @@ -334,12 +337,7 @@ `IconAndHeading(sformat(_("Logical Volume: %1"), device), StorageIcons::lvm_lv_icon), StorageFields::Overview(fields, target_map, device), `HBox( - // push button text - `PushButton(`id(`edit), _("Edit...")), - // push button text - `PushButton(`id(`resize), _("Resize...")), - // push button text - `PushButton(`id(`delete), _("Delete...")), + LvmButtonBox(), `HStretch() ) ) -- 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] r56906 - /tags/stable-2_18_2/online-update/
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 13:07:42 2009 New Revision: 56906 URL: http://svn.opensuse.org/viewcvs/yast?rev=56906&view=rev Log: Created tag stable-2_18_2 for online-update Added: tags/stable-2_18_2/online-update/ - copied from r56905, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56905 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 13:07:37 2009 New Revision: 56905 URL: http://svn.opensuse.org/viewcvs/yast?rev=56905&view=rev Log: - new check for online update source (bnc#459527) - offer registration if online update source not found (bnc#459527) - 2.18.2 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=56905&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Apr 22 13:07:37 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Apr 22 13:07:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 21:31:52 CEST 2009 - jsuchome(a)suse.cz + +- new check for online update source (bnc#459527) +- offer registration if online update source not found (bnc#459527) +- 2.18.2 + +------------------------------------------------------------------- Mon Mar 23 15:41:08 CET 2009 - jsuchome(a)suse.cz - do not reset the user locks (bnc#483648) Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Wed Apr 22 13:07:37 2009 @@ -80,24 +80,29 @@ Progress::NextStage (); - if (!OnlineUpdate::cd_update) // for CD for cd update was not initialized yet + if (!OnlineUpdate::cd_update) // CD for cd update was not initialized yet { boolean is_available = false; - // check if there is any patch for installation - foreach (map patch, Pkg::ResolvableProperties ("", `patch, ""), { - if (patch["status"]:`none == `available) + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + y2internal ("data source map: %1", data); + if (data["is_update_repo"]:false) { is_available = true; break; } }); - // continue/cancel message - if (!is_available && Popup::YesNo (_("No active update repository available. -Exit Online Update now? -"))) + // yes/no message + if (!is_available && Popup::YesNo (_("No update repository +configured yet. Run configuration workflow now?"))) { - Wizard::CloseDialog(); - return `abort; + any res = WFM::CallFunction ("online_update_configuration", []); + if (res != `next && res != `finish) + { + Wizard::CloseDialog(); + return `abort; + } } } -- 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] r56904 - /tags/stable-2_18_4/product-creator/
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 08:16:35 2009 New Revision: 56904 URL: http://svn.opensuse.org/viewcvs/yast?rev=56904&view=rev Log: Created tag stable-2_18_4 for product-creator Added: tags/stable-2_18_4/product-creator/ - copied from r56903, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56903 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/ProductCreator.ycp
by jsuchome＠svn.opensuse.org 22 Apr '09

22 Apr '09

Author: jsuchome Date: Wed Apr 22 08:16:30 2009 New Revision: 56903 URL: http://svn.opensuse.org/viewcvs/yast?rev=56903&view=rev Log: - look primary into base product for isolinux.cfg (bnc#496263) - 2.18.4 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=5690… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Apr 22 08:16:30 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Apr 22 08:16:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 22 08:03:46 CEST 2009 - jsuchome(a)suse.cz + +- look primary into base product for isolinux.cfg (bnc#496263) +- 2.18.4 + +------------------------------------------------------------------- Tue Apr 14 15:40:03 CEST 2009 - jsuchome(a)suse.cz - Image Creator: install squashfs by default (bnc#485052) Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Apr 22 08:16:30 2009 @@ -695,13 +695,18 @@ if (arch == "s390_64") arch = "s390x"; bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); - list<integer> srcids = [checkProductDependency()]; + + list<integer> srcids = []; + if (Config["base_repo"]:"" == "") + srcids = [checkProductDependency()]; + else + srcids = UrlToId ([Config["base_repo"]:""]); foreach(integer srcid, srcids, { y2milestone("Downloading %1 from source %2", bootconfig_path, srcid); bootconfig_path = Pkg::SourceProvideOptionalFile(srcids[0]:0, 1, bootconfig_path); - y2debug("bootconfig_path: %1", bootconfig_path); + y2debug ("bootconfig_path: %1", bootconfig_path); if (bootconfig_path == nil) { -- 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] r56902 - in /branches/tmp/SLE-11-SP1-Stash/yast2: library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 20:34:06 2009 New Revision: 56902 URL: http://svn.opensuse.org/viewcvs/yast?rev=56902&view=rev Log: - PackageCallbacks.ycp - don't read non existing y2logRPM file (bnc#456446) Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/li… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp Tue Apr 21 20:34:06 2009 @@ -547,11 +547,6 @@ { y2milestone("DonePackage(error: %1, reason: '%2')", error, reason); - string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; - SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) - + Directory::logdir + "/y2logRPM' > " + infopath); - string info = reason + "\n---\n" + (string) SCR::Read (.target.string, [infopath, "-?-"]); - string message = sformat ( _deleting_package ? // error popup during package installation, %1 is the name of the package _("Removal of package %1 failed.") @@ -561,7 +556,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(info); + CommandLine::Print(reason); // ask user in the interactive mode if (CommandLine::Interactive()) @@ -599,7 +594,7 @@ if ( showLongInfo ) { UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -616,7 +611,7 @@ showLongInfo = ShowLogInfo (message, button_box); if (showLongInfo) { - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -645,6 +640,16 @@ // default: ignore } + else + { + // no error, there is additional info (rpm output), see bnc#456446 + y2milestone("Additional RPM otput: %1", reason); + + if (Mode::commandline()) + { + CommandLine::Print(reason); + } + } return "I"; } Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/pa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Tue Apr 21 20:34:06 2009 @@ -5,6 +5,12 @@ which indicates an error (bnc#157551) ------------------------------------------------------------------- +Wed Apr 8 11:27:13 CEST 2009 - lslezak(a)suse.cz + +- PackageCallbacks.ycp - don't read non existing y2logRPM file + (bnc#456446) + +------------------------------------------------------------------- Fri Apr 3 13:26:58 CEST 2009 - lslezak(a)suse.cz - Do not display "No package source" popup, just log a warning -- 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] r56901 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/PackageInstallation.ycp src/modules/PackageSlideShow.ycp src/modules/SlideShowCallbacks.ycp
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 20:32:07 2009 New Revision: 56901 URL: http://svn.opensuse.org/viewcvs/yast?rev=56901&view=rev Log: - Append additional RPM output to the installation log only if it is not empty (bnc#495047) - Slideshow fixes - display additional rpm output in the installation log, do not use non-existing y2logRPM file (bnc#456446) - Avoid division by zero when total size to install is less than 1024B (converted to 0kB) Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Tue Apr 21 20:32:07 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz + +- Append additional RPM output to the installation log only if it + is not empty (bnc#495047) + +------------------------------------------------------------------- Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz - Using new function GetCachedFileFromSource from AddOnProduct @@ -13,6 +19,15 @@ repositories (bnc #496404). ------------------------------------------------------------------- +Wed Apr 8 10:38:15 CEST 2009 - lslezak(a)suse.cz + +- Slideshow fixes - display additional rpm output in the + installation log, do not use non-existing y2logRPM file + (bnc#456446) +- Avoid division by zero when total size to install is less than + 1024B (converted to 0kB) + +------------------------------------------------------------------- Fri Apr 3 14:31:20 CEST 2009 - locilka(a)suse.cz - Adjusting initial repository name according to LABEL in content Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageInstallation.ycp Tue Apr 21 20:32:07 2009 @@ -156,9 +156,9 @@ list<string> errpacks = (list<string>) (commit_result[1]:[]); if (size (errpacks) > 0) { - string full_log = (string) SCR::Read (.target.string, Installation::destdir + - Directory::logdir + "/y2logRPM"); - ShowFailedPackages (mergestring (errpacks, "\n"), full_log); + // unfortunately the full log is not available :-( + ShowFailedPackages (mergestring (errpacks, "\n"), ""); + list<string> old_failed_packs = []; if ((integer)SCR::Read (.target.size, "/var/lib/YaST2/failed_packages") > 0) Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/PackageSlideShow.ycp Tue Apr 21 20:32:07 2009 @@ -764,7 +764,15 @@ **/ void UpdateTotalProgress(boolean silent_check) { - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / ( total_size_to_install >> 10 ), nil /*, SlideShow::GetProgressLabel()*/ ); + integer total_size_to_install_kB = total_size_to_install >> 10; + + // avoid division by zero + if (total_size_to_install_kB <= 0) + { + total_size_to_install_kB = 1; + } + + SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); UpdateCurrentCdProgress(silent_check); Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/SlideShowCallbacks.ycp Tue Apr 21 20:32:07 2009 @@ -422,6 +422,16 @@ { ret = PackageCallbacks::DonePackage( error, reason ); } + else + { + // put additional rpm output to the installation log + if (reason != nil && size(reason) > 0) + { + y2milestone("Additional RPM output: %1", reason); + SlideShow::AppendMessageToInstLog(reason); + } + } + if (size (ret) == 0 || tolower (substring (ret, 0, 1)) != "r") { PackageSlideShow::SlideDisplayDone( -- 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] r56900 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 19:27:23 2009 New Revision: 56900 URL: http://svn.opensuse.org/viewcvs/yast?rev=56900&view=rev Log: - Pkg::ResolvableDependencies() - also return raw (unresolved) dependencies in the result (key "deps"), remove duplicated dependencies in the result (bnc#479575) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Apr 21 19:27:23 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 19:18:16 CEST 2009 - lslezak(a)suse.cz + +- Pkg::ResolvableDependencies() - also return raw (unresolved) + dependencies in the result (key "deps"), remove duplicated + dependencies in the result (bnc#479575) + +------------------------------------------------------------------- Mon Mar 30 16:24:58 CEST 2009 - lslezak(a)suse.cz - return "is_update_repo" flag in Pkg::SourceGeneralData() call Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Tue Apr 21 19:27:23 2009 @@ -407,6 +407,7 @@ _kinds.insert("enhances"); _kinds.insert("supplements"); YCPList ycpdeps; + YCPList rawdeps; for (std::set<std::string>::const_iterator kind_it = _kinds.begin(); kind_it != _kinds.end(); ++kind_it) { @@ -414,21 +415,50 @@ zypp::Dep depkind(*kind_it); zypp::Capabilities deps = item.resolvable()->dep(depkind); + // add raw dependencies + for_(it, deps.begin(), deps.end()) + { + YCPMap rawdep; + rawdep->add(YCPString(*kind_it), YCPString(it->asString())); + rawdeps->add(rawdep); + } + zypp::sat::WhatProvides prv(deps); + // resolve dependencies for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) { - YCPMap ycpdep; - ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); - ycpdep->add (YCPString ("name"), YCPString (d->name())); - ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); - ycpdeps->add (ycpdep); + if (d->kind().asString().empty() || d->name().empty()) + { + y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); + } + else + { + YCPMap ycpdep; + ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); + ycpdep->add (YCPString ("name"), YCPString (d->name())); + ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); + + if (!ycpdeps.contains(ycpdep)) + { + ycpdeps->add (ycpdep); + } + } } } catch (...) {} } - info->add (YCPString ("dependencies"), ycpdeps); + + if (ycpdeps.size() > 0) + { + info->add (YCPString ("dependencies"), ycpdeps); + } + + if (rawdeps.size() > 0) + { + info->add (YCPString ("deps"), rawdeps); + } } return info; -- 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] r56899 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 18:39:28 2009 New Revision: 56899 URL: http://svn.opensuse.org/viewcvs/yast?rev=56899&view=rev Log: - use boost function Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Apr 21 18:39:28 2009 @@ -36,10 +36,7 @@ init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = Name; undevDevice(nm); - logfile_name = nm; - string::size_type pos = 0; - while( (pos=logfile_name.find( '/', pos )) != string::npos ) - logfile_name[pos] = '_'; + logfile_name = boost::replace_all_copy(nm, "/", "_"); if( Name.find( "/dev/" )==0 ) dev = Name; else -- 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] r56898 - /trunk/bootloader/src/modules/BootArch.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 17:33:46 2009 New Revision: 56898 URL: http://svn.opensuse.org/viewcvs/yast?rev=56898&view=rev Log: - don't use StorageControllers::dasdParam which is always empty Modified: trunk/bootloader/src/modules/BootArch.ycp Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Tue Apr 21 17:33:46 2009 @@ -29,7 +29,6 @@ import "Linuxrc"; import "ProductFeatures"; import "Stage"; -import "StorageControllers"; /** * Get parameters for the default kernel @@ -79,8 +78,7 @@ if ( env_term == "linux\n" ) { termparm = "TERM=linux console=ttyS0 console=ttyS1"; } - string parameters = sformat ("%1 %2 %3", - StorageControllers::dasdParam, + string parameters = sformat ("%1 %2", features, termparm); return parameters; -- 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] r56897 - in /trunk/storage/storage/src/include: ep-hd.ycp ep-loop.ycp
by kmachalkova＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: kmachalkova Date: Tue Apr 21 17:05:41 2009 New Revision: 56897 URL: http://svn.opensuse.org/viewcvs/yast?rev=56897&view=rev Log: Function buttons for HDs (pretty dumb so far) Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-loop.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Apr 21 17:05:41 2009 @@ -56,6 +56,17 @@ } } + term HdButtonBox() + { + return `HBox( + // push button text + `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), + // push button text + `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), + // push button text + `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) + ); + } void CreateHdMainPanel(any user_data) { @@ -75,10 +86,6 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); - term buttons = `HBox( - `HStretch() - ); - UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -86,9 +93,14 @@ `IconAndHeading(_("Hard Disks"), StorageIcons::hd_icon), `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), - buttons + `HBox( + // push button text + `PushButton(`id(`add),`opt(`key_F3), _("Add Partition...")), + HdButtonBox(), + `HStretch() ) ) + ) ); // helptext @@ -128,8 +140,6 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( - // push button text - `PushButton(`id(`delete), _("Delete...")), `HStretch(), // push button text `PushButton(`id(`smart), _("Smart...")), @@ -247,12 +257,7 @@ `HBox( // push button text `PushButton(`id(`add),`opt(`key_F3), _("Add...")), - // push button text - `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + HdButtonBox(), `HStretch(), // menu button text `MenuButton(`opt(`key_F7), _("Expert..."), expert_cmds) @@ -409,12 +414,7 @@ `IconAndHeading(sformat(_("Partition: %1"), device), StorageIcons::hd_part_icon), StorageFields::Overview(fields, target_map, device), `HBox( - // push button text - `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + HdButtonBox(), `HStretch() ) ) Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Tue Apr 21 17:05:41 2009 @@ -15,7 +15,7 @@ term LoopButtonBox() { return `HBox( - // push button text + // push button text `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), // push button text `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) -- 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] r56896 - /branches/tmp/coolo/update_yast_repo/last_rev_yast
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:49:03 2009 New Revision: 56896 URL: http://svn.opensuse.org/viewcvs/yast?rev=56896&view=rev Log: 93 more Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Tue Apr 21 16:49:03 2009 @@ -1 +1 @@ -56803 +56896 -- 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] r56895 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:36:58 2009 New Revision: 56895 URL: http://svn.opensuse.org/viewcvs/yast?rev=56895&view=rev Log: submit Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=56895&r1=56894… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Tue Apr 21 16:36:58 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Apr 21 16:36:58 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 16:36:36 CEST 2009 - coolo(a)suse.de + +- update the logo to say 11.2 (ugly) +- 2.18.2 + +------------------------------------------------------------------- Wed Apr 1 13:47:29 CEST 2009 - locilka(a)suse.cz - New YaST icon based on new YaST Mascot: Aardvark. -- 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] r56894 - /trunk/theme/openSUSE/wizard/logo.png
by coolo＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: coolo Date: Tue Apr 21 16:36:04 2009 New Revision: 56894 URL: http://svn.opensuse.org/viewcvs/yast?rev=56894&view=rev Log: make it 11.2 :) Modified: trunk/theme/openSUSE/wizard/logo.png Modified: trunk/theme/openSUSE/wizard/logo.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/logo.png?r… ============================================================================== Binary files - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56893 - in /trunk/storage/storage/src/include: ep-all.ycp ep-hd.ycp
by kmachalkova＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: kmachalkova Date: Tue Apr 21 16:03:47 2009 New Revision: 56893 URL: http://svn.opensuse.org/viewcvs/yast?rev=56893&view=rev Log: Moving 'Rescan' button and other module configs menu to the main screen Modified: trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Tue Apr 21 16:03:47 2009 @@ -7,9 +7,25 @@ { textdomain "storage"; + import "Arch"; + import "PackageCallbacks"; + import "PackageSystem"; + void CreateAllPanel(any user_data) { + + boolean IsAvailable ( string client ) + { + //in the installed system, we don't care if the client isn't there + //as the user will be prompted to install the pkg anyway (in CallConfig) + if ( !Stage::initial() ) + return true; + //check if the client is in inst-sys + else + return WFM::ClientExists(client); + } + string short_hostname = Hostname::CurrentHostname(); list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, @@ -21,14 +37,45 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateAll); - term buttons = `HBox(); + term buttons = `HBox( + // push button text + `PushButton(`id(`rescan), `opt(`key_F6), _("Rescan Devices")) + ); if (Mode::installation()) { // push button text buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points..."))); - buttons = add(buttons, `HStretch()); } + buttons = add(buttons, `HStretch()); + + list<term> configs = []; + + if (IsAvailable("iscsi-client")) { + // menu entry text + configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); + } + + if (true) { + // menu entry text + configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + } + + if (Arch::s390() && IsAvailable("s390")) { + // menu entry text + configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + // menu entry text + configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + // menu entry text + configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); + } + + if (size(configs) > 0) { + // menu button text + buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); + } + + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -66,8 +113,55 @@ void HandleAllPanel(any user_data, map event) { + + boolean CheckAndInstallPackages( list <string> pkgs ) + { + if (Stage::initial()) + return true; + + boolean ret = false; + //switch off pkg-mgmt loading progress dialogs, + //because it just plain sucks + PackageCallbacks::RegisterEmptyProgressCallbacks(); + ret = PackageSystem::CheckAndInstallPackages(pkgs); + PackageCallbacks::RestorePreviousProgressCallbacks(); + + return ret; + } + + void CallConfig(string text, list<string> pkgs, string call) + { + boolean doit = true; + + if (!Storage::EqualBackupStates("expert-partitioner", "", true)) + { + doit = Popup::YesNo(text); + } + + if (doit) + { + if (pkgs == nil || CheckAndInstallPackages(pkgs)) + { + if (call != nil) + WFM::call(call); + RescanDisks(); + Storage::CreateTargetBackup("expert-partitioner"); + + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + } + } + } + switch (Event::IsWidgetActivated(event)) { + case `rescan: + // popup text + CallConfig(_("Rescaning disks cancels all current changes. +Really rescan disks?"), nil, nil); + break; + case `import: ImportMountPoints(); @@ -77,6 +171,45 @@ break; } + switch (Event::IsMenu(event)) + { + case `iscsi: + // popup text + CallConfig(_("Calling iSCSI configuration cancels all current changes. +Really call iSCSI configuration?"), ["yast2-iscsi-client"], "iscsi-client"); + break; + + case `multipath: + if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || + (Mode::normal() && WFM::ClientExists("multipath"))) + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); + else + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?"), nil, "multipath-simple"); + break; + + case `dasd: + // popup text + CallConfig(_("Calling DASD configuration cancels all current changes. +Really call DASD configuration?"), ["yast2-s390"], "dasd"); + break; + + case `zfcp: + // popup text + CallConfig(_("Calling zFCP configuration cancels all current changes. +Really call zFCP configuration?"), ["yast2-s390"], "zfcp"); + break; + + case `xpram: + // popup text + CallConfig(_("Calling XPRAM configuration cancels all current changes. +Really call XPRAM configuration?"), ["yast2-s390"], "xpram"); + break; + } + switch (Event::IsWidgetContextMenuActivated(event)) { case `table: Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Apr 21 16:03:47 2009 @@ -8,8 +8,6 @@ textdomain "storage"; import "Arch"; - import "PackageCallbacks"; - import "PackageSystem"; import "Region"; import "Mode"; import "Stage"; @@ -66,16 +64,7 @@ return StorageFields::PredicateDiskType(disk, partition, [`CT_DMRAID, `CT_DMMULTIPATH, `CT_DISK]); } - boolean IsAvailable ( string client ) - { - //in the installed system, we don't care if the client isn't there - //as the user will be prompted to install the pkg anyway (in CallConfig) - if ( !Stage::initial() ) - return true; - //check if the client is in inst-sys - else - return WFM::ClientExists(client); - } + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `format, `type, `fs_type, `label, `mount_point, `mount_by, @@ -87,38 +76,9 @@ list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); term buttons = `HBox( - // push button text - `PushButton(`id(`rescan), `opt(`key_F6), _("Rescan Disks")) + `HStretch() ); - buttons = add(buttons, `HStretch()); - - list<term> configs = []; - - if (IsAvailable("iscsi-client")) { - // menu entry text - configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); - } - - if (true) { - // menu entry text - configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); - } - - if (Arch::s390() && IsAvailable("s390")) { - // menu entry text - configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); - // menu entry text - configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); - // menu entry text - configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); - } - - if (size(configs) > 0) { - // menu button text - buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); - } - UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( @@ -141,96 +101,6 @@ void HandleHdMainPanel(any user_data, map event) { - boolean CheckAndInstallPackages( list <string> pkgs ) - { - if (Stage::initial()) - return true; - - boolean ret = false; - //switch off pkg-mgmt loading progress dialogs, - //because it just plain sucks - PackageCallbacks::RegisterEmptyProgressCallbacks(); - ret = PackageSystem::CheckAndInstallPackages(pkgs); - PackageCallbacks::RestorePreviousProgressCallbacks(); - - return ret; - } - - void CallConfig(string text, list<string> pkgs, string call) - { - boolean doit = true; - - if (!Storage::EqualBackupStates("expert-partitioner", "", true)) - { - doit = Popup::YesNo(text); - } - - if (doit) - { - if (pkgs == nil || CheckAndInstallPackages(pkgs)) - { - if (call != nil) - WFM::call(call); - RescanDisks(); - Storage::CreateTargetBackup("expert-partitioner"); - - UpdateMainStatus(); - UpdateNavigationTree(nil); - TreePanel::Create(); - } - } - } - - - switch (Event::IsWidgetActivated(event)) - { - case `rescan: - // popup text - CallConfig(_("Rescaning disks cancels all current changes. -Really rescan disks?"), nil, nil); - break; - } - - switch (Event::IsMenu(event)) - { - case `iscsi: - // popup text - CallConfig(_("Calling iSCSI configuration cancels all current changes. -Really call iSCSI configuration?"), ["yast2-iscsi-client"], "iscsi-client"); - break; - - case `multipath: - if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || - (Mode::normal() && WFM::ClientExists("multipath"))) - // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); - else - // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. -Really call Multipath configuration?"), nil, "multipath-simple"); - break; - - case `dasd: - // popup text - CallConfig(_("Calling DASD configuration cancels all current changes. -Really call DASD configuration?"), ["yast2-s390"], "dasd"); - break; - - case `zfcp: - // popup text - CallConfig(_("Calling zFCP configuration cancels all current changes. -Really call zFCP configuration?"), ["yast2-s390"], "zfcp"); - break; - - case `xpram: - // popup text - CallConfig(_("Calling XPRAM configuration cancels all current changes. -Really call XPRAM configuration?"), ["yast2-s390"], "xpram"); - break; - } - - switch (Event::IsWidgetContextMenuActivated(event)) { case `table: -- 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] r56892 - /tags/branch-SLE-10-SP3-2_14_47/iscsi-client/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:41 2009 New Revision: 56892 URL: http://svn.opensuse.org/viewcvs/yast?rev=56892&view=rev Log: Created tag branch-SLE-10-SP3-2_14_47 for iscsi-client Added: tags/branch-SLE-10-SP3-2_14_47/iscsi-client/ - copied from r56891, branches/SuSE-SLE-10-SP3-Branch/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56891 - /tags/branch-SLE-10-SP3-2_14_47/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:35 2009 New Revision: 56891 URL: http://svn.opensuse.org/viewcvs/yast?rev=56891&view=rev Log: Created tag branch-SLE-10-SP3-2_14_47 Added: tags/branch-SLE-10-SP3-2_14_47/ -- 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] r56890 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 16:00:20 2009 New Revision: 56890 URL: http://svn.opensuse.org/viewcvs/yast?rev=56890&view=rev Log: changed dialogs workflow to allow to edit authentication for connection (fate#305306) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION Tue Apr 21 16:00:20 2009 @@ -1 +1 @@ -2.14.46 +2.14.47 Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 16:00:20 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 9 20:46:19 CET 2009 - mzugec(a)suse.de + +- changed dialogs workflow to allow to edit authentication for + connection (fate#305306) +- 2.14.47 + +------------------------------------------------------------------- Tue Mar 10 13:07:53 CET 2009 - mzugec(a)suse.cz - autologin discovery authentication (bnc#392428) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp Tue Apr 21 16:00:20 2009 @@ -31,6 +31,7 @@ global list <string> sessions = []; global list <string> discovered = []; global list <string> targets = []; +global list<string> currentRecord = []; global boolean configured = false; boolean serviceStatus = false; map<string, any> config = $[]; @@ -109,8 +110,8 @@ } -global map<string, any> getNode(list<string> rec){ - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":rec[1]:"", "IP":rec[0]:""]); +global map<string, any> getNode(){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":currentRecord[1]:"", "IP":currentRecord[0]:""]); if (cmd["exit"]:0!=0) return $[]; map<string, any> auth = $[]; foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { @@ -344,11 +345,11 @@ } // delete deiscovered target from database -global boolean deleteRecord(list<string> record){ +global boolean deleteRecord(){ boolean ret = true; - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", currentRecord); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", record[1]:"", record[0]:"")); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return false; readSessions(); @@ -356,10 +357,10 @@ } // get (manual/automatic) status of target connecting -global string getStartupStatus(list<string> record){ +global string getStartupStatus(){ string status = ""; - y2milestone("Getting status of record %1", record); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", record[1]:"", record[0]:"")); + y2milestone("Getting status of record %1", currentRecord); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return ""; foreach(string row, splitstring(retcode["stdout"]:"", "\n"), { if (issubstring(row, "node.conn[0].startup")){ @@ -367,14 +368,14 @@ break; } }); - y2milestone("Startup status for %1 is %2", record, status); + y2milestone("Startup status for %1 is %2", currentRecord, status); return status; } // update authentication value -global boolean setValue(list<string> record, string name, string value){ - y2milestone("set %1 for record %2", name, record); - string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", record[1]:"", record[0]:"", name, value); +global boolean setValue(string name, string value){ + y2milestone("set %1 for record %2", name, currentRecord); + string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", currentRecord[1]:"", currentRecord[0]:"", name, value); y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); @@ -387,12 +388,12 @@ } // check if given target is connected -global boolean connected(list<string> rec, boolean check_ip){ -y2internal("check connected status for %1 with IP check:%2", rec, check_ip); +global boolean connected(boolean check_ip){ +y2internal("check connected status for %1 with IP check:%2", currentRecord, check_ip); boolean ret = false; foreach(string row, sessions, { list<string> list_row = splitstring(row, " "); - if (list_row[1]:"" == rec[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(rec[0]:"", ",")[0]:"" : true)){ + if (list_row[1]:"" == currentRecord[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(currentRecord[0]:"", ",")[0]:"" : true)){ ret = true; break; } @@ -401,11 +402,11 @@ } // change startup status (manual/automatic) for target -global boolean setStartupStatus(list<string> record, string status){ - y2milestone("Set startup status for %1 to %2", record, status); +global boolean setStartupStatus(string status){ + y2milestone("Set startup status for %1 to %2", currentRecord, status); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); if (size(retcode["stderr"]:"")>0) return false; return ret; } @@ -417,9 +418,8 @@ if ( b != $[] ){ y2milestone("checking size of %1 and %2", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:""); if (size(b["iSCSI_TARGET_NAME"]:"")>0 && size(b["iSCSI_TARGET_IPADDR"]:"")>0){ - list <string> curr_rec = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""]; - y2milestone("variable curr_rec %1", curr_rec); - if (connected( curr_rec , false) == false){ + currentRecord = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""]; + if (connected( false) == false){ y2milestone("in case not connected do discovery"); // do discovery saveConfig(b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); @@ -429,14 +429,14 @@ // do authentication if needed if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){ y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:""); - setValue(curr_rec, "node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:""); + setValue("node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:""); + setValue("node.session.auth.authmethod", "CHAP"); } if (size(b["iSCSI_TARGET_CHAP_NAME_IN"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"")>0){ y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); - setValue(curr_rec, "node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:""); - setValue(curr_rec, "node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); + setValue("node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:""); + setValue("node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:""); } // log on into target @@ -444,7 +444,7 @@ // set startup status to automatic y2milestone("set startup status to automatic"); - setStartupStatus(curr_rec, "automatic"); + setStartupStatus("automatic"); } else y2error("Already connected, no autoLogOn needed"); } else y2error("iSCSI_TARGET_NAME or iSCSI_TARGET_IPADDR are not available. Couldn't do autoLogOn"); } @@ -452,34 +452,35 @@ } global boolean loginIntoTarget(map target){ - list<string> curr_rec = [target["portal"]:"", target["target"]:""]; + currentRecord = [target["portal"]:"", target["target"]:""]; if (target["authmethod"]:"None"!="None"){ string user_in = target["username_in"]:""; string pass_in = target["password_in"]:""; if (size(user_in)>0 && size(pass_in)>0){ - setValue(curr_rec, "node.session.auth.username_in", user_in); - setValue(curr_rec, "node.session.auth.password_in", pass_in); + setValue("node.session.auth.username_in", user_in); + setValue("node.session.auth.password_in", pass_in); } else{ - setValue(curr_rec, "node.session.auth.username_in", ""); - setValue(curr_rec, "node.session.auth.password_in", ""); + setValue("node.session.auth.username_in", ""); + setValue("node.session.auth.password_in", ""); } string user_out = target["username"]:""; string pass_out = target["password"]:""; if (size(user_out)>0 && size(pass_out)>0){ - setValue(curr_rec, "node.session.auth.username", user_out); - setValue(curr_rec, "node.session.auth.password", pass_out); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", user_out); + setValue("node.session.auth.password", pass_out); + setValue("node.session.auth.authmethod", "CHAP"); } else { - setValue(curr_rec, "node.session.auth.username", ""); - setValue(curr_rec, "node.session.auth.password", ""); - setValue(curr_rec, "node.session.auth.authmethod", ""); + setValue("node.session.auth.username", ""); + setValue("node.session.auth.password", ""); + setValue("node.session.auth.authmethod", ""); } - } else setValue(curr_rec, "node.session.auth.authmethod", "None"); + } else setValue("node.session.auth.authmethod", "None"); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:"")); y2internal("output %1", output); - if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic"); + currentRecord = [target["portal"]:"", target["target"]:""]; + if (!Mode::autoinst()) setStartupStatus("automatic"); return output["exit"]:-1==0; } @@ -520,11 +521,12 @@ foreach(string sess, sessions, { string target = splitstring(sess, " ")[1]:""; string portal = splitstring(sess, " ")[0]:""; - map<string, any> auth = getNode([portal, target]); + currentRecord = [portal, target]; + map<string, any> auth = getNode(); map new_target = $["target": target, "portal" : portal, - "startup" : getStartupStatus([portal, target]), + "startup" : getStartupStatus(), ]; if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None"; else new_target = union(new_target, auth); @@ -644,9 +646,10 @@ } }); foreach(map target, ay_settings["targets"]:[], { -y2internal("login into target %1", target); + y2internal("login into target %1", target); + currentRecord = [target["portal"]:"", target["target"]:""]; loginIntoTarget(target); - setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual"); + setStartupStatus(target["startup"]:"manual"); }); return true; } Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp Tue Apr 21 16:00:20 2009 @@ -80,8 +80,9 @@ ), `Left(`HBox( `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Log Out")), - `PushButton(`id(`toggle), _("Toggle Start-Up")) + `PushButton(`id(`edit), _("Edit")), + `PushButton(`id(`del), _("Log Out")) +// `PushButton(`id(`toggle), _("Toggle Start-Up")) )) ), "init" : initConnectedTable, @@ -133,22 +134,24 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none), `opt(`invertAutoEnable), _("No Authentication"), true , + `VBox( + `Left(`Label(_("Incoming Authentication"))), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication"))), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initDiscAuth, - "handle" : handleDiscAuth, - "validate_type" : `function, - "validate_function" : validateDiscAuth, +// "handle" : handleDiscAuth, +// "validate_type" : `function, +// "validate_function" : validateDiscAuth, "help" : HELPS["conn_auth"]:"" ], @@ -157,25 +160,37 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none),`opt(`invertAutoEnable), _("No Authentication"), true, + `VBox( + `Left( `Label(_("Incoming Authentication")) ), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication")) ), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initConnAuth, - "handle" : handleDiscAuth, +// "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, "help" : HELPS["conn_auth"]:"" ], + "startup" : $[ + "widget" : `combobox, + "opt" : [`hstretch, `notify], + "label" : _("Startup"), + "items" : [ + ["manual", "manual"], + ["onboot", "onboot"], + ["automatic", "automatic"] + ] + ], // widget for portal address "server_location" : $[ "widget" : `custom, @@ -361,7 +376,7 @@ any ConnAuthDialog(string return_to){ current_tab = return_to; string caption = _("iSCSI Initiator Discovery"); - list<map <string, any> > w = CWM::CreateWidgets (["conn_auth"], (map <string, map <string, any> >)widgets); + list<map <string, any> > w = CWM::CreateWidgets (["startup", "conn_auth"], (map <string, map <string, any> >)widgets); term contents = `VBox( `VStretch(), @@ -370,6 +385,7 @@ `HSpacing (1), `VBox( w[0, "widget"]:`VSpacing (1), + w[1, "widget"]:`VSpacing (1), `VSpacing (2) ), `HSpacing (1), Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp Tue Apr 21 16:00:20 2009 @@ -3,7 +3,6 @@ import "IP"; boolean stat = false; - list<string> curr_rec = []; boolean bg_finish = false; // string initiatorname=""; // function for run command in background @@ -96,8 +95,8 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::sessions, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClient::getStartupStatus(row_in_string))); + IscsiClient::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", IscsiClient::getStartupStatus())); row = row + 1; }); UI::ChangeWidget (`id (`connected), `Items, items); @@ -106,21 +105,20 @@ } // get record identificator from selected row -list<string> getRecord(){ - list<string> record = []; +list<string> setRecord(){ + IscsiClient::currentRecord = []; any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem); if (sel_item != nil){ integer current = tointeger(sel_item); - record = splitstring(IscsiClient::sessions[current]:"", " " ); + IscsiClient::currentRecord = splitstring(IscsiClient::sessions[current]:"", " " ); // record = deletechars(record, "[]"); } - return record; + return IscsiClient::currentRecord; } // handle for table of connected sessions symbol handleConnectedTable (string key, map event){ if (event["EventReason"]:"" == "Activated"){ - list<string> record = []; switch((symbol)event["ID"]:nil){ case(`add): // add a new target, discovery @@ -129,30 +127,35 @@ return `add; case(`del): // delete (logout from) connected target - record = getRecord(); - if (size( record )>0){ + setRecord(); + if (size( IscsiClient::currentRecord )>0){ if (Popup::ContinueCancel(_("Really log out from the selected target?"))) - if ( !(IscsiClient::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target.")); + if ( !(IscsiClient::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target.")); else { - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", IscsiClient::currentRecord); initConnectedTable(""); } } else Popup::Error(_("No record found.")); break; + case(`edit): + setRecord(); + return `edit; + break; + case(`toggle): // change manual/automatic status of connected target - record = getRecord(); - if (size( record )>0){ - y2milestone("toggle record %1", record); - string startup = IscsiClient::getStartupStatus(record); + setRecord(); + if (size( IscsiClient::currentRecord )>0){ + y2milestone("toggle record %1", IscsiClient::currentRecord); + string startup = IscsiClient::getStartupStatus(); if (size(startup)>0){ if (startup == "manual"){ - y2milestone("Change status for %1 to %2", record, "automatic"); - IscsiClient::setStartupStatus(record, "automatic"); + y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "automatic"); + IscsiClient::setStartupStatus("automatic"); } else { - y2milestone("Change status for %1 to %2", record, "manual"); - IscsiClient::setStartupStatus(record, "manual"); + y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "manual"); + IscsiClient::setStartupStatus("manual"); } initConnectedTable(""); } @@ -161,13 +164,13 @@ } } // if nothing selected - disable some buttons, otherwise enable them - if( getRecord() == []){ + if( setRecord() == []){ UI::ChangeWidget (`id (`del), `Enabled, false); - UI::ChangeWidget (`id (`toggle), `Enabled, false); + UI::ChangeWidget (`id (`edit), `Enabled, false); } else { UI::ChangeWidget (`id (`del), `Enabled, true); - UI::ChangeWidget (`id (`toggle), `Enabled, true); + UI::ChangeWidget (`id (`edit), `Enabled, true); } return nil; @@ -303,40 +306,46 @@ // ***************** add table *************************** // set incoming widget status +/* void setAuthIn(boolean status){ UI::ChangeWidget(`id(`user_in),`Enabled, status ); UI::ChangeWidget(`id(`pass_in),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // set outgoing widget status +/* void setAuthOut(boolean status){ UI::ChangeWidget(`id(`user_out),`Enabled, status ); UI::ChangeWidget(`id(`pass_out),`Enabled, status ); UI::ChangeWidget(`id(`auth_out),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // disable both incoming and outgoing void initDiscAuth(string key){ - setAuthIn(false); - setAuthOut(false); +// setAuthIn(false); +// setAuthOut(false); } void initConnAuth(string key){ - setAuthIn(false); - setAuthOut(false); - map<string, any> auth = IscsiClient::getNode(curr_rec); +// setAuthIn(false); +// setAuthOut(false); + map<string, any> auth = IscsiClient::getNode(); if (size(auth)>0) { UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); - if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); +// if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); - if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); +// if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } + string startup=IscsiClient::getStartupStatus(); + if(size(startup)>0) UI::ChangeWidget(`id("startup"), `Value, startup); } // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ @@ -345,16 +354,16 @@ switch((symbol)event["ID"]:nil){ case(`auth_none): status = (boolean)UI::QueryWidget(`id(`auth_none), `Value); - setAuthIn(!status); - setAuthOut(!status); +// setAuthIn(!status); +// setAuthOut(!status); break; case(`auth_in): status = (boolean)UI::QueryWidget(`id(`auth_in), `Value); - setAuthIn(status); +// setAuthIn(status); break; case(`auth_out): status = (boolean)UI::QueryWidget(`id(`auth_out), `Value); - setAuthOut(status); +// setAuthOut(status); break; } } @@ -398,12 +407,12 @@ IscsiClient::getConfig(); boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); + boolean auth_in = (!auth_none && size(user_in)>0 && size(pass_in)>0); + boolean auth_out = (!auth_none && size(user_out)>0 && size(pass_out)>0); if (auth_none){ user_in = ""; @@ -429,8 +438,8 @@ list<string>trg_list = runInBg( command ); IscsiClient::targets = []; foreach(string row, trg_list, { - list<string> tmp_list=splitstring(row, " "); - if (issubstring(tmp_list[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[0]:"", tmp_list[1]:"")); + IscsiClient::currentRecord=splitstring(row, " "); + if (issubstring(IscsiClient::currentRecord[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"")); }); while(!bg_finish){}; // restore old config @@ -448,7 +457,8 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - if ((params==[])||(IscsiClient::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){ + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""]; + if ((params==[])||(IscsiClient::connected( true ))){ UI::ChangeWidget (`id (`connect), `Enabled, false); UI::ChangeWidget (`id (`delete), `Enabled, false); } else{ @@ -462,10 +472,10 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::getDiscovered(), { - list<string> row_in_string = splitstring(s, " "); + IscsiClient::currentRecord = splitstring(s, " "); // string record = deletechars(row_in_string[0]:"", "[]"); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClient::connected( row_in_string, true ))?_("True"):_("False") )); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", + (IscsiClient::connected( true ))?_("True"):_("False") )); row = row + 1; }); @@ -480,13 +490,12 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; - params = curr_rec; + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; if ( event["EventReason"]:"" == "Activated" ){ // connect new target if ( event["ID"]:nil == `connect) { // check if not already connected - if ( IscsiClient::connected( curr_rec , false) == true){ + if ( IscsiClient::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -499,8 +508,8 @@ } // delete connected item if ( event["ID"]:nil == `delete) { - if ((params == [])||(!IscsiClient::connected( curr_rec, true ))){ - SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""), $[] ); + if ((params == [])||(!IscsiClient::connected( true ))){ + SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", IscsiClient::currentRecord[1]:"", IscsiClient::currentRecord[0]:""), $[] ); IscsiClient::readSessions(); initDiscoveredTable(""); if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); } @@ -519,9 +528,9 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClient::targets, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClient::connected( row_in_string, true ))?_("True"):_("False") )); + IscsiClient::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", + (IscsiClient::connected( true ))?_("True"):_("False") )); row = row + 1; }); UI::ChangeWidget (`id (`targets), `Items, items); @@ -540,12 +549,13 @@ if ( event["ID"]:nil == `connect) { // check if is not already connected list <string> params = splitstring( IscsiClient::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); - if ( IscsiClient::connected( params, true ) == true){ + IscsiClient::currentRecord = params; + if ( IscsiClient::connected( true ) == true){ Popup::Error(_("The target is already connected.")); } else { - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; + IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected - if ( IscsiClient::connected( curr_rec , false) == true){ + if ( IscsiClient::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -562,31 +572,23 @@ // login to target with authentication boolean validateConnAuth(string key, map event){ boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); - string user_in = ""; - string pass_in = ""; - string user_out = ""; - string pass_out = ""; - if (auth_in){ - user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); - pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); - } - if (auth_out){ - user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); - pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); - } + string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); + string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); + string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); + string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); map<string, any> target=$[ - "target" : curr_rec[1]:"", - "portal" : curr_rec[0]:"", + "target" : IscsiClient::currentRecord[1]:"", + "portal" : IscsiClient::currentRecord[0]:"", "authmethod" : (auth_none)?"None":"CHAP", "username" : user_out, "password" : pass_out, "username_in" : user_in, "password_in" : pass_in ]; - if (checkAuthEntry() && IscsiClient::loginIntoTarget(target)) { + if (IscsiClient::connected(false) || IscsiClient::loginIntoTarget(target)) { +// IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; + IscsiClient::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClient::readSessions(); return true; } Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp Tue Apr 21 16:00:20 2009 @@ -31,6 +31,7 @@ "targets" : ``( TargetsDialog() ), "conn_auth" : ``( ConnAuthDialog("client") ), "conn_disc" : ``( ConnAuthDialog("discovered") ), + "edit_conn" : ``( ConnAuthDialog("client") ), "disc" : ``( DiscAuthDialog("discovered") ), ]; @@ -41,6 +42,7 @@ `abort : `abort, `next : `next, `add : "disc_auth", + `edit : "edit_conn", `conn : "conn_disc", `disc : "disc" ], @@ -64,6 +66,10 @@ `abort : `abort, `next : "targets" ], + "edit_conn" : $[ + `abort : `abort, + `next : "global" + ], "disc" : $[ `abort : `abort, `back : `back, -- 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] r56889 - /trunk/iscsi-client/src/widgets.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 15:42:29 2009 New Revision: 56889 URL: http://svn.opensuse.org/viewcvs/yast?rev=56889&view=rev Log: enhanced previous patch: initial target startup status Modified: trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Tue Apr 21 15:42:29 2009 @@ -347,6 +347,8 @@ UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); // if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } + string startup=IscsiClientLib::getStartupStatus(); + if(size(startup)>0) UI::ChangeWidget(`id("startup"), `Value, startup); } // handle for enable/disable widgets in authentication dialog symbol handleDiscAuth(string key, map event){ -- 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] r56888 - in /trunk/packager: package/yast2-packager.changes src/modules/SlideShowCallbacks.ycp
by lslezak＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: lslezak Date: Tue Apr 21 15:37:14 2009 New Revision: 56888 URL: http://svn.opensuse.org/viewcvs/yast?rev=56888&view=rev Log: - Append additional RPM output to the installation log only if it is not empty (bnc#495047) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShowCallbacks.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 21 15:37:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 15:34:48 CEST 2009 - lslezak(a)suse.cz + +- Append additional RPM output to the installation log only if it + is not empty (bnc#495047) + +------------------------------------------------------------------- Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz - Using new function GetCachedFileFromSource from AddOnProduct Modified: trunk/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShowCa… ============================================================================== --- trunk/packager/src/modules/SlideShowCallbacks.ycp (original) +++ trunk/packager/src/modules/SlideShowCallbacks.ycp Tue Apr 21 15:37:14 2009 @@ -423,7 +423,11 @@ else { // put additional rpm output to the installation log - SlideShow::AppendMessageToInstLog(reason); + if (reason != nil && size(reason) > 0) + { + y2milestone("Additional RPM output: %1", reason); + SlideShow::AppendMessageToInstLog(reason); + } } if (size (ret) == 0 || tolower (substring (ret, 0, 1)) != "r") -- 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] r56887 - /tags/branch-Code-11-2_17_59/bootloader/
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 15:36:04 2009 New Revision: 56887 URL: http://svn.opensuse.org/viewcvs/yast?rev=56887&view=rev Log: Created tag branch-Code-11-2_17_59 for bootloader Added: tags/branch-Code-11-2_17_59/bootloader/ - copied from r56886, branches/SuSE-Code-11-Branch/bootloader/ -- 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] r56886 - in /branches/SuSE-Code-11-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/Bootloader.ycp
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 15:35:52 2009 New Revision: 56886 URL: http://svn.opensuse.org/viewcvs/yast?rev=56886&view=rev Log: added fix for problem with Live USB stick installation from SUSEStudio bnc#449785 Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-Branch/bootloader/VERSION Tue Apr 21 15:35:52 2009 @@ -1 +1 @@ -2.17.58 +2.17.59 Modified: branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes Tue Apr 21 15:35:52 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:52:59 CEST 2009 - juhliarik(a)suse.cz + +- added fix for problem with creating USB Live installation in + SUSEStudio +- 2.17.59 + +------------------------------------------------------------------- Thu Feb 12 14:57:16 CET 2009 - juhliarik(a)suse.de - added fix for problem with missing error message about using boot Modified: branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/modules/Bootloader.ycp Tue Apr 21 15:35:52 2009 @@ -622,11 +622,12 @@ y2milestone ("Writing bootloader configuration during installation"); boolean ret = true; - // read current settings... - ret = blRead (true, false); - if (! Mode::live_installation()) { + // bnc#449785 - Installing of GRUB fails when using live installer from a USB stick + // read current settings... + ret = blRead (true, false); + // delete duplicated sections DelDuplicatedSections(); } else { -- 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] r56885 - in /trunk/bootloader: ./ src/clients/ src/zipl/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 15:06:11 2009 New Revision: 56885 URL: http://svn.opensuse.org/viewcvs/yast?rev=56885&view=rev Log: update svn ignore Modified: trunk/bootloader/ (props changed) trunk/bootloader/src/clients/ (props changed) trunk/bootloader/src/zipl/ (props changed) -- 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] r56884 - in /trunk/repair: ./ doc/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 15:04:09 2009 New Revision: 56884 URL: http://svn.opensuse.org/viewcvs/yast?rev=56884&view=rev Log: properly edit svn ignore Modified: trunk/repair/ (props changed) trunk/repair/doc/ (props changed) -- 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] r56883 - in /trunk/repair: ./ data/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by jreidinger＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: jreidinger Date: Tue Apr 21 14:59:54 2009 New Revision: 56883 URL: http://svn.opensuse.org/viewcvs/yast?rev=56883&view=rev Log: fix changes, remove cvsignore Removed: trunk/repair/.cvsignore trunk/repair/data/.cvsignore trunk/repair/doc/.cvsignore trunk/repair/doc/autodocs/.cvsignore trunk/repair/package/.cvsignore trunk/repair/src/.cvsignore trunk/repair/testsuite/.cvsignore trunk/repair/testsuite/tests/.cvsignore Modified: trunk/repair/package/yast2-repair.changes Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Tue Apr 21 14:59:54 2009 @@ -4,6 +4,7 @@ - update minimal version for bootloaders - correctly mount root if selected only bootloader check (bnc #408733) +- correct run direct mount from DVD menu (bnc #450944) - 2.18.1 ------------------------------------------------------------------- -- 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] r56882 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:54:31 2009 New Revision: 56882 URL: http://svn.opensuse.org/viewcvs/yast?rev=56882&view=rev Log: - cleanup Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:54:31 2009 @@ -39,7 +39,7 @@ list<list> ModToInitrdLx = []; list<list> ModToInitrd = []; - list controllers = []; // set by "Probe" + list<map> controllers = []; // set by "Probe" /** @@ -48,7 +48,7 @@ * * @returns integer number of controllers, 0 = none found */ -global define integer Probe () +global integer Probe() { y2milestone( "StorageControllers::Probe()" ); @@ -68,7 +68,7 @@ // return true if all necessary modules were actually loaded // return false if loading failed or was not necessary at all -define boolean startController (map controller) +boolean StartController(map controller) { // check module information // skip controller if no module info available @@ -200,14 +200,14 @@ HwStatus::Set (unique_key, one_module_failed?`no:`yes); - return (!one_module_failed); + return !one_module_failed; } // local function to go through list of resources (list of maps) // checking if '"active":true' is set. -define boolean anyActive (list<map> resources) +boolean AnyActive(list<map> resources) { boolean active = size(resources)==0; @@ -224,7 +224,7 @@ * Start storage related USB and FireWire stuff * */ -global define void StartHotplugStorage () +global void StartHotplugStorage() { import "Hotplug"; @@ -249,8 +249,6 @@ // load sbp2 ModuleLoading::Load ("sbp2", "", "", "SBP2 Protocol", Linuxrc::manual (), true); } - - return; } /** @@ -261,7 +259,7 @@ // O: list of [ loaded modules, module argument ] */ -global define void Initialize() +global void Initialize() { moduleNames = []; moduleArgs = []; @@ -298,8 +296,8 @@ // the controller is disabled in BIOS // this is done by checking for an active IO or memory resource - if( !(anyActive (controller["resource", "io"]:[]) - || anyActive (controller["resource", "mem"]:[]))) + if( !(AnyActive (controller["resource", "io"]:[]) + || AnyActive (controller["resource", "mem"]:[]))) { y2milestone( "Initialize controller %1 disabled in BIOS", controller["device"]:"" ); @@ -309,7 +307,7 @@ } } - module_loaded = startController(controller) || module_loaded; + module_loaded = StartController(controller) || module_loaded; } // while (controller) y2milestone( "Initialize module_loaded %1", module_loaded ); @@ -363,16 +361,13 @@ StartHotplugStorage(); - y2milestone("Initialize all controllers initialized module_loaded:%1", - module_loaded ); + y2milestone("Initialize all controllers initialized module_loaded:%1", module_loaded); + StorageDevices::InitDone(); if( module_loaded ) Storage::ReReadTargetMap(); y2milestone( "Initialize calling EnablePopup()" ); StorageClients::EnablePopup(); - - return; - -}; // Initialize () +}; } -- 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] r56881 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:45:34 2009 New Revision: 56881 URL: http://svn.opensuse.org/viewcvs/yast?rev=56881&view=rev Log: - removed use of ModulesConf module (might break support for parport zip drives) (see bnc #485992) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageControllers.ycp 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 Apr 21 14:45:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 21 14:43:05 CEST 2009 - aschnell(a)suse.de + +- removed use of ModulesConf module (might break support for + parport zip drives) (see bnc #485992) + +------------------------------------------------------------------- Mon Apr 20 12:31:55 CEST 2009 - aschnell(a)suse.de - fixed generation of disk_* files (bnc #492452) Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:45:34 2009 @@ -15,8 +15,6 @@ module "StorageControllers"; import "Arch"; - import "Mode"; - import "ModulesConf"; import "ModuleLoading"; import "HwStatus"; import "Initrd"; @@ -43,20 +41,6 @@ list controllers = []; // set by "Probe" - // remember postinstall modules (like imm and ppa) - // which must be installed *last* - - list postinstall_names = [ "imm", "ppa" ]; - - // postinstall modules information - // list of [ boolean modprobe, - // string module_name, - // string module_arg, - // string vendor, - // string device] - - list<list> postinstall_info = []; - /** * Probe storage controllers @@ -80,63 +64,6 @@ } - -// -------------------------------------------------------------- - -// parportInitialize - -define void parportInitialize () - ``{ - // post-load parport module - if ((size (postinstall_info) == 0) || Mode::test ()) - { - return; - } - - boolean parport_loaded = false; - boolean parport_pc_loaded = false; - - foreach (list postlist, postinstall_info, - ``{ - boolean post_modprobe = postlist[0]:false; - string post_name = postlist[1]:""; - string post_arg = postlist[2]:""; - string post_vendor = postlist[3]:""; - string post_device = postlist[4]:""; - if (!parport_loaded) - { - if( `ok == ModuleLoading::Load( "parport", "", post_vendor, - post_device, Linuxrc::manual (), true )) - { - ModulesConf::ModuleArgs ("parport", ""); - parport_loaded = true; - } - } - if( !parport_pc_loaded) - { - if( `ok == ModuleLoading::Load( "parport_pc", "", post_vendor, - post_device, Linuxrc::manual (), true )) - { - ModulesConf::ModuleArgs ("parport_pc", ""); - parport_pc_loaded = true; - } - } - - if( `ok == ModuleLoading::Load( post_name, post_arg, post_vendor, - post_device, Linuxrc::manual (), post_modprobe)) - { - ModulesConf::ModuleArgs (post_name, post_arg); - Kernel::AddModuleToLoad(post_name); - - moduleNames = add( moduleNames, post_name ); - moduleArgs = add( moduleArgs, post_arg ); - y2milestone( "moduleNames %1", moduleNames ); - y2milestone( "moduleArgs %1", moduleArgs ); - } - }); - return; - } - // start a controller (by loading its module) // return true if all necessary modules were actually loaded // return false if loading failed or was not necessary at all @@ -205,23 +132,6 @@ string module_name = module_entry[0]:""; string module_args = module_entry[1]:""; - // remember postinstall modules - - if( contains( postinstall_names, module_name) ) - { - y2milestone("startController name: %1 args: %2", module_name, module_args); - - list vendor_device = - ModuleLoading::prepareVendorDeviceInfo(controller); - - // save data for parportInitialize - postinstall_info = - add( postinstall_info, - [module_modprobe, module_name, module_args, - vendor_device[0]:"", vendor_device[1]:""]); - } - else - { // load module if not yet loaded if( !contains (moduleNames, module_name) ) { @@ -267,7 +177,6 @@ y2milestone( "startController ModToInitrdLx %1", ModToInitrdLx ); } } // not yet loaded - } // not postinstall // break out of module load loop if one module failed @@ -445,10 +354,6 @@ Initrd::AddModule( s[0]:"", s[1]:"" ); }); - y2milestone( "Initialize postinstall_info %1", postinstall_info ); - - parportInitialize (); - // load all raid personalities SCR::Execute(.target.modprobe, "raid0", "" ); SCR::Execute(.target.modprobe, "raid1", "" ); -- 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] r56880 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 14:40:35 2009 New Revision: 56880 URL: http://svn.opensuse.org/viewcvs/yast?rev=56880&view=rev Log: - removed unused s390 dasd code Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 14:40:35 2009 @@ -41,8 +41,6 @@ list<list> ModToInitrdLx = []; list<list> ModToInitrd = []; - global string dasdParam = ""; - list controllers = []; // set by "Probe" // remember postinstall modules (like imm and ppa) @@ -59,143 +57,6 @@ list<list> postinstall_info = []; - // -------------------------------------------------------------- - - -define list GetDasdList() - ``{ - list ret = []; - list<map> dasd = (list<map>) SCR::Read(.proc.dasddev); - y2milestone( "dasd=%1", dasd ); - foreach( map entry, dasd, - ``{ - term a = `item( `id(entry["name"]:"") ); - a = add( a, entry["name"]:"" ); - a = add( a, entry["address"]:"" ); - a = add( a, entry["state"]:"" ); - ret = add( ret, a ); - }); - return( ret ); - } - -define string S390DasdParams() - ``{ - SCR::UnmountAgent (.proc.modules); - map mod = (map)SCR::Read(.proc.modules); - boolean mod_loaded = haskey(mod, "dasd_mod"); - y2milestone( "mod %1", mod ); - string param = (string)SCR::Read(.etc.install_inf.DASD_Parameter); - if( param==nil ) - { - param = ""; - } - y2milestone( "param %1 size:%2", param, size(param) ); - boolean do_load = !mod_loaded || size(param)==0; - if( do_load ) - { - string okb = Label::AcceptButton(); - // button text - string loadb = _("&Load Module"); - // popup text - string text = sformat( -_("Here, enter the parameters with which to load -the dasd module, such as dasd=FD00-FD0F,FD40. -Press \"%1\" to load the -module. -If the table shows the correct DASDs available, -press \"%2\". -"), deletechars(loadb,"&"), deletechars(okb,"&") ); - - list cont = GetDasdList(); - UI::OpenDialog( - `opt(`decorated), - `HBox( - `HSpacing(1), - `VBox( - `VSpacing(0.5), - // heading text - `Left(`Heading(_("DASD Module Parameter Setting"))), - `VSpacing(0.2), - `Left(`Label(text)), - `VSpacing(0.2), - `HBox( - // label text - `Left(`TextEntry(`id(`param), _("&DASD Parameter"), - param )), - `VSpacing(1), - `Bottom(`PushButton(`id(`load), loadb )) - ), - `VSpacing(1), - `HBox( - `Table( `id(`dd_table), - // heading text - `header( _("DASD Name"), - // heading text - _("DASD Address"), - // heading text - _("Status") ), - cont ), - `VSpacing(10) - ), - `VSpacing(1), - `HBox( - `HStretch(), - `PushButton(`id(`abort), Label::AbortButton() ), - `HStretch(), - `PushButton(`id(`accept), Label::AcceptButton() ), - `HStretch() - ), - `VSpacing(0.5) - ), - `HSpacing(1) - )); - UI::SetFocus(`id(`param)); - symbol ret = `none; - do - { - ret = (symbol)UI::UserInput(); - y2milestone( "ret = %1", ret ); - if( ret == `load ) - { - if( mod_loaded ) - { - SCR::Execute( .target.bash, - "/sbin/rmmod dasd_eckd_mod dasd_fba_mod dasd_mod" ); - } - param = (string)UI::QueryWidget( `id(`param), `Value ); - y2milestone( "param %1", param ); - boolean ret = (boolean)SCR::Execute(.target.modprobe, "dasd_mod", param ); - mod_loaded = true; - y2milestone( "ret=%1", ret ); - if( !ret ) - { - // popup text - Popup::Error( sformat(_("Error loading module dasd with -parameter: %1"), param )); - } - SCR::Execute(.target.modprobe, "dasd_eckd_mod", "" ); - SCR::Execute(.target.modprobe, "dasd_fba_mod", "" ); - cont = GetDasdList(); - UI::ChangeWidget( `id(`dd_table), `Items, cont ); - } - else if( ret == `accept && size(cont)==0 ) - { - ret = `continue; - } - if( (ret == `accept||ret == `abort) && size(cont)==0 ) - { - // popup text - Popup::Error( _("There are no DASD devices active. -It is not possible to install without -active DASD devices.")); - } - } - while( ret != `accept && ret != `abort ); - UI::CloseDialog(); - } - y2milestone( "ret %1", param ); - return( param ); - } /** * Probe storage controllers -- 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] r56879 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: locilka Date: Tue Apr 21 14:10:30 2009 New Revision: 56879 URL: http://svn.opensuse.org/viewcvs/yast?rev=56879&view=rev Log: - Using new function GetCachedFileFromSource from AddOnProduct to avoid from a 'jukebox' issues when more different physical media used during installation (bnc #486785). Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Tue Apr 21 14:10:30 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz + +- Using new function GetCachedFileFromSource from AddOnProduct + to avoid from a 'jukebox' issues when more different physical + media used during installation (bnc #486785). + +------------------------------------------------------------------- Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz - Not checking signatures for add_on_products(.xml) file(s), the Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/AddOnProduct.ycp Tue Apr 21 14:10:30 2009 @@ -100,6 +100,91 @@ // if true, both are skipped at once without asking global boolean skip_add_ons = false; +/** + * @struct $["src_id|media|filename" : "/path/to/the/file"] + */ +map <string, string> source_file_cache = $[]; + +string filecachedir = sformat ("%1/AddOns_CacheDir/", Directory::tmpdir); + +integer filecachecounter = -1; + +/** + * Downloads a requested file, caches it and returns path to that cached file. + * If a file is alerady cached, just returns the path to a cached file. + * Parameter 'sod' defines whether a file is 'signed' (file + file.asc) or 'digested' + * (file digest mentioned in signed content file). + * + * @param integer src_id + * @param integer media + * @param string filename + * @param string sod ("signed" or "digested") + * @param boolean optional (false if mandatory) + * @return string path to a cached file + * + * @example: + * // content file is usually signed with content.asc + * AddOnProduct::GetCachedFileFromSource (8, 1, "/content", "signed", false); + * // the other files are usually digested in content file + * AddOnProduct::GetCachedFileFromSource (8, 1, "/images/images.xml", "digested", true); + */ +global string GetCachedFileFromSource (integer src_id, integer media, string filename, string sod, boolean optional) { + // BNC #486785: Jukebox when using more physical media-based Add-Ons at once + string file_ID = sformat ("%1|%2|%3", src_id, media, filename); + + string provided_file = source_file_cache[file_ID]:""; + + if (provided_file != nil && provided_file != "") { + // Checking whether the cached file exists + if (FileUtils::Exists (provided_file)) { + y2milestone ("File %1 found in cache: %2", file_ID, provided_file); + + return provided_file; + } else { + y2warning ("Cached file %1 not accessible!", provided_file); + source_file_cache = remove (source_file_cache, file_ID); + } + } + + if (optional == nil) optional = true; + + if (sod == "signed") { + provided_file = Pkg::SourceProvideSignedFile (src_id, media, filename, optional); + } else if (sod == "digested") { + provided_file = Pkg::SourceProvideDigestedFile (src_id, media, filename, optional); + } else { + y2error ("Unknown SoD: %1. It can be only 'signed' or 'digested'", sod); + provided_file = nil; + } + + // A file has been found, caching... + if (provided_file != nil) { + filecachecounter = filecachecounter + 1; + + // Where the file is finally cached + string cached_file = sformat ("%1%2", filecachedir, filecachecounter); + + string cmd = sformat ( + "/bin/mkdir -p '%1'; /bin/cp '%2' '%3'", + String::Quote (filecachedir), String::Quote (provided_file), String::Quote (cached_file) + ); + map cmd_run = (map) SCR::Execute (.target.bash_output, cmd); + + // Unable to cache a file, the original file will be returned + if (cmd_run["exit"]:-1 != 0) { + y2warning ("Error caching file: %1: %2", cmd, cmd_run); + } else { + y2milestone ("File %1 cached as %2", file_ID, cached_file); + // Writes entry into cache database + source_file_cache[file_ID] = cached_file; + // Path to a cached file will be returned + provided_file = cached_file; + } + } + + return provided_file; +} + // Which part installation.xml will be used string _inst_mode = "installation"; @@ -420,7 +505,7 @@ } boolean IntegrateY2Update (integer src_id) { - string binaries = Pkg::SourceProvideDigestedFile (src_id, 1, "/y2update.tgz", true /* optional */); + string binaries = GetCachedFileFromSource (src_id, 1, "/y2update.tgz", "digested", true /* optional */); // File /y2update.tgz exists if (binaries != nil) { @@ -603,7 +688,7 @@ y2milestone ("Using cached contentfile %1", contentfile); } else { y2milestone ("Checking contentfile from repository"); - string sourcefile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true); + string sourcefile = GetCachedFileFromSource (src_id, 1, "/content", "signed", true); if (sourcefile == nil) { y2warning ("Cannot obtain content file!"); return nil; @@ -692,7 +777,7 @@ symbol ret = nil; - string control = Pkg::SourceProvideDigestedFile (src_id, 1, "/installation.xml", true /* optional */); + string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); if (control != nil) { y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); @@ -841,7 +926,7 @@ */ void HandleProductPATTERNS (integer srcid) { // FATE #302398: PATTERNS keyword in content file - string content_file = Pkg::SourceProvideSignedFile (srcid, 1, "/content", true); + string content_file = GetCachedFileFromSource (srcid, 1, "/content", "signed", true); if (content_file == nil) { y2warning ("Add-On %1 doesn't have a content file", srcid); @@ -860,7 +945,7 @@ y2milestone ("Integrating repository %1", srcid); // Updating inst-sys - string y2update = Pkg::SourceProvideDigestedFile (srcid, 1, "/y2update.tgz", true /* optional */); + string y2update = GetCachedFileFromSource (srcid, 1, "/y2update.tgz", "digested", true /* optional */); if (y2update == nil) { y2milestone ("No YaST update found on the media"); -- 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] r56878 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: locilka Date: Tue Apr 21 14:10:17 2009 New Revision: 56878 URL: http://svn.opensuse.org/viewcvs/yast?rev=56878&view=rev Log: - Using new function GetCachedFileFromSource from AddOnProduct to avoid from a 'jukebox' issues when more different physical media used during installation (bnc #486785). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Apr 21 14:10:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 14:05:09 CEST 2009 - locilka(a)suse.cz + +- Using new function GetCachedFileFromSource from AddOnProduct + to avoid from a 'jukebox' issues when more different physical + media used during installation (bnc #486785). + +------------------------------------------------------------------- Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz - Not checking signatures for add_on_products(.xml) file(s), the Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Tue Apr 21 14:10:17 2009 @@ -100,6 +100,91 @@ // if true, both are skipped at once without asking global boolean skip_add_ons = false; +/** + * @struct $["src_id|media|filename" : "/path/to/the/file"] + */ +map <string, string> source_file_cache = $[]; + +string filecachedir = sformat ("%1/AddOns_CacheDir/", Directory::tmpdir); + +integer filecachecounter = -1; + +/** + * Downloads a requested file, caches it and returns path to that cached file. + * If a file is alerady cached, just returns the path to a cached file. + * Parameter 'sod' defines whether a file is 'signed' (file + file.asc) or 'digested' + * (file digest mentioned in signed content file). + * + * @param integer src_id + * @param integer media + * @param string filename + * @param string sod ("signed" or "digested") + * @param boolean optional (false if mandatory) + * @return string path to a cached file + * + * @example: + * // content file is usually signed with content.asc + * AddOnProduct::GetCachedFileFromSource (8, 1, "/content", "signed", false); + * // the other files are usually digested in content file + * AddOnProduct::GetCachedFileFromSource (8, 1, "/images/images.xml", "digested", true); + */ +global string GetCachedFileFromSource (integer src_id, integer media, string filename, string sod, boolean optional) { + // BNC #486785: Jukebox when using more physical media-based Add-Ons at once + string file_ID = sformat ("%1|%2|%3", src_id, media, filename); + + string provided_file = source_file_cache[file_ID]:""; + + if (provided_file != nil && provided_file != "") { + // Checking whether the cached file exists + if (FileUtils::Exists (provided_file)) { + y2milestone ("File %1 found in cache: %2", file_ID, provided_file); + + return provided_file; + } else { + y2warning ("Cached file %1 not accessible!", provided_file); + source_file_cache = remove (source_file_cache, file_ID); + } + } + + if (optional == nil) optional = true; + + if (sod == "signed") { + provided_file = Pkg::SourceProvideSignedFile (src_id, media, filename, optional); + } else if (sod == "digested") { + provided_file = Pkg::SourceProvideDigestedFile (src_id, media, filename, optional); + } else { + y2error ("Unknown SoD: %1. It can be only 'signed' or 'digested'", sod); + provided_file = nil; + } + + // A file has been found, caching... + if (provided_file != nil) { + filecachecounter = filecachecounter + 1; + + // Where the file is finally cached + string cached_file = sformat ("%1%2", filecachedir, filecachecounter); + + string cmd = sformat ( + "/bin/mkdir -p '%1'; /bin/cp '%2' '%3'", + String::Quote (filecachedir), String::Quote (provided_file), String::Quote (cached_file) + ); + map cmd_run = (map) SCR::Execute (.target.bash_output, cmd); + + // Unable to cache a file, the original file will be returned + if (cmd_run["exit"]:-1 != 0) { + y2warning ("Error caching file: %1: %2", cmd, cmd_run); + } else { + y2milestone ("File %1 cached as %2", file_ID, cached_file); + // Writes entry into cache database + source_file_cache[file_ID] = cached_file; + // Path to a cached file will be returned + provided_file = cached_file; + } + } + + return provided_file; +} + // Which part installation.xml will be used string _inst_mode = "installation"; @@ -420,7 +505,7 @@ } boolean IntegrateY2Update (integer src_id) { - string binaries = Pkg::SourceProvideDigestedFile (src_id, 1, "/y2update.tgz", true /* optional */); + string binaries = GetCachedFileFromSource (src_id, 1, "/y2update.tgz", "digested", true /* optional */); // File /y2update.tgz exists if (binaries != nil) { @@ -603,7 +688,7 @@ y2milestone ("Using cached contentfile %1", contentfile); } else { y2milestone ("Checking contentfile from repository"); - string sourcefile = Pkg::SourceProvideSignedFile (src_id, 1, "/content", true); + string sourcefile = GetCachedFileFromSource (src_id, 1, "/content", "signed", true); if (sourcefile == nil) { y2warning ("Cannot obtain content file!"); return nil; @@ -692,7 +777,7 @@ symbol ret = nil; - string control = Pkg::SourceProvideDigestedFile (src_id, 1, "/installation.xml", true /* optional */); + string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); if (control != nil) { y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); @@ -841,7 +926,7 @@ */ void HandleProductPATTERNS (integer srcid) { // FATE #302398: PATTERNS keyword in content file - string content_file = Pkg::SourceProvideSignedFile (srcid, 1, "/content", true); + string content_file = GetCachedFileFromSource (srcid, 1, "/content", "signed", true); if (content_file == nil) { y2warning ("Add-On %1 doesn't have a content file", srcid); @@ -860,7 +945,7 @@ y2milestone ("Integrating repository %1", srcid); // Updating inst-sys - string y2update = Pkg::SourceProvideDigestedFile (srcid, 1, "/y2update.tgz", true /* optional */); + string y2update = GetCachedFileFromSource (srcid, 1, "/y2update.tgz", "digested", true /* optional */); if (y2update == nil) { y2milestone ("No YaST update found on the media"); -- 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] r56877 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 13:57:50 2009 New Revision: 56877 URL: http://svn.opensuse.org/viewcvs/yast?rev=56877&view=rev Log: - some cleanup Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 13:57:50 2009 @@ -43,9 +43,6 @@ global string dasdParam = ""; - // -------------------------------------------------------------- - // local values - list controllers = []; // set by "Probe" // remember postinstall modules (like imm and ppa) @@ -207,7 +204,7 @@ * @returns integer number of controllers, 0 = none found */ global define integer Probe () - ``{ +{ y2milestone( "StorageControllers::Probe()" ); // probe 'storage' list @@ -219,7 +216,7 @@ y2milestone("no controllers"); } return size (controllers); - } +} @@ -284,7 +281,7 @@ // return false if loading failed or was not necessary at all define boolean startController (map controller) - ``{ +{ // check module information // skip controller if no module info available @@ -434,14 +431,14 @@ HwStatus::Set (unique_key, one_module_failed?`no:`yes); return (!one_module_failed); - } +} // local function to go through list of resources (list of maps) // checking if '"active":true' is set. define boolean anyActive (list<map> resources) -``{ +{ boolean active = size(resources)==0; foreach (map res, resources, @@ -458,7 +455,7 @@ * */ global define void StartHotplugStorage () - ``{ +{ import "Hotplug"; // If USB capable, there might be an usb storage device (i.e. ZIP) @@ -495,12 +492,10 @@ */ global define void Initialize() - ``{ +{ moduleNames = []; moduleArgs = []; - map controller = $[]; integer cindex = 0; - list ioresources = []; boolean module_loaded = false; ModToInitrd = []; @@ -513,7 +508,7 @@ // use while(), continue not allowed in foreach() while( !Arch::s390() && cindex < size(controllers) ) { - controller = controllers[cindex]:$[]; + map controller = controllers[cindex]:$[]; y2milestone( "Initialize controller %1", controller ); if( size(controller["requires"]:[])>0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56876 - /trunk/storage/storage/src/include/ep-loop.ycp
by kmachalkova＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: kmachalkova Date: Tue Apr 21 13:42:01 2009 New Revision: 56876 URL: http://svn.opensuse.org/viewcvs/yast?rev=56876&view=rev Log: Function buttons for loops Modified: trunk/storage/storage/src/include/ep-loop.ycp Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Tue Apr 21 13:42:01 2009 @@ -12,6 +12,33 @@ include "partitioning/ep-loop-dialogs.ycp"; include "partitioning/ep-loop-lib.ycp"; + term LoopButtonBox() + { + return `HBox( + // push button text + `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), + // push button text + `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) + ); + } + + void HandleLoopButtons( string part_device, map event ) + { + switch (Event::IsWidgetActivated(event)) + { + case `add: + EpCreateLoop(); + break; + + case `edit: + EpEditLoop(part_device); + break; + + case `delete: + EpDeleteLoop(part_device); + break; + } + } void CreateLoopMainPanel(any user_data) { @@ -37,7 +64,8 @@ table_header, table_contents), `HBox( // push button text - `Left(`PushButton(`id(`add), `opt(`key_F3), _("Add Crypt File..."))), + `PushButton(`id(`add), `opt(`key_F3), _("Add Crypt File...")), + LoopButtonBox(), `HStretch() ) ) @@ -53,12 +81,10 @@ void HandleLoopMainPanel(any user_data, map event) { - switch (Event::IsWidgetActivated(event)) - { - case `add: - EpCreateLoop(); - break; - } + string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); + + HandleLoopButtons(device, event); + UI::SetFocus(`id(`table)); } @@ -80,10 +106,7 @@ `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( - // push button text - `PushButton(`id(`edit), `opt(`key_F4), _("Edit...")), - // push button text - `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")), + LoopButtonBox(), `HStretch() ) )) @@ -101,16 +124,7 @@ { string part_device = (string) user_data; - switch (Event::IsWidgetActivated(event)) - { - case `edit: - EpEditLoop(part_device); - break; - - case `delete: - EpDeleteLoop(part_device); - break; - } + HandleLoopButtons( part_device, event ); UI::SetFocus(`id(`text)); } -- 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] r56875 - /trunk/storage/storage/src/modules/StorageControllers.ycp
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 12:28:29 2009 New Revision: 56875 URL: http://svn.opensuse.org/viewcvs/yast?rev=56875&view=rev Log: - make some variables local Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 12:28:29 2009 @@ -35,9 +35,8 @@ // must be kept in order (-> no map !) // must be searchable (-> separate lists for names and args) - global list moduleNames = []; - global list moduleArgs = []; - global list moduleIDs = []; //unique_id from probing + list<string> moduleNames = []; + list<string> moduleArgs = []; list<list> ModToInitrdLx = []; list<list> ModToInitrd = []; @@ -290,7 +289,6 @@ // skip controller if no module info available list<map> module_drivers = controller["drivers"]:[]; - string module_id = controller["unique_key"]:""; if (size (module_drivers) == 0) return false; @@ -402,11 +400,9 @@ // save data for modules.conf writing moduleNames = add (moduleNames, module_name); moduleArgs = add (moduleArgs, module_args); - moduleIDs = add (moduleIDs, module_id); y2milestone( "startController moduleNames %1", moduleNames ); y2milestone( "startController moduleArgs %1", moduleArgs ); - y2milestone( "startController moduleIDs %1", moduleIDs ); ModToInitrd = add( ModToInitrd, [ module_name, module_args ] ); y2milestone( "startController ModToInitrd %1", ModToInitrd ); -- 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] r56874 - in /trunk/storage/libstorage/src: Storage.cc StorageInterface.h
by aschnell＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: aschnell Date: Tue Apr 21 11:54:24 2009 New Revision: 56874 URL: http://svn.opensuse.org/viewcvs/yast?rev=56874&view=rev Log: - check backup state name Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Apr 21 11:54:24 2009 @@ -5532,6 +5532,8 @@ int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); y2mil("name:" << name); + if (ret == 0 && name.empty()) + ret = STORAGE_INVALID_BACKUP_STATE_NAME; if( ret==0 ) { if (checkBackupState(name)) @@ -5611,14 +5613,13 @@ bool verbose_log) const { y2mil("lhs:" << lhs << " rhs:" << rhs << " verbose:" << verbose_log); - map<string,CCont>::const_iterator i; const CCont* l = NULL; const CCont* r = NULL; if( lhs.empty() ) l = &cont; else { - i = backups.find( lhs ); + map<string, CCont>::const_iterator i = backups.find(lhs); if( i!=backups.end() ) l = &i->second; } @@ -5626,7 +5627,7 @@ r = &cont; else { - i = backups.find( rhs ); + map<string, CCont>::const_iterator i = backups.find(rhs); if( i!=backups.end() ) r = &i->second; } Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Apr 21 11:54:24 2009 @@ -525,6 +525,7 @@ STORAGE_RESIZE_INVALID_CONTAINER = -2029, STORAGE_DMMULTIPATH_CO_NOT_FOUND = -2030, STORAGE_ZERO_DEVICE_FAILED = -2031, + STORAGE_INVALID_BACKUP_STATE_NAME = -2032, VOLUME_COMMIT_UNKNOWN_STAGE = -3000, VOLUME_FSTAB_EMPTY_MOUNT = -3001, -- 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] r56873 - /tags/branch-SLE-10-SP3-2_13_12/kdump/
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 09:47:05 2009 New Revision: 56873 URL: http://svn.opensuse.org/viewcvs/yast?rev=56873&view=rev Log: Created tag branch-SLE-10-SP3-2_13_12 for kdump Added: tags/branch-SLE-10-SP3-2_13_12/kdump/ - copied from r56872, branches/SuSE-SLE-10-SP3-Branch/kdump/ -- 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] r56872 - in /branches/SuSE-SLE-10-SP3-Branch/kdump: VERSION package/yast2-kdump.changes src/Kdump.ycp src/complex.ycp src/dialogs.ycp
by juhliarik＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: juhliarik Date: Tue Apr 21 09:42:54 2009 New Revision: 56872 URL: http://svn.opensuse.org/viewcvs/yast?rev=56872&view=rev Log: added fix for bug#399439 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/VERSION Tue Apr 21 09:42:54 2009 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/package/yast2-kdump.changes Tue Apr 21 09:42:54 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wri Jun 13 13:55:16 CET 2008 - juhliarik(a)suse.cz + +- added patch for installing kernel-kdumppae (bnc #399439) +- added fix for problem with selecting 'Saving Target for Kdump + Image' in ncurses 80x25 (bnc #373551) +- V 2.13.12 + +------------------------------------------------------------------- Wed Feb 6 15:09:16 CET 2008 - juhliarik(a)suse.cz - added installing kernel-kdump bug#357935 Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/Kdump.ycp Tue Apr 21 09:42:54 2009 @@ -355,7 +355,7 @@ //Popup::Message(kernel_version); - y2milestone("[kdump] (GetActualBootSection) kerne version: %1",kernel_version); + y2milestone("[kdump] (GetActualBootSection) kernel version: %1",kernel_version); //boot sections from bootloader Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/complex.ycp Tue Apr 21 09:42:54 2009 @@ -74,6 +74,7 @@ boolean kdump_available = false; boolean kernel_kdump_available = false; list <string> package_list = []; + string kernel_kdump_name = "kernel-kdump"; Wizard::RestoreHelp(HELPS["read"]:""); // Kdump::AbortFunction = PollAbort; @@ -84,8 +85,33 @@ kexec_installed = true; } + // added patch from bwalle for installing kernel-kdumppae if kernel-bigsmp is used + + // when we use the bigsmp kernel on i386, we need kernel-kdumppae + if (Arch::i386()) { + // reading version of kernel + string command = "uname -r"; + map version = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[kdump] (ReadDialog) command read kernel version: %1 output: %2",command, version); + boolean kernel_bigsmp = false; + if (version["exit"]:nil == 0) + { + if (find(version["stdout"]:"", "bigsmp") != -1) + kernel_bigsmp = true; + } else { + y2error("Reading version of kernel fault"); + kernel_bigsmp = false; + } + if (kernel_bigsmp) { + if (Package::Available("kernel-kdumppae") || Package::Installed("kernel-kdumppae")) + kernel_kdump_name = "kernel-kdumppae"; + else + y2milestone ("kernel-kdumppae not available. Falling back to kernel-kdump."); + } + } + if (!Arch::ia64()) { - if (Package::Installed("kernel-kdump")) + if (Package::Installed(kernel_kdump_name)) kernel_kdump_installed = true; else kernel_kdump_installed = false; @@ -93,10 +119,6 @@ kernel_kdump_installed = true; } - - - - string kdump =""; //only ppc64 includes package kernel-kdump @@ -132,7 +154,7 @@ } if (!kernel_kdump_installed) - kernel_kdump_available = Package::Available("kernel-kdump"); + kernel_kdump_available = Package::Available(kernel_kdump_name); if ((!kexec_installed) && (!kexec_available)) { if (!Mode::commandline()) { @@ -173,7 +195,7 @@ package_list = add(package_list, kdump); if (!kernel_kdump_installed) - package_list = add(package_list, "kernel-kdump"); + package_list = add(package_list, kernel_kdump_name); //install packages if (! PackageSystem::CheckAndInstallPackages(package_list)) { Modified: branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/kdump/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/kdump/src/dialogs.ycp Tue Apr 21 09:42:54 2009 @@ -142,7 +142,7 @@ "TargetKdump" : $[ "widget" : `custom, "custom_widget" : `VBox( - `Frame(_("Saving Target for Kdump Image"),`HBox(`HSpacing(1),`VBox( + `Frame(_("Saving Target for Kdump Image"),`HBox(`HSpacing(1),`MinHeight(2,`VBox( `RadioButtonGroup(`id("DumpTarget"), `HBox( `Left(`RadioButton(`id("local_filesystem"), `opt(`notify), "&Local Filesytem")), `Left(`RadioButton(`id("ftp"), `opt(`notify), "F&TP")), @@ -151,7 +151,7 @@ `Left(`RadioButton(`id("cifs"), `opt(`notify), "C&IFS (SMB)")) )) - ))), + )))), `VSpacing(1), `ReplacePoint(`id("Targets"), ftp) @@ -172,7 +172,7 @@ "custom_widget" : `VBox( `CheckBoxFrame(`id("enable_raw_partitions"),_("Enable Ra&w Saving in Initrd"), false, //`Frame(`id("enable_raw_partitions"),_("Enable Ra&w Saving in Initrd"), - `HBox(`HSpacing(1),`VBox( + `HBox(`HSpacing(1), `VBox( `Left(`ComboBox(`id("raw_partitions"), _("The List of A&vailable Raw Partitions of All Disks Without Known Filesystem"))) )) -- 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] r56871 - /tags/stable-2_17_13/iscsi-client/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 09:33:19 2009 New Revision: 56871 URL: http://svn.opensuse.org/viewcvs/yast?rev=56871&view=rev Log: Created tag stable-2_17_13 for SLE-11-SP1-Stash/iscsi-client Added: tags/stable-2_17_13/iscsi-client/ - copied from r56870, branches/tmp/SLE-11-SP1-Stash/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56870 - /tags/stable-2_17_13/SLE-11-SP1-Stash/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 09:33:17 2009 New Revision: 56870 URL: http://svn.opensuse.org/viewcvs/yast?rev=56870&view=rev Log: Created tag stable-2_17_13 for SLE-11-SP1-Stash/ Added: tags/stable-2_17_13/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] r56869 - in /branches/tmp/SLE-11-SP1-Stash/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/IscsiClientLib.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 09:33:10 2009 New Revision: 56869 URL: http://svn.opensuse.org/viewcvs/yast?rev=56869&view=rev Log: changed dialogs workflow to allow to edit authentication for connection (fate#305306) Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/VERSION branches/tmp/SLE-11-SP1-Stash/iscsi-client/package/yast2-iscsi-client.changes branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClient.ycp branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClientLib.ycp branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/dialogs.ycp branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/widgets.ycp branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/wizards.ycp Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/VERSION Tue Apr 21 09:33:10 2009 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 09:33:10 2009 @@ -1,6 +1,15 @@ ------------------------------------------------------------------- +Tue Apr 21 09:31:11 CEST 2009 - mzugec(a)suse.cz + +- changed dialogs workflow to allow to edit authentication for + connection (fate#305306) +- 2.17.13 + +------------------------------------------------------------------- Mon Mar 23 17:43:09 CET 2009 - mzugec(a)suse.de +- reload service when initiatorname is changed to re-read new value + (bnc#482429) - 2.17.12 ------------------------------------------------------------------- Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClient.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClient.ycp Tue Apr 21 09:33:10 2009 @@ -108,11 +108,12 @@ foreach(string sess, IscsiClientLib::sessions, { string target = splitstring(sess, " ")[1]:""; string portal = splitstring(sess, " ")[0]:""; - map<string, any> auth = IscsiClientLib::getNode([portal, target]); + IscsiClientLib::currentRecord = [portal, target]; + map<string, any> auth = IscsiClientLib::getNode(); map new_target = $["target": target, "portal" : portal, - "startup" : IscsiClientLib::getStartupStatus([portal, target]), + "startup" : IscsiClientLib::getStartupStatus(), ]; if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None"; else new_target = union(new_target, auth); Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/IscsiClientLib.ycp Tue Apr 21 09:33:10 2009 @@ -12,6 +12,7 @@ global list <string> sessions = []; global list <string> discovered = []; global list <string> targets = []; +global list<string> currentRecord = []; // status of rcopen-iscsi service boolean serviceStatus = false; @@ -80,7 +81,7 @@ // use cache if available if (size(config)==0){ config = (map<string, any>) SCR::Read(.etc.iscsid.all); - y2milestone("read config %1", config); + y2debug("read config %1", config); } return config["value"]:[]; } @@ -109,8 +110,8 @@ } -global map<string, any> getNode(list<string> rec){ - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":rec[1]:"", "IP":rec[0]:""]); +global map<string, any> getNode(){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":currentRecord[1]:"", "IP":currentRecord[0]:""]); if (cmd["exit"]:0!=0) return $[]; map<string, any> auth = $[]; foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { @@ -321,11 +322,11 @@ // delete deiscovered target from database -global boolean deleteRecord(list<string> record){ +global boolean deleteRecord(){ boolean ret = true; - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", currentRecord); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", record[1]:"", record[0]:"")); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return false; readSessions(); @@ -333,10 +334,10 @@ } // get (manual/onboot) status of target connecting -global string getStartupStatus(list<string> record){ +global string getStartupStatus(){ string status = ""; - y2milestone("Getting status of record %1", record); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", record[1]:"", record[0]:"")); + y2milestone("Getting status of record %1", currentRecord); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return ""; foreach(string row, splitstring(retcode["stdout"]:"", "\n"), { if (issubstring(row, "node.conn[0].startup")){ @@ -344,14 +345,14 @@ break; } }); - y2milestone("Startup status for %1 is %2", record, status); + y2milestone("Startup status for %1 is %2", currentRecord, status); return status; } // update authentication value -global boolean setValue(list<string> record, string name, string value){ - y2milestone("set %1 for record %2", name, record); - string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", record[1]:"", record[0]:"", name, value); +global boolean setValue(string name, string value){ + y2milestone("set %1 for record %2", name, currentRecord); + string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", currentRecord[1]:"", currentRecord[0]:"", name, value); y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); @@ -365,12 +366,12 @@ // check if given target is connected -global boolean connected(list<string> rec, boolean check_ip){ -y2internal("check connected status for %1 with IP check:%2", rec, check_ip); +global boolean connected(boolean check_ip){ +y2internal("check connected status for %1 with IP check:%2", currentRecord, check_ip); boolean ret = false; foreach(string row, sessions, { list<string> list_row = splitstring(row, " "); - if (list_row[1]:"" == rec[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(rec[0]:"", ",")[0]:"" : true)){ + if (list_row[1]:"" == currentRecord[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(currentRecord[0]:"", ",")[0]:"" : true)){ ret = true; break; } @@ -379,15 +380,16 @@ } // change startup status (manual/onboot) for target -global boolean setStartupStatus(list<string> record, string status){ - y2milestone("Set startup status for %1 to %2", record, status); +global boolean setStartupStatus(string status){ + y2milestone("Set startup status for %1 to %2", currentRecord, status); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); if (size(retcode["stderr"]:"")>0) return false; else retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); +y2internal("retcode %1", retcode); return ret; } @@ -426,37 +428,38 @@ return true; } */ + global boolean loginIntoTarget(map target){ - list<string> curr_rec = [target["portal"]:"", target["target"]:""]; + currentRecord = [target["portal"]:"", target["target"]:""]; if (target["authmethod"]:"None"!="None"){ string user_in = target["username_in"]:""; string pass_in = target["password_in"]:""; if (size(user_in)>0 && size(pass_in)>0){ - setValue(curr_rec, "node.session.auth.username_in", user_in); - setValue(curr_rec, "node.session.auth.password_in", pass_in); + setValue("node.session.auth.username_in", user_in); + setValue("node.session.auth.password_in", pass_in); } else{ - setValue(curr_rec, "node.session.auth.username_in", ""); - setValue(curr_rec, "node.session.auth.password_in", ""); + setValue("node.session.auth.username_in", ""); + setValue("node.session.auth.password_in", ""); } string user_out = target["username"]:""; string pass_out = target["password"]:""; if (size(user_out)>0 && size(pass_out)>0){ - setValue(curr_rec, "node.session.auth.username", user_out); - setValue(curr_rec, "node.session.auth.password", pass_out); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", user_out); + setValue("node.session.auth.password", pass_out); + setValue("node.session.auth.authmethod", "CHAP"); } else { - setValue(curr_rec, "node.session.auth.username", ""); - setValue(curr_rec, "node.session.auth.password", ""); - setValue(curr_rec, "node.session.auth.authmethod", ""); + setValue("node.session.auth.username", ""); + setValue("node.session.auth.password", ""); + setValue("node.session.auth.authmethod", ""); } - } else setValue(curr_rec, "node.session.auth.authmethod", "None"); + } else setValue("node.session.auth.authmethod", "None"); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:"")); y2internal("output %1", output); // if (output["exit"]:-1==0){ // set startup status to auto by default (bnc#400610) - if (!Mode::autoinst()) setStartupStatus(curr_rec, "onboot"); + if (!Mode::autoinst()) setStartupStatus("onboot"); return true; /* } else { @@ -524,7 +527,8 @@ foreach(map target, ay_settings["targets"]:[], { y2internal("login into target %1", target); loginIntoTarget(target); - setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual"); + currentRecord = [target["portal"]:"", target["target"]:""]; + setStartupStatus(target["startup"]:"manual"); }); return true; } Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/dialogs.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/dialogs.ycp Tue Apr 21 09:33:10 2009 @@ -80,8 +80,9 @@ ), `Left(`HBox( `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Log Out")), - `PushButton(`id(`toggle), _("Toggle Start-Up")) + `PushButton(`id(`edit), _("Edit")), + `PushButton(`id(`del), _("Log Out")) +// `PushButton(`id(`toggle), _("Toggle Start-Up")) )) ), "init" : initConnectedTable, @@ -133,22 +134,24 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none), `opt(`invertAutoEnable), _("No Authentication"), true , + `VBox( + `Left(`Label(_("Incoming Authentication"))), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication"))), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initDiscAuth, - "handle" : handleDiscAuth, - "validate_type" : `function, - "validate_function" : validateDiscAuth, +// "handle" : handleDiscAuth, +// "validate_type" : `function, +// "validate_function" : validateDiscAuth, "help" : HELPS["conn_auth"]:"" ], @@ -157,25 +160,37 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none),`opt(`invertAutoEnable), _("No Authentication"), true, + `VBox( + `Left( `Label(_("Incoming Authentication")) ), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication")) ), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initConnAuth, - "handle" : handleDiscAuth, +// "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, "help" : HELPS["conn_auth"]:"" ], + "startup" : $[ + "widget" : `combobox, + "opt" : [`hstretch, `notify], + "label" : _("Startup"), + "items" : [ + ["manual", "manual"], + ["onboot", "onboot"], + ["automatic", "automatic"] + ] + ], // widget for portal address "server_location" : $[ "widget" : `custom, @@ -361,7 +376,7 @@ any ConnAuthDialog(string return_to){ current_tab = return_to; string caption = _("iSCSI Initiator Discovery"); - list<map <string, any> > w = CWM::CreateWidgets (["conn_auth"], (map <string, map <string, any> >)widgets); + list<map <string, any> > w = CWM::CreateWidgets (["startup", "conn_auth"], (map <string, map <string, any> >)widgets); term contents = `VBox( `VStretch(), @@ -370,6 +385,7 @@ `HSpacing (1), `VBox( w[0, "widget"]:`VSpacing (1), + w[1, "widget"]:`VSpacing (1), `VSpacing (2) ), `HSpacing (1), Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/widgets.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/widgets.ycp Tue Apr 21 09:33:10 2009 @@ -96,8 +96,8 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::sessions, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClientLib::getStartupStatus(row_in_string))); + IscsiClientLib::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", IscsiClientLib::getStartupStatus())); row = row + 1; }); UI::ChangeWidget (`id (`connected), `Items, items); @@ -106,17 +106,17 @@ } // get record identificator from selected row -list<string> getRecord(){ - list<string> record = []; +list<string> setRecord(){ + IscsiClientLib::currentRecord = []; any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem); if (sel_item != nil){ integer current = tointeger(sel_item); - record = splitstring(IscsiClientLib::sessions[current]:"", " " ); + IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[current]:"", " " ); // record = deletechars(record, "[]"); } else if (size(IscsiClientLib::sessions)>0) - record = splitstring(IscsiClientLib::sessions[0]:"", " " ); - return record; + IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[0]:"", " " ); + return IscsiClientLib::currentRecord; } // handle for table of connected sessions @@ -131,23 +131,27 @@ return `add; case(`del): // delete (logout from) connected target - record = getRecord(); + record = setRecord(); if (size( record )>0){ if (Popup::ContinueCancel(_("Really log out from the selected target?"))) - if ( !(IscsiClientLib::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target.")); + if ( !(IscsiClientLib::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target.")); else { y2milestone("Delete record %1", record); initConnectedTable(""); } } else Popup::Error(_("No record found.")); break; + case(`edit): + record = setRecord(); + return `edit; + break; case(`toggle): // change manual/onboot status of connected target // don't use automatic anymore (replaced by onboot) (bnc#449108) - record = getRecord(); + record = setRecord(); if (size( record )>0){ y2milestone("toggle record %1", record); - string startup = IscsiClientLib::getStartupStatus(record); + string startup = IscsiClientLib::getStartupStatus(); if (size(startup)>0){ // toggle all 3 possible values (bnc#457252) list <string> options = ["manual", "onboot", "automatic"]; @@ -156,7 +160,7 @@ if (startup==option){ startup=options[(size(options)>pos+1) ? pos+1 : 0]:""; y2milestone("Changing state from %1 to %2", option, startup ); - IscsiClientLib::setStartupStatus(record, startup); + IscsiClientLib::setStartupStatus(startup); break; } pos=pos+1; @@ -168,13 +172,13 @@ } } // if nothing selected - disable some buttons, otherwise enable them - if( getRecord() == []){ + if( setRecord() == []){ UI::ChangeWidget (`id (`del), `Enabled, false); - UI::ChangeWidget (`id (`toggle), `Enabled, false); + UI::ChangeWidget (`id (`edit), `Enabled, false); } else { UI::ChangeWidget (`id (`del), `Enabled, true); - UI::ChangeWidget (`id (`toggle), `Enabled, true); + UI::ChangeWidget (`id (`edit), `Enabled, true); } return nil; @@ -305,39 +309,43 @@ // ***************** add table *************************** // set incoming widget status +/* void setAuthIn(boolean status){ UI::ChangeWidget(`id(`user_in),`Enabled, status ); UI::ChangeWidget(`id(`pass_in),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // set outgoing widget status +/* void setAuthOut(boolean status){ UI::ChangeWidget(`id(`user_out),`Enabled, status ); UI::ChangeWidget(`id(`pass_out),`Enabled, status ); UI::ChangeWidget(`id(`auth_out),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // disable both incoming and outgoing void initDiscAuth(string key){ - setAuthIn(false); - setAuthOut(false); +// setAuthIn(false); +// setAuthOut(false); } void initConnAuth(string key){ - setAuthIn(false); - setAuthOut(false); - map<string, any> auth = IscsiClientLib::getNode(curr_rec); +// setAuthIn(false); +// setAuthOut(false); + map<string, any> auth = IscsiClientLib::getNode(); if (size(auth)>0) { UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); - if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); +// if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); - if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); +// if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } } // handle for enable/disable widgets in authentication dialog @@ -347,16 +355,16 @@ switch((symbol)event["ID"]:nil){ case(`auth_none): status = (boolean)UI::QueryWidget(`id(`auth_none), `Value); - setAuthIn(!status); - setAuthOut(!status); +// setAuthIn(!status); +// setAuthOut(!status); break; case(`auth_in): status = (boolean)UI::QueryWidget(`id(`auth_in), `Value); - setAuthIn(status); +// setAuthIn(status); break; case(`auth_out): status = (boolean)UI::QueryWidget(`id(`auth_out), `Value); - setAuthOut(status); +// setAuthOut(status); break; } } @@ -382,21 +390,26 @@ string ip = tostring(UI::QueryWidget(`hostname, `Value)); string port = tostring(UI::QueryWidget(`port, `Value)); // validate IP address -if (!IscsiClientLib::useISNS()) +if (!IscsiClientLib::useISNS()) { - if (!IP::Check4(ip)) { + if (size(ip)>0){ + if (!IP::Check4(ip)) { map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("host -4 %1|tr -d '\n'", ip)); list<string> out=splitstring(output["stdout"]:"", " "); ip=out[size(out)-1]:""; y2internal("%1", out); if (output["exit"]:-1==0){ - } else { Popup::Error(output["stdout"]:""); UI::SetFocus(`hostname); return false; } } + } else{ + Popup::Error(_("Insert the IP address.")); + UI::SetFocus(`ip); + return false; + } // validate port number if (size(port)==0) { Popup::Error(_("Insert the port.")); @@ -408,12 +421,12 @@ IscsiClientLib::getConfig(); boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); + boolean auth_in = (!auth_none && size(user_in)>0 && size(pass_in)>0); + boolean auth_out = (!auth_none && size(user_out)>0 && size(pass_out)>0); if (auth_none){ user_in = ""; @@ -432,7 +445,7 @@ // write authentication data IscsiClientLib::saveConfig(user_in, pass_in, user_out, pass_out); - +//y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out); bg_finish=false; // ` with authentication string command = IscsiClientLib::useISNS()? "iscsiadm -m discovery -t isns" : sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port); @@ -458,7 +471,8 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - if ((params==[])||(IscsiClientLib::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){ + IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""]; + if ((params==[])||(IscsiClientLib::connected( true ))){ UI::ChangeWidget (`id (`connect), `Enabled, false); UI::ChangeWidget (`id (`delete), `Enabled, false); } else{ @@ -472,10 +486,10 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::getDiscovered(), { - list<string> row_in_string = splitstring(s, " "); + IscsiClientLib::currentRecord = splitstring(s, " "); // string record = deletechars(row_in_string[0]:"", "[]"); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") )); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", + (IscsiClientLib::connected( true ))?_("True"):_("False") )); row = row + 1; }); @@ -490,13 +504,13 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; + IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; params = curr_rec; if ( event["EventReason"]:"" == "Activated" ){ // connect new target if ( event["ID"]:nil == `connect) { // check if not already connected - if ( IscsiClientLib::connected( curr_rec , false) == true){ + if ( IscsiClientLib::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -509,7 +523,7 @@ } // delete connected item if ( event["ID"]:nil == `delete) { - if ((params == [])||(!IscsiClientLib::connected( curr_rec, true ))){ + if ((params == [])||(!IscsiClientLib::connected( true ))){ SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""), $[] ); IscsiClientLib::readSessions(); initDiscoveredTable(""); @@ -529,9 +543,9 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::targets, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") )); + IscsiClientLib::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", + (IscsiClientLib::connected( true ))?_("True"):_("False") )); row = row + 1; }); UI::ChangeWidget (`id (`targets), `Items, items); @@ -549,13 +563,12 @@ if ( event["EventReason"]:"" == "Activated" ){ if ( event["ID"]:nil == `connect) { // check if is not already connected - list <string> params = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); - if ( IscsiClientLib::connected( params, true ) == true){ + IscsiClientLib::currentRecord = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); + if ( IscsiClientLib::connected( true ) == true){ Popup::Error(_("The target is already connected.")); } else { - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected - if ( IscsiClientLib::connected( curr_rec , false) == true){ + if ( IscsiClientLib::connected(false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -572,36 +585,27 @@ // login to target with authentication boolean validateConnAuth(string key, map event){ boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); - string user_in = ""; - string pass_in = ""; - string user_out = ""; - string pass_out = ""; - if (auth_in){ - user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); - pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); - } - if (auth_out){ - user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); - pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); - } + string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); + string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); + string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); + string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); map<string, any> target=$[ - "target" : curr_rec[1]:"", - "portal" : curr_rec[0]:"", + "target" : IscsiClientLib::currentRecord[1]:"", + "portal" : IscsiClientLib::currentRecord[0]:"", "authmethod" : (auth_none)?"None":"CHAP", "username" : user_out, "password" : pass_out, "username_in" : user_in, "password_in" : pass_in ]; - if (checkAuthEntry() && IscsiClientLib::loginIntoTarget(target)) { + if (IscsiClientLib::connected(false) || IscsiClientLib::loginIntoTarget(target)) { +// IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; + IscsiClientLib::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClientLib::readSessions(); return true; } else return false; } - } Modified: branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/iscsi-cl… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/wizards.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/iscsi-client/src/wizards.ycp Tue Apr 21 09:33:10 2009 @@ -31,6 +31,7 @@ "targets" : ``( TargetsDialog() ), "conn_auth" : ``( ConnAuthDialog("client") ), "conn_disc" : ``( ConnAuthDialog("discovered") ), + "edit_conn" : ``( ConnAuthDialog("client") ), "disc" : ``( DiscAuthDialog("discovered") ), ]; @@ -41,6 +42,7 @@ `abort : `abort, `next : `next, `add : "disc_auth", + `edit : "edit_conn", `conn : "conn_disc", `disc : "disc" ], @@ -64,6 +66,10 @@ `abort : `abort, `next : "targets" ], + "edit_conn" : $[ + `abort : `abort, + `next : "global" + ], "disc" : $[ `abort : `abort, `back : `back, -- 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] r56868 - /tags/stable-2_18_7/iscsi-client/
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 09:29:36 2009 New Revision: 56868 URL: http://svn.opensuse.org/viewcvs/yast?rev=56868&view=rev Log: Created tag stable-2_18_7 for iscsi-client Added: tags/stable-2_18_7/iscsi-client/ - copied from r56867, trunk/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56867 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/IscsiClientLib.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 21 Apr '09

21 Apr '09

Author: mzugec Date: Tue Apr 21 09:29:28 2009 New Revision: 56867 URL: http://svn.opensuse.org/viewcvs/yast?rev=56867&view=rev Log: changed dialogs workflow to allow to edit authentication for connection (fate#305306) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/dialogs.ycp trunk/iscsi-client/src/widgets.ycp trunk/iscsi-client/src/wizards.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=56867&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Tue Apr 21 09:29:28 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 09:29:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 21 09:23:21 CEST 2009 - mzugec(a)suse.cz + +- changed dialogs workflow to allow to edit authentication for + connection (fate#305306) +- 2.18.7 + +------------------------------------------------------------------- Mon Mar 16 15:20:15 CET 2009 - mzugec(a)suse.cz - reload service when initiatorname is changed to re-read new value Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp… ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Tue Apr 21 09:29:28 2009 @@ -108,11 +108,12 @@ foreach(string sess, IscsiClientLib::sessions, { string target = splitstring(sess, " ")[1]:""; string portal = splitstring(sess, " ")[0]:""; - map<string, any> auth = IscsiClientLib::getNode([portal, target]); + IscsiClientLib::currentRecord = [portal, target]; + map<string, any> auth = IscsiClientLib::getNode(); map new_target = $["target": target, "portal" : portal, - "startup" : IscsiClientLib::getStartupStatus([portal, target]), + "startup" : IscsiClientLib::getStartupStatus(), ]; if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None"; else new_target = union(new_target, auth); Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Tue Apr 21 09:29:28 2009 @@ -12,6 +12,7 @@ global list <string> sessions = []; global list <string> discovered = []; global list <string> targets = []; +global list<string> currentRecord = []; // status of rcopen-iscsi service boolean serviceStatus = false; @@ -80,7 +81,7 @@ // use cache if available if (size(config)==0){ config = (map<string, any>) SCR::Read(.etc.iscsid.all); - y2milestone("read config %1", config); + y2debug("read config %1", config); } return config["value"]:[]; } @@ -109,8 +110,8 @@ } -global map<string, any> getNode(list<string> rec){ - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":rec[1]:"", "IP":rec[0]:""]); +global map<string, any> getNode(){ + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":currentRecord[1]:"", "IP":currentRecord[0]:""]); if (cmd["exit"]:0!=0) return $[]; map<string, any> auth = $[]; foreach(string row, splitstring(cmd["stdout"]:"", "\n"), { @@ -321,11 +322,11 @@ // delete deiscovered target from database -global boolean deleteRecord(list<string> record){ +global boolean deleteRecord(){ boolean ret = true; - y2milestone("Delete record %1", record); + y2milestone("Delete record %1", currentRecord); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", record[1]:"", record[0]:"")); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return false; readSessions(); @@ -333,10 +334,10 @@ } // get (manual/onboot) status of target connecting -global string getStartupStatus(list<string> record){ +global string getStartupStatus(){ string status = ""; - y2milestone("Getting status of record %1", record); - map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", record[1]:"", record[0]:"")); + y2milestone("Getting status of record %1", currentRecord); + map<string, any> retcode = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", currentRecord[1]:"", currentRecord[0]:"")); if (size(retcode["stderr"]:"")>0) return ""; foreach(string row, splitstring(retcode["stdout"]:"", "\n"), { if (issubstring(row, "node.conn[0].startup")){ @@ -344,14 +345,14 @@ break; } }); - y2milestone("Startup status for %1 is %2", record, status); + y2milestone("Startup status for %1 is %2", currentRecord, status); return status; } // update authentication value -global boolean setValue(list<string> record, string name, string value){ - y2milestone("set %1 for record %2", name, record); - string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", record[1]:"", record[0]:"", name, value); +global boolean setValue(string name, string value){ + y2milestone("set %1 for record %2", name, currentRecord); + string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", currentRecord[1]:"", currentRecord[0]:"", name, value); y2milestone("execute command - %1", command ); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, command); @@ -365,12 +366,12 @@ // check if given target is connected -global boolean connected(list<string> rec, boolean check_ip){ -y2internal("check connected status for %1 with IP check:%2", rec, check_ip); +global boolean connected(boolean check_ip){ +y2internal("check connected status for %1 with IP check:%2", currentRecord, check_ip); boolean ret = false; foreach(string row, sessions, { list<string> list_row = splitstring(row, " "); - if (list_row[1]:"" == rec[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(rec[0]:"", ",")[0]:"" : true)){ + if (list_row[1]:"" == currentRecord[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(currentRecord[0]:"", ",")[0]:"" : true)){ ret = true; break; } @@ -379,15 +380,16 @@ } // change startup status (manual/onboot) for target -global boolean setStartupStatus(list<string> record, string status){ - y2milestone("Set startup status for %1 to %2", record, status); +global boolean setStartupStatus(string status){ + y2milestone("Set startup status for %1 to %2", currentRecord, status); boolean ret = true; map<string, any> retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); if (size(retcode["stderr"]:"")>0) return false; else retcode = (map<string, any>) SCR::Execute(.target.bash_output, - sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", record[1]:"", record[0]:"", status)); + sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status)); +y2internal("retcode %1", retcode); return ret; } @@ -426,37 +428,38 @@ return true; } */ + global boolean loginIntoTarget(map target){ - list<string> curr_rec = [target["portal"]:"", target["target"]:""]; + currentRecord = [target["portal"]:"", target["target"]:""]; if (target["authmethod"]:"None"!="None"){ string user_in = target["username_in"]:""; string pass_in = target["password_in"]:""; if (size(user_in)>0 && size(pass_in)>0){ - setValue(curr_rec, "node.session.auth.username_in", user_in); - setValue(curr_rec, "node.session.auth.password_in", pass_in); + setValue("node.session.auth.username_in", user_in); + setValue("node.session.auth.password_in", pass_in); } else{ - setValue(curr_rec, "node.session.auth.username_in", ""); - setValue(curr_rec, "node.session.auth.password_in", ""); + setValue("node.session.auth.username_in", ""); + setValue("node.session.auth.password_in", ""); } string user_out = target["username"]:""; string pass_out = target["password"]:""; if (size(user_out)>0 && size(pass_out)>0){ - setValue(curr_rec, "node.session.auth.username", user_out); - setValue(curr_rec, "node.session.auth.password", pass_out); - setValue(curr_rec, "node.session.auth.authmethod", "CHAP"); + setValue("node.session.auth.username", user_out); + setValue("node.session.auth.password", pass_out); + setValue("node.session.auth.authmethod", "CHAP"); } else { - setValue(curr_rec, "node.session.auth.username", ""); - setValue(curr_rec, "node.session.auth.password", ""); - setValue(curr_rec, "node.session.auth.authmethod", ""); + setValue("node.session.auth.username", ""); + setValue("node.session.auth.password", ""); + setValue("node.session.auth.authmethod", ""); } - } else setValue(curr_rec, "node.session.auth.authmethod", "None"); + } else setValue("node.session.auth.authmethod", "None"); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:"")); y2internal("output %1", output); // if (output["exit"]:-1==0){ // set startup status to auto by default (bnc#400610) - if (!Mode::autoinst()) setStartupStatus(curr_rec, "onboot"); + if (!Mode::autoinst()) setStartupStatus("onboot"); return true; /* } else { @@ -524,7 +527,8 @@ foreach(map target, ay_settings["targets"]:[], { y2internal("login into target %1", target); loginIntoTarget(target); - setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual"); + currentRecord = [target["portal"]:"", target["target"]:""]; + setStartupStatus(target["startup"]:"manual"); }); return true; } Modified: trunk/iscsi-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/dialogs.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/dialogs.ycp (original) +++ trunk/iscsi-client/src/dialogs.ycp Tue Apr 21 09:29:28 2009 @@ -80,8 +80,9 @@ ), `Left(`HBox( `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Log Out")), - `PushButton(`id(`toggle), _("Toggle Start-Up")) + `PushButton(`id(`edit), _("Edit")), + `PushButton(`id(`del), _("Log Out")) +// `PushButton(`id(`toggle), _("Toggle Start-Up")) )) ), "init" : initConnectedTable, @@ -133,22 +134,24 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none), `opt(`invertAutoEnable), _("No Authentication"), true , + `VBox( + `Left(`Label(_("Incoming Authentication"))), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication"))), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initDiscAuth, - "handle" : handleDiscAuth, - "validate_type" : `function, - "validate_function" : validateDiscAuth, +// "handle" : handleDiscAuth, +// "validate_type" : `function, +// "validate_function" : validateDiscAuth, "help" : HELPS["conn_auth"]:"" ], @@ -157,25 +160,37 @@ "widget" : `custom, "custom_widget" : `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) - ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) - ) + `CheckBoxFrame(`id(`auth_none),`opt(`invertAutoEnable), _("No Authentication"), true, + `VBox( + `Left( `Label(_("Incoming Authentication")) ), + `HBox( + `TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password")) + ), + `VSpacing(2), + `Left( `Label(_("Outgoing Authentication")) ), + `HBox( + `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + ) + ) + ) ), "init" : initConnAuth, - "handle" : handleDiscAuth, +// "handle" : handleDiscAuth, "validate_type" : `function, "validate_function" : validateConnAuth, "help" : HELPS["conn_auth"]:"" ], + "startup" : $[ + "widget" : `combobox, + "opt" : [`hstretch, `notify], + "label" : _("Startup"), + "items" : [ + ["manual", "manual"], + ["onboot", "onboot"], + ["automatic", "automatic"] + ] + ], // widget for portal address "server_location" : $[ "widget" : `custom, @@ -363,7 +378,7 @@ any ConnAuthDialog(string return_to){ current_tab = return_to; string caption = _("iSCSI Initiator Discovery"); - list<map <string, any> > w = CWM::CreateWidgets (["conn_auth"], (map <string, map <string, any> >)widgets); + list<map <string, any> > w = CWM::CreateWidgets (["startup", "conn_auth"], (map <string, map <string, any> >)widgets); term contents = `VBox( `VStretch(), @@ -372,6 +387,7 @@ `HSpacing (1), `VBox( w[0, "widget"]:`VSpacing (1), + w[1, "widget"]:`VSpacing (1), `VSpacing (2) ), `HSpacing (1), Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Tue Apr 21 09:29:28 2009 @@ -96,8 +96,8 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::sessions, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClientLib::getStartupStatus(row_in_string))); + IscsiClientLib::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", IscsiClientLib::getStartupStatus())); row = row + 1; }); UI::ChangeWidget (`id (`connected), `Items, items); @@ -106,17 +106,17 @@ } // get record identificator from selected row -list<string> getRecord(){ - list<string> record = []; +list<string> setRecord(){ + IscsiClientLib::currentRecord = []; any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem); if (sel_item != nil){ integer current = tointeger(sel_item); - record = splitstring(IscsiClientLib::sessions[current]:"", " " ); + IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[current]:"", " " ); // record = deletechars(record, "[]"); } else if (size(IscsiClientLib::sessions)>0) - record = splitstring(IscsiClientLib::sessions[0]:"", " " ); - return record; + IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[0]:"", " " ); + return IscsiClientLib::currentRecord; } // handle for table of connected sessions @@ -131,23 +131,27 @@ return `add; case(`del): // delete (logout from) connected target - record = getRecord(); + record = setRecord(); if (size( record )>0){ if (Popup::ContinueCancel(_("Really log out from the selected target?"))) - if ( !(IscsiClientLib::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target.")); + if ( !(IscsiClientLib::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target.")); else { y2milestone("Delete record %1", record); initConnectedTable(""); } } else Popup::Error(_("No record found.")); break; + case(`edit): + record = setRecord(); + return `edit; + break; case(`toggle): // change manual/onboot status of connected target // don't use automatic anymore (replaced by onboot) (bnc#449108) - record = getRecord(); + record = setRecord(); if (size( record )>0){ y2milestone("toggle record %1", record); - string startup = IscsiClientLib::getStartupStatus(record); + string startup = IscsiClientLib::getStartupStatus(); if (size(startup)>0){ // toggle all 3 possible values (bnc#457252) list <string> options = ["manual", "onboot", "automatic"]; @@ -156,7 +160,7 @@ if (startup==option){ startup=options[(size(options)>pos+1) ? pos+1 : 0]:""; y2milestone("Changing state from %1 to %2", option, startup ); - IscsiClientLib::setStartupStatus(record, startup); + IscsiClientLib::setStartupStatus(startup); break; } pos=pos+1; @@ -168,13 +172,13 @@ } } // if nothing selected - disable some buttons, otherwise enable them - if( getRecord() == []){ + if( setRecord() == []){ UI::ChangeWidget (`id (`del), `Enabled, false); - UI::ChangeWidget (`id (`toggle), `Enabled, false); + UI::ChangeWidget (`id (`edit), `Enabled, false); } else { UI::ChangeWidget (`id (`del), `Enabled, true); - UI::ChangeWidget (`id (`toggle), `Enabled, true); + UI::ChangeWidget (`id (`edit), `Enabled, true); } return nil; @@ -305,39 +309,43 @@ // ***************** add table *************************** // set incoming widget status +/* void setAuthIn(boolean status){ UI::ChangeWidget(`id(`user_in),`Enabled, status ); UI::ChangeWidget(`id(`pass_in),`Enabled, status ); UI::ChangeWidget(`id(`auth_in),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // set outgoing widget status +/* void setAuthOut(boolean status){ UI::ChangeWidget(`id(`user_out),`Enabled, status ); UI::ChangeWidget(`id(`pass_out),`Enabled, status ); UI::ChangeWidget(`id(`auth_out),`Value, status ); if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status ); } +*/ // disable both incoming and outgoing void initDiscAuth(string key){ - setAuthIn(false); - setAuthOut(false); +// setAuthIn(false); +// setAuthOut(false); } void initConnAuth(string key){ - setAuthIn(false); - setAuthOut(false); - map<string, any> auth = IscsiClientLib::getNode(curr_rec); +// setAuthIn(false); +// setAuthOut(false); + map<string, any> auth = IscsiClientLib::getNode(); if (size(auth)>0) { UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" ); UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" ); - if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); +// if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true); UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" ); UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" ); - if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); +// if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true); } } // handle for enable/disable widgets in authentication dialog @@ -347,16 +355,16 @@ switch((symbol)event["ID"]:nil){ case(`auth_none): status = (boolean)UI::QueryWidget(`id(`auth_none), `Value); - setAuthIn(!status); - setAuthOut(!status); +// setAuthIn(!status); +// setAuthOut(!status); break; case(`auth_in): status = (boolean)UI::QueryWidget(`id(`auth_in), `Value); - setAuthIn(status); +// setAuthIn(status); break; case(`auth_out): status = (boolean)UI::QueryWidget(`id(`auth_out), `Value); - setAuthOut(status); +// setAuthOut(status); break; } } @@ -382,21 +390,26 @@ string ip = tostring(UI::QueryWidget(`hostname, `Value)); string port = tostring(UI::QueryWidget(`port, `Value)); // validate IP address -if (!IscsiClientLib::useISNS()) +if (!IscsiClientLib::useISNS()) { - if (!IP::Check4(ip)) { + if (size(ip)>0){ + if (!IP::Check4(ip)) { map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, sformat("host -4 %1|tr -d '\n'", ip)); list<string> out=splitstring(output["stdout"]:"", " "); ip=out[size(out)-1]:""; y2internal("%1", out); if (output["exit"]:-1==0){ - } else { Popup::Error(output["stdout"]:""); UI::SetFocus(`hostname); return false; } } + } else{ + Popup::Error(_("Insert the IP address.")); + UI::SetFocus(`ip); + return false; + } // validate port number if (size(port)==0) { Popup::Error(_("Insert the port.")); @@ -408,12 +421,12 @@ IscsiClientLib::getConfig(); boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); + boolean auth_in = (!auth_none && size(user_in)>0 && size(pass_in)>0); + boolean auth_out = (!auth_none && size(user_out)>0 && size(pass_out)>0); if (auth_none){ user_in = ""; @@ -432,7 +445,7 @@ // write authentication data IscsiClientLib::saveConfig(user_in, pass_in, user_out, pass_out); - +//y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out); bg_finish=false; // ` with authentication string command = IscsiClientLib::useISNS()? "iscsiadm -m discovery -t isns" : sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port); @@ -458,7 +471,8 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - if ((params==[])||(IscsiClientLib::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){ + IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""]; + if ((params==[])||(IscsiClientLib::connected( true ))){ UI::ChangeWidget (`id (`connect), `Enabled, false); UI::ChangeWidget (`id (`delete), `Enabled, false); } else{ @@ -472,10 +486,10 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::getDiscovered(), { - list<string> row_in_string = splitstring(s, " "); + IscsiClientLib::currentRecord = splitstring(s, " "); // string record = deletechars(row_in_string[0]:"", "[]"); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") )); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", + (IscsiClientLib::connected( true ))?_("True"):_("False") )); row = row + 1; }); @@ -490,13 +504,13 @@ any selected = UI::QueryWidget(`discovered, `CurrentItem); if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); } else { params = []; } - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; + IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ; params = curr_rec; if ( event["EventReason"]:"" == "Activated" ){ // connect new target if ( event["ID"]:nil == `connect) { // check if not already connected - if ( IscsiClientLib::connected( curr_rec , false) == true){ + if ( IscsiClientLib::connected( false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -509,7 +523,7 @@ } // delete connected item if ( event["ID"]:nil == `delete) { - if ((params == [])||(!IscsiClientLib::connected( curr_rec, true ))){ + if ((params == [])||(!IscsiClientLib::connected( true ))){ SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""), $[] ); IscsiClientLib::readSessions(); initDiscoveredTable(""); @@ -529,9 +543,9 @@ list <term> items = []; integer row = 0; foreach(string s, IscsiClientLib::targets, { - list<string> row_in_string = splitstring(s, " "); - items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", - (IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") )); + IscsiClientLib::currentRecord = splitstring(s, " "); + items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", + (IscsiClientLib::connected( true ))?_("True"):_("False") )); row = row + 1; }); UI::ChangeWidget (`id (`targets), `Items, items); @@ -549,13 +563,12 @@ if ( event["EventReason"]:"" == "Activated" ){ if ( event["ID"]:nil == `connect) { // check if is not already connected - list <string> params = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); - if ( IscsiClientLib::connected( params, true ) == true){ + IscsiClientLib::currentRecord = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " ); + if ( IscsiClientLib::connected( true ) == true){ Popup::Error(_("The target is already connected.")); } else { - curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected - if ( IscsiClientLib::connected( curr_rec , false) == true){ + if ( IscsiClientLib::connected(false) == true){ if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } @@ -572,36 +585,27 @@ // login to target with authentication boolean validateConnAuth(string key, map event){ boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value); - boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value); - boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value); - string user_in = ""; - string pass_in = ""; - string user_out = ""; - string pass_out = ""; - if (auth_in){ - user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); - pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); - } - if (auth_out){ - user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); - pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); - } + string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) ); + string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) ); + string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) ); + string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) ); map<string, any> target=$[ - "target" : curr_rec[1]:"", - "portal" : curr_rec[0]:"", + "target" : IscsiClientLib::currentRecord[1]:"", + "portal" : IscsiClientLib::currentRecord[0]:"", "authmethod" : (auth_none)?"None":"CHAP", "username" : user_out, "password" : pass_out, "username_in" : user_in, "password_in" : pass_in ]; - if (checkAuthEntry() && IscsiClientLib::loginIntoTarget(target)) { + if (IscsiClientLib::connected(false) || IscsiClientLib::loginIntoTarget(target)) { +// IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; + IscsiClientLib::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClientLib::readSessions(); return true; } else return false; } - } Modified: trunk/iscsi-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/wizards.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/wizards.ycp (original) +++ trunk/iscsi-client/src/wizards.ycp Tue Apr 21 09:29:28 2009 @@ -31,6 +31,7 @@ "targets" : ``( TargetsDialog() ), "conn_auth" : ``( ConnAuthDialog("client") ), "conn_disc" : ``( ConnAuthDialog("discovered") ), + "edit_conn" : ``( ConnAuthDialog("client") ), "disc" : ``( DiscAuthDialog("discovered") ), ]; @@ -41,6 +42,7 @@ `abort : `abort, `next : `next, `add : "disc_auth", + `edit : "edit_conn", `conn : "conn_disc", `disc : "disc" ], @@ -64,6 +66,10 @@ `abort : `abort, `next : "targets" ], + "edit_conn" : $[ + `abort : `abort, + `next : "global" + ], "disc" : $[ `abort : `abort, `back : `back, -- 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] r56866 - in /trunk/storage/libstorage/src: DmPartCo.cc Storage.cc Storage.h StorageTmpl.h
by aschnell＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: aschnell Date: Mon Apr 20 17:58:05 2009 New Revision: 56866 URL: http://svn.opensuse.org/viewcvs/yast?rev=56866&view=rev Log: - fixed memory leak Modified: trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTmpl.h Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Mon Apr 20 17:58:05 2009 @@ -308,7 +308,7 @@ void DmPartCo::getVolumes( ProcPart& ppart ) { - vols.clear(); + clearPointerList(vols); num_part = 0; Disk::PartPair pp = disk->partPair(); Disk::PartIter i = pp.begin(); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Apr 20 17:58:05 2009 @@ -262,24 +262,18 @@ } } -void Storage::deleteClist( CCont& co ) - { - for( CIter i=co.begin(); i!=co.end(); ++i ) - delete *i; - co.clear(); - } void Storage::deleteBackups() { for (map<string, CCont>::iterator i = backups.begin(); i != backups.end(); ++i) - deleteClist( i->second ); + clearPointerList(i->second); backups.clear(); } Storage::~Storage() { logContainersAndVolumes(logdir); - deleteClist(cont); + clearPointerList(cont); deleteBackups(); if( !tempdir.empty() && access( tempdir.c_str(), R_OK )==0 ) { @@ -297,7 +291,7 @@ void Storage::rescanEverything() { y2mil("rescan everything"); - deleteClist(cont); + clearPointerList(cont); detectObjects(); } @@ -5565,7 +5559,7 @@ map<string,CCont>::iterator i = backups.find( name ); if( i!=backups.end()) { - deleteClist( i->second ); + clearPointerList(i->second); backups.erase(i); } else @@ -5587,10 +5581,10 @@ y2mil("name:" << name); if( ret==0 ) { - map<string,CCont>::iterator b = backups.find( name ); + map<string, CCont>::const_iterator b = backups.find(name); if( b!=backups.end()) { - cont.clear(); + clearPointerList(cont); for (CCIter i = b->second.begin(); i != b->second.end(); ++i) cont.push_back( (*i)->getCopy() ); } Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Mon Apr 20 17:58:05 2009 @@ -1693,7 +1693,6 @@ bool ignoreError(list<commitAction>::const_iterator i, const list<commitAction>& al) const; string backupStates() const; void detectObjects(); - void deleteClist( CCont& co ); void deleteBackups(); void setFreeInfo( const string& device, unsigned long long df_free, unsigned long long resize_free, Modified: trunk/storage/libstorage/src/StorageTmpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTm… ============================================================================== --- trunk/storage/libstorage/src/StorageTmpl.h (original) +++ trunk/storage/libstorage/src/StorageTmpl.h Mon Apr 20 17:58:05 2009 @@ -204,6 +204,16 @@ } + template <class Type> + void clearPointerList(list<Type*>& l) + { + for (typename list<Type*>::iterator i = l.begin(); i != l.end(); ++i) + delete *i; + l.clear(); + } + + + template <class T, unsigned int sz> inline unsigned int lengthof (T (&)[sz]) { return sz; } -- 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] r56865 - /tags/branch-SLE-10-SP3-2_13_215/installation/
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 17:15:54 2009 New Revision: 56865 URL: http://svn.opensuse.org/viewcvs/yast?rev=56865&view=rev Log: Created tag branch-SLE-10-SP3-2_13_215 for installation Added: tags/branch-SLE-10-SP3-2_13_215/installation/ - copied from r56864, branches/SuSE-SLE-10-SP3-Branch/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] r56864 - /tags/branch-SLE-10-SP3-2_13_215/
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 17:15:52 2009 New Revision: 56864 URL: http://svn.opensuse.org/viewcvs/yast?rev=56864&view=rev Log: Created tag branch-SLE-10-SP3-2_13_215 Added: tags/branch-SLE-10-SP3-2_13_215/ -- 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] r56863 - in /branches/SuSE-SLE-10-SP3-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_congratulate.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 16:38:47 2009 New Revision: 56863 URL: http://svn.opensuse.org/viewcvs/yast?rev=56863&view=rev Log: - Removing zen-updater package when disabling ZMD during installation (FATE #303671). - 2.13.215 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Mon Apr 20 16:38:47 2009 @@ -1 +1 @@ -2.13.214 +2.13.215 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Mon Apr 20 16:38:47 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 20 16:29:40 CEST 2009 - locilka(a)suse.cz + +- Removing zen-updater package when disabling ZMD during + installation (FATE #303671). +- 2.13.215 + +------------------------------------------------------------------- Fri Apr 3 15:54:35 CEST 2009 - locilka(a)suse.cz - Adjusted BuildRequires, yast2-packager is newly required for not Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp Mon Apr 20 16:38:47 2009 @@ -57,7 +57,10 @@ // #302495: Switching ZMD off // by default, the checkbox is not visible string zmd_service_name = "novell-zmd"; - string zmd_package_name = "zmd"; + // FATE #303671: Disable Updater Applet If ZENworks is Disabled During Installation + list <string> zmd_package_names = ["zmd", "zen-updater"]; + list <string> zmd_remove_packages = ["zen-updater"]; + term check_box_turnoff_zmd = `Empty(); string turnoff_zmd_help= ""; @@ -70,7 +73,14 @@ // not by default boolean turnoff_zmd_default_state = (argmap["zmd_turnoff_default_state"]:"no" == "yes"); - boolean zmd_installed = Package::Installed (zmd_package_name); + boolean zmd_installed = false; + + foreach (string one_package, zmd_package_names, { + if (Package::Installed (one_package)) { + zmd_installed = true; + break; + } + }); // don't check for state a service that is not installed boolean zmd_enabled_or_running = (zmd_installed && (Service::Enabled (zmd_service_name) || Service::Status (zmd_service_name) == 0)); y2milestone ("ZMD Installed: %1, Enabled/Running: %2", zmd_installed, zmd_enabled_or_running); @@ -198,6 +208,16 @@ void StopAndDisableZMD () { y2milestone ("Stopping service: %1 -> %2", zmd_service_name, Service::Stop (zmd_service_name)); y2milestone ("Disabling service: %1 -> %2", zmd_service_name, Service::Disable (zmd_service_name)); + + // Choose only the currently installed packages + list <string> packages_to_remove = filter (string one_package, zmd_remove_packages, { + return Package::Installed (one_package); + }); + + // FATE #303671: Disable Updater Applet If ZENworks is Disabled During Installation + if (size (packages_to_remove) > 0) { + y2milestone ("Removing packages %1: %2", packages_to_remove, Package::DoRemove (packages_to_remove)); + } } Wizard::SetContents (caption, contents, help, -- 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] r56862 - in /trunk/yast2: package/yast2.changes scripts/yast2
by jsrain＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jsrain Date: Mon Apr 20 16:12:31 2009 New Revision: 56862 URL: http://svn.opensuse.org/viewcvs/yast?rev=56862&view=rev Log: at start-up, check that /sys, /proc and /dev are not empty and prevent YaST from start if they are (bnc#450643) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 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 Mon Apr 20 16:12:31 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 20 16:11:35 CEST 2009 - jsrain(a)suse.cz + +- at start-up, check that /sys, /proc and /dev are not empty and + prevent YaST from start if they are (bnc#450643) + +------------------------------------------------------------------- Thu Apr 9 10:04:19 CEST 2009 - lslezak(a)suse.cz - PackageSystem.ycp - check nil result of Pkg::PkgCommit() call Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=56862&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Mon Apr 20 16:12:31 2009 @@ -30,6 +30,16 @@ . $YAST_PREFIX/lib/YaST2/bin/yast2-funcs +# check that system directories are non-empty - bnc #450643 +mount_ok=1; +test -z `ls /proc |head -n1` && echo "The /proc filesystem is not mounted." && mount_ok=0; +test -z `ls /sys |head -n1` && echo "The /sys filesystem is not mounted." && mount_ok=0; +test -z `ls /dev |head -n1` && echo "The /dev filesystem is not mounted." && mount_ok=0; +if test $mount_ok -eq 0 ; then + echo "If you are running in a chroot environment, bind-mount missing filesystems."; + exit 1; +fi + # #211392, #265263 # if we are in X and do not have _input_ from terminal, # save the output and display it via xmessage in case of error. -- 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] r56861 - in /trunk/storage/libstorage/src: Storage.cc Storage.h
by aschnell＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: aschnell Date: Mon Apr 20 15:09:48 2009 New Revision: 56861 URL: http://svn.opensuse.org/viewcvs/yast?rev=56861&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Apr 20 15:09:48 2009 @@ -171,8 +171,8 @@ setCacheChanges( true ); dumpObjectList(); - std::list<std::pair<string,string> >::const_iterator i; - for( i=infoPopupTxts.begin(); i!=infoPopupTxts.end(); ++i ) + for (list<std::pair<string, string>>::const_iterator i = infoPopupTxts.begin(); + i != infoPopupTxts.end(); ++i) { storage::usedBy ub; usedBy( i->first, ub ); @@ -4888,7 +4888,7 @@ (*cb)( info ); } -void Storage::addInfoPopupText( const string& disk, const string txt ) +void Storage::addInfoPopupText( const string& disk, const string& txt ) { y2mil( "d:" << disk << " txt:" << txt ); infoPopupTxts.push_back( make_pair(disk,txt) ); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Mon Apr 20 15:09:48 2009 @@ -484,7 +484,7 @@ { yesno_popup_cb=pfnc; } storage::CallbackYesNoPopup getCallbackYesNoPopup() const { return yesno_popup_cb; } - void addInfoPopupText( const string& disk, const string txt ); + void addInfoPopupText( const string& disk, const string& txt ); static void setCallbackProgressBarYcp( storage::CallbackProgressBar pfnc ) { progress_bar_cb_ycp=pfnc; } -- 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] r56860 - /tags/stable-2_18_1/repair/
by jreidinger＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jreidinger Date: Mon Apr 20 14:07:38 2009 New Revision: 56860 URL: http://svn.opensuse.org/viewcvs/yast?rev=56860&view=rev Log: Created tag stable-2_18_1 for repair Added: tags/stable-2_18_1/repair/ - copied from r56859, trunk/repair/ -- 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] r56859 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRBoot.ycp src/osr_module_bootloader.ycp
by jreidinger＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jreidinger Date: Mon Apr 20 14:07:23 2009 New Revision: 56859 URL: http://svn.opensuse.org/viewcvs/yast?rev=56859&view=rev Log: update bootloaders versions and correctly mount target system bnc #408733 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRBoot.ycp trunk/repair/src/osr_module_bootloader.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=56859&r1=5685… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Mon Apr 20 14:07:23 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Mon Apr 20 14:07:23 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Apr 20 14:04:34 CEST 2009 - jreidinger(a)suse.cz + +- update minimal version for bootloaders +- correctly mount root if selected only bootloader check + (bnc #408733) +- 2.18.1 + +------------------------------------------------------------------- Thu Mar 19 09:56:18 CET 2009 - jreidinger(a)suse.cz - remove check for /etc/modprobe.conf as it no longer exist Modified: trunk/repair/src/OSRBoot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRBoot.ycp?rev=56859… ============================================================================== --- trunk/repair/src/OSRBoot.ycp (original) +++ trunk/repair/src/OSRBoot.ycp Mon Apr 20 14:07:23 2009 @@ -55,17 +55,21 @@ "lilo" : [ $[ "pkgname" : "lilo", - "pkgversion" : "22.3.2-32" + "pkgversion" : "22.8" ], $[ "pkgname" : "gfxboot", - "pkgversion" : "1.9-34" + "pkgversion" : "4.1.19" ] ], "grub" : [ $[ "pkgname" : "grub", "pkgversion" : "0.92-69" + ], + $[ + "pkgname" : "gfxboot", + "pkgversion" : "4.1.19" ] ], "silo" : [], //"SILO", Modified: trunk/repair/src/osr_module_bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_bootloader… ============================================================================== --- trunk/repair/src/osr_module_bootloader.ycp (original) +++ trunk/repair/src/osr_module_bootloader.ycp Mon Apr 20 14:07:23 2009 @@ -51,8 +51,9 @@ // ///////////////////////////////////////////////////////////////////////// - // change root for SCR - OSRSystem::SetTargetRoot(); + // FIXME consolide these crappy mount/umount things + OSRFstab::UmountAllFrom( OSRSystem::TargetRoot()); + OSRFstab::MountAll( OSRSystem::TargetRoot()); if( ! OSRBoot::CheckSysconfigFiles( OSRSystem::TargetRoot() ) ) { -- 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] r56858 - /tags/stable-2_18_13/installation/
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:07:19 2009 New Revision: 56858 URL: http://svn.opensuse.org/viewcvs/yast?rev=56858&view=rev Log: Created tag stable-2_18_13 for installation Added: tags/stable-2_18_13/installation/ - copied from r56857, 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] r56857 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:07:10 2009 New Revision: 56857 URL: http://svn.opensuse.org/viewcvs/yast?rev=56857&view=rev Log: New version Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=56857&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Apr 20 14:07:10 2009 @@ -1 +1 @@ -2.18.12 +2.18.13 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 Apr 20 14:07:10 2009 @@ -3,6 +3,7 @@ - Fixed Vendor module to use zypp history file instead of using y2logRPM (bnc #456446). +- 2.18.13 ------------------------------------------------------------------- Thu Apr 16 16:58:07 CEST 2009 - locilka(a)suse.cz -- 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] r56856 - /branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:06:14 2009 New Revision: 56856 URL: http://svn.opensuse.org/viewcvs/yast?rev=56856&view=rev Log: Some more logging Modified: branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp Modified: branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/installa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp Mon Apr 20 14:06:14 2009 @@ -65,9 +65,9 @@ " [ -f \"update.tar.gz\" ] && /bin/tar -zxf \"update.tar.gz\"; \n" + " [ -f \"update.tgz\" ] && /bin/tar -zxf \"update.tgz\"; \n" + // Installing all extracted RPMs - " rpm -Uv --force *.rpm 2>>$TMPFILE; \n" + + " rpm -Uv --force *.rpm 1>>$TMPFILE 2>>$TMPFILE; \n" + // Logging errors - " [ -s \"$TMPFILE\" ] && echo \"\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + + " [ -s \"$TMPFILE\" ] && echo \"# Additional rpm output:\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + " rm -rf $TMPFILE; \n" + // Running update.post script " [ -f \"update.post\" ] && /bin/chmod +x \"update.post\" && \"update.post\" \"$i\"; \n" + -- 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] r56855 - /trunk/installation/src/modules/Vendor.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:06:07 2009 New Revision: 56855 URL: http://svn.opensuse.org/viewcvs/yast?rev=56855&view=rev Log: Some more logging Modified: trunk/installation/src/modules/Vendor.ycp Modified: trunk/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/Vendor.… ============================================================================== --- trunk/installation/src/modules/Vendor.ycp (original) +++ trunk/installation/src/modules/Vendor.ycp Mon Apr 20 14:06:07 2009 @@ -65,9 +65,9 @@ " [ -f \"update.tar.gz\" ] && /bin/tar -zxf \"update.tar.gz\"; \n" + " [ -f \"update.tgz\" ] && /bin/tar -zxf \"update.tgz\"; \n" + // Installing all extracted RPMs - " rpm -Uv --force *.rpm 2>>$TMPFILE; \n" + + " rpm -Uv --force *.rpm 1>>$TMPFILE 2>>$TMPFILE; \n" + // Logging errors - " [ -s \"$TMPFILE\" ] && echo \"\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + + " [ -s \"$TMPFILE\" ] && echo \"# Additional rpm output:\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + " rm -rf $TMPFILE; \n" + // Running update.post script " [ -f \"update.post\" ] && /bin/chmod +x \"update.post\" && \"update.post\" \"$i\"; \n" + -- 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] r56854 - in /trunk/installation: package/yast2-installation.changes src/modules/Vendor.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:01:10 2009 New Revision: 56854 URL: http://svn.opensuse.org/viewcvs/yast?rev=56854&view=rev Log: - Fixed Vendor module to use zypp history file instead of using y2logRPM (bnc #456446). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/Vendor.ycp 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 Apr 20 14:01:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 20 13:59:31 CEST 2009 - locilka(a)suse.cz + +- Fixed Vendor module to use zypp history file instead of using + y2logRPM (bnc #456446). + +------------------------------------------------------------------- Thu Apr 16 16:58:07 CEST 2009 - locilka(a)suse.cz - Added documentation for installation images. Modified: trunk/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/Vendor.… ============================================================================== --- trunk/installation/src/modules/Vendor.ycp (original) +++ trunk/installation/src/modules/Vendor.ycp Mon Apr 20 14:01:10 2009 @@ -33,8 +33,12 @@ global define void DriverUpdate1 () { list<string> updatefiles = (list<string>)WFM::Read (.local.dir, ["/update", []]); - if (size (updatefiles) <= 0) + if (size (updatefiles) <= 0) { + y2milestone ("No files in /update, skipping driver update..."); return; + } + + y2milestone ("Extracting driver update..."); // clean up, just in case SCR::Execute(.target.bash, "/bin/rm -rf /tmp/update"); @@ -43,19 +47,40 @@ WFM::Execute(.local.bash, "l=/var/log/driverupdate.log ; [ -f $l ] && /bin/cat $l " + ">> '" + String::Quote (Installation::destdir) + "$l'"); - // copy all update files + // copy all update files from inst-sys to installed system WFM::Execute(.local.bash, "/bin/cp -a /update " + "'" + String::Quote (Installation::destdir) + "/tmp/update'"); + string logfile = "/var/log/zypp/history"; + + string runcmd = + "cd /; \n" + + "for i in /tmp/update/[0-9]*/install ; do \n" + + // Logging extracting the driver update + " echo # Installing Driver Update from $i >>" + logfile + "; \n" + + " TMPFILE=${i}rpm_install_tmpfile; \n" + + " [ -x \"/bin/mktemp\" ] && TMPFILE=`/bin/mktemp`; \n" + + // Extracting the driver update archives + " cd $i; \n" + + " [ -f \"update.tar.gz\" ] && /bin/tar -zxf \"update.tar.gz\"; \n" + + " [ -f \"update.tgz\" ] && /bin/tar -zxf \"update.tgz\"; \n" + + // Installing all extracted RPMs + " rpm -Uv --force *.rpm 2>>$TMPFILE; \n" + + // Logging errors + " [ -s \"$TMPFILE\" ] && echo \"\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + + " rm -rf $TMPFILE; \n" + + // Running update.post script + " [ -f \"update.post\" ] && /bin/chmod +x \"update.post\" && \"update.post\" \"$i\"; \n" + + "done;"; + + y2milestone ("Calling: +--------------------------------------------------------- +%1 +---------------------------------------------------------", runcmd); + // unpack update files and run update.post scripts - SCR::Execute(.target.bash, - "cd / ; " + - "echo \"Installing driver update\" >> " + Directory::logdir + "/y2logRPM ; " + - "for i in /tmp/update/[0-9]*/install ; do " + - " [ -f \"$i/update.tar.gz\" ] && /bin/tar -zxf \"$i/update.tar.gz\" ; " + - " rpm -Uv $i/*.rpm 2>> " + Directory::logdir + "/y2logRPM ; " + - " [ -f \"$i/update.post\" ] && /bin/chmod +x \"$i/update.post\" && \"$i/update.post\" \"$i\" ; " + - "done"); + // via SCR chrooted into the installed system + integer cmd = (integer) SCR::Execute (.target.bash, runcmd); } global define void DriverUpdate2 () -- 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] r56853 - in /branches/tmp/SLE-11-SP1-Stash/installation: package/yast2-installation.changes src/modules/Vendor.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 14:01:01 2009 New Revision: 56853 URL: http://svn.opensuse.org/viewcvs/yast?rev=56853&view=rev Log: - Fixed Vendor module to use zypp history file instead of using y2logRPM (bnc #456446). Modified: branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp Modified: branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/installa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/installation/package/yast2-installation.changes Mon Apr 20 14:01:01 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 20 13:59:31 CEST 2009 - locilka(a)suse.cz + +- Fixed Vendor module to use zypp history file instead of using + y2logRPM (bnc #456446). + +------------------------------------------------------------------- Tue Apr 7 13:04:20 CEST 2009 - ug(a)suse.de - changed the error message of missing hard disks during Modified: branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/installa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/installation/src/modules/Vendor.ycp Mon Apr 20 14:01:01 2009 @@ -33,8 +33,12 @@ global define void DriverUpdate1 () { list<string> updatefiles = (list<string>)WFM::Read (.local.dir, ["/update", []]); - if (size (updatefiles) <= 0) + if (size (updatefiles) <= 0) { + y2milestone ("No files in /update, skipping driver update..."); return; + } + + y2milestone ("Extracting driver update..."); // clean up, just in case SCR::Execute(.target.bash, "/bin/rm -rf /tmp/update"); @@ -43,19 +47,40 @@ WFM::Execute(.local.bash, "l=/var/log/driverupdate.log ; [ -f $l ] && /bin/cat $l " + ">> '" + String::Quote (Installation::destdir) + "$l'"); - // copy all update files + // copy all update files from inst-sys to installed system WFM::Execute(.local.bash, "/bin/cp -a /update " + "'" + String::Quote (Installation::destdir) + "/tmp/update'"); + string logfile = "/var/log/zypp/history"; + + string runcmd = + "cd /; \n" + + "for i in /tmp/update/[0-9]*/install ; do \n" + + // Logging extracting the driver update + " echo # Installing Driver Update from $i >>" + logfile + "; \n" + + " TMPFILE=${i}rpm_install_tmpfile; \n" + + " [ -x \"/bin/mktemp\" ] && TMPFILE=`/bin/mktemp`; \n" + + // Extracting the driver update archives + " cd $i; \n" + + " [ -f \"update.tar.gz\" ] && /bin/tar -zxf \"update.tar.gz\"; \n" + + " [ -f \"update.tgz\" ] && /bin/tar -zxf \"update.tgz\"; \n" + + // Installing all extracted RPMs + " rpm -Uv --force *.rpm 2>>$TMPFILE; \n" + + // Logging errors + " [ -s \"$TMPFILE\" ] && echo \"\">>" + logfile + " && sed 's/^\$.*\$/# \\1/' $TMPFILE>>" + logfile + "; \n" + + " rm -rf $TMPFILE; \n" + + // Running update.post script + " [ -f \"update.post\" ] && /bin/chmod +x \"update.post\" && \"update.post\" \"$i\"; \n" + + "done;"; + + y2milestone ("Calling: +--------------------------------------------------------- +%1 +---------------------------------------------------------", runcmd); + // unpack update files and run update.post scripts - SCR::Execute(.target.bash, - "cd / ; " + - "echo \"Installing driver update\" >> " + Directory::logdir + "/y2logRPM ; " + - "for i in /tmp/update/[0-9]*/install ; do " + - " [ -f \"$i/update.tar.gz\" ] && /bin/tar -zxf \"$i/update.tar.gz\" ; " + - " rpm -Uv $i/*.rpm 2 >> " + Directory::logdir + "/y2logRPM ; " + - " [ -f \"$i/update.post\" ] && /bin/chmod +x \"$i/update.post\" && \"$i/update.post\" \"$i\" ; " + - "done"); + // via SCR chrooted into the installed system + integer cmd = (integer) SCR::Execute (.target.bash, runcmd); } global define void DriverUpdate2 () -- 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] r56852 - in /trunk/storage: libstorage/src/Storage.cc libstorage/src/Storage.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: aschnell Date: Mon Apr 20 13:50:39 2009 New Revision: 56852 URL: http://svn.opensuse.org/viewcvs/yast?rev=56852&view=rev Log: - fixed generation of disk_* files (bnc #492452) Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Apr 20 13:50:39 2009 @@ -248,6 +248,7 @@ if( !instsys() ) detectNfs( pm ); detectFsData( vBegin(), vEnd(), pm ); + logContainersAndVolumes(logdir); } if( instsys() ) @@ -277,14 +278,7 @@ Storage::~Storage() { - if( max_log_num>0 ) - { - logVolumes( logdir ); - for (CCIter i = cont.begin(); i != cont.end(); ++i) - { - (*i)->logData( logdir ); - } - } + logContainersAndVolumes(logdir); deleteClist(cont); deleteBackups(); if( !tempdir.empty() && access( tempdir.c_str(), R_OK )==0 ) @@ -649,8 +643,6 @@ (d->getSysfsInfo(SYSFSDIR "/" + data.name)||data.typ==DiskData::XEN) && (data.typ==DiskData::XEN||d->detect(pp))) { - if( max_log_num>0 ) - d->logData( logdir ); data.d = d; } else if( d ) @@ -774,8 +766,6 @@ i->getStartData(); } } - if( max_log_num>0 ) - logVolumes( logdir ); y2mil("detectFsData end"); } @@ -818,6 +808,19 @@ } + void + Storage::logContainersAndVolumes(const string& Dir) const + { + if (max_log_num > 0) + { + for (CCIter i = cont.begin(); i != cont.end(); ++i) + (*i)->logData(Dir); + + logVolumes(Dir); + } + } + + void Storage::logVolumes(const string& Dir) const { Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Mon Apr 20 13:50:39 2009 @@ -1685,6 +1685,7 @@ bool haveNfs( NfsCo*& co ); bool haveLoop( LoopCo*& loop ); int removeContainer( Container* val ); + void logContainersAndVolumes(const string& Dir) const; void logVolumes(const string& Dir) const; int commitPair( CPair& p, bool (* fnc)( const Container& ) ); void sortCommitLists(storage::CommitStage stage, list<const Container*>& co, 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 Mon Apr 20 13:50:39 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 20 12:31:55 CEST 2009 - aschnell(a)suse.de + +- fixed generation of disk_* files (bnc #492452) + +------------------------------------------------------------------- Wed Apr 15 17:32:59 CEST 2009 - aschnell(a)suse.de - fixed resizing of volume groups with certain names (bnc #491383) -- 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] r56851 - /trunk/ncurses/src/NCTablePad.cc
by kmachalkova＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: kmachalkova Date: Mon Apr 20 13:23:05 2009 New Revision: 56851 URL: http://svn.opensuse.org/viewcvs/yast?rev=56851&view=rev Log: Now the actual change ;) sorting table in reversed order Modified: trunk/ncurses/src/NCTablePad.cc Modified: trunk/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.cc?rev=56… ============================================================================== --- trunk/ncurses/src/NCTablePad.cc (original) +++ trunk/ncurses/src/NCTablePad.cc Mon Apr 20 13:23:05 2009 @@ -316,7 +316,7 @@ return false; } -static int column; +static int column = -1; static bool compare_column( NCTableLine* first, NCTableLine* second ) { @@ -326,8 +326,14 @@ void NCTablePad::setOrder( int col ) { - column = col; - std::sort( Items.begin(), Items.end(), compare_column ); + if (column != col) + { + column = col; + std::sort( Items.begin(), Items.end(), compare_column ); + } + else + std::reverse( Items.begin(), Items.end() ); + dirty = true; update(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56850 - /trunk/ncurses/package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: kmachalkova Date: Mon Apr 20 13:13:08 2009 New Revision: 56850 URL: http://svn.opensuse.org/viewcvs/yast?rev=56850&view=rev Log: Improved sort - sort also in reversed order Modified: trunk/ncurses/package/yast2-ncurses.changes 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 Mon Apr 20 13:13:08 2009 @@ -3,6 +3,8 @@ - Fixed chaotic behaviour of cursor keys after the table has been sorted (Ctrl-O) - bnc#493884 +- Improved table sort: sort in reversed order, if the same column + is selected repeatedly ------------------------------------------------------------------- Thu Mar 26 15:06:44 CET 2009 - gs(a)suse.de -- 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] r56849 - /tags/stable-2_18_0/power-management/
by jsrain＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jsrain Date: Mon Apr 20 12:37:18 2009 New Revision: 56849 URL: http://svn.opensuse.org/viewcvs/yast?rev=56849&view=rev Log: Created tag stable-2_18_0 for power-management Added: tags/stable-2_18_0/power-management/ (props changed) - copied from r56848, trunk/power-management/ -- 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] r56848 - in /trunk/power-management: VERSION package/yast2-power-management.changes src/PowerManagement.ycp
by jsrain＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jsrain Date: Mon Apr 20 12:37:14 2009 New Revision: 56848 URL: http://svn.opensuse.org/viewcvs/yast?rev=56848&view=rev Log: do not show read progress bar (bnc #447574) Modified: trunk/power-management/VERSION trunk/power-management/package/yast2-power-management.changes trunk/power-management/src/PowerManagement.ycp Modified: trunk/power-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/VERSION?rev=568… ============================================================================== --- trunk/power-management/VERSION (original) +++ trunk/power-management/VERSION Mon Apr 20 12:37:14 2009 @@ -1 +1 @@ -2.17.6 +2.18.0 Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-p… ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Mon Apr 20 12:37:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 20 12:21:18 CEST 2009 - jsrain(a)suse.cz + +- do not show read progress bar (bnc #447574) +- 2.18.0 + +------------------------------------------------------------------- Wed Nov 26 15:34:54 CET 2008 - jsrain(a)suse.cz - translate power saving profile names and descriptions Modified: trunk/power-management/src/PowerManagement.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/PowerManage… ============================================================================== --- trunk/power-management/src/PowerManagement.ycp (original) +++ trunk/power-management/src/PowerManagement.ycp Mon Apr 20 12:37:14 2009 @@ -150,6 +150,9 @@ if (Mode::config ()) AbortFunction = nil; + // hide progress, it is too fast (bnc #447574) + boolean progress_status = Progress::set (false); + /* PowerManagement read dialog caption */ string caption = _("Initializing Configuration"); @@ -183,14 +186,18 @@ ); // read database - if(Abort()) return false; + if(Abort()) { + Progress::set (progress_status); + return false; + } Progress::NextStage(); // check installed packages - if (false && ! Mode::test () + if (! Mode::test () && ! PackageSystem::CheckAndInstallPackagesInteractive (["pm-profiler"]) ) { + Progress::set (progress_status); return false; } @@ -205,7 +212,10 @@ sleep(sl); // read general settings - if(Abort()) return false; + if(Abort()) { + Progress::set (progress_status); + return false; + } Progress::NextStage(); list<string> r_schemes = (list<string>) @@ -227,7 +237,10 @@ sleep(sl); // read saving schemes - if(Abort()) return false; + if(Abort()) { + Progress::set (progress_status); + return false; + } Progress::NextStage(); schemes = maplist (string s, r_schemes, ``{ @@ -260,6 +273,7 @@ y2debug ("Global settings: %1", global_settings); y2debug ("Power saving schemes: %1", schemes); + Progress::set (progress_status); return success; } -- 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] r56847 - in /branches/tmp/SLE-11-SP1-Stash/packager: package/yast2-packager.changes src/modules/Packages.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 12:21:47 2009 New Revision: 56847 URL: http://svn.opensuse.org/viewcvs/yast?rev=56847&view=rev Log: - Not checking signatures for add_on_products(.xml) file(s), the file is cerated by the customer and contains links to signed repositories (bnc #496404). Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp Modified: branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/package/yast2-packager.changes Mon Apr 20 12:21:47 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz + +- Not checking signatures for add_on_products(.xml) file(s), the + file is cerated by the customer and contains links to signed + repositories (bnc #496404). + +------------------------------------------------------------------- Fri Apr 3 14:31:20 CEST 2009 - locilka(a)suse.cz - Adjusting initial repository name according to LABEL in content Modified: branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/packager… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/packager/src/modules/Packages.ycp Mon Apr 20 12:21:47 2009 @@ -1490,7 +1490,8 @@ string file = one_aop[0]:""; string type = one_aop[1]:""; - tmp_add_on_products = Pkg::SourceProvideDigestedFile (initial_source, 1, file, true); + // BNC #496404: These files should not be checked for signatures + tmp_add_on_products = Pkg::SourceProvideOptionalFile (initial_source, 1, file); if (tmp_add_on_products != nil) { add_on_products_list = sformat ("%1/add_on_products", SCR::Read (.target.tmpdir)); -- 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] r56846 - in /trunk/packager: package/yast2-packager.changes src/modules/Packages.ycp
by locilka＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: locilka Date: Mon Apr 20 12:21:38 2009 New Revision: 56846 URL: http://svn.opensuse.org/viewcvs/yast?rev=56846&view=rev Log: - Not checking signatures for add_on_products(.xml) file(s), the file is cerated by the customer and contains links to signed repositories (bnc #496404). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Apr 20 12:21:38 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 20 12:19:34 CEST 2009 - locilka(a)suse.cz + +- Not checking signatures for add_on_products(.xml) file(s), the + file is cerated by the customer and contains links to signed + repositories (bnc #496404). + +------------------------------------------------------------------- Fri Apr 10 16:48:28 CEST 2009 - lslezak(a)suse.cz - repository manager - do not refresh CD/DVD repositories after Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Apr 20 12:21:38 2009 @@ -1490,7 +1490,8 @@ string file = one_aop[0]:""; string type = one_aop[1]:""; - tmp_add_on_products = Pkg::SourceProvideDigestedFile (initial_source, 1, file, true); + // BNC #496404: These files should not be checked for signatures + tmp_add_on_products = Pkg::SourceProvideOptionalFile (initial_source, 1, file); if (tmp_add_on_products != nil) { add_on_products_list = sformat ("%1/add_on_products", SCR::Read (.target.tmpdir)); -- 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] r56845 - /tags/stable-2_18_2/sudo/
by kmachalkova＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: kmachalkova Date: Mon Apr 20 12:09:48 2009 New Revision: 56845 URL: http://svn.opensuse.org/viewcvs/yast?rev=56845&view=rev Log: Created tag stable-2_18_2 for sudo Added: tags/stable-2_18_2/sudo/ - copied from r56844, trunk/sudo/ -- 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] r56844 - in /trunk/sudo: VERSION package/yast2-sudo.changes src/dialog-cmnd.ycp
by kmachalkova＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: kmachalkova Date: Mon Apr 20 12:09:41 2009 New Revision: 56844 URL: http://svn.opensuse.org/viewcvs/yast?rev=56844&view=rev Log: fixed renaming of command aliases - #494384 Modified: trunk/sudo/VERSION trunk/sudo/package/yast2-sudo.changes trunk/sudo/src/dialog-cmnd.ycp Modified: trunk/sudo/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/VERSION?rev=56844&r1=56843&… ============================================================================== --- trunk/sudo/VERSION (original) +++ trunk/sudo/VERSION Mon Apr 20 12:09:41 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/sudo/package/yast2-sudo.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/package/yast2-sudo.changes?… ============================================================================== --- trunk/sudo/package/yast2-sudo.changes (original) +++ trunk/sudo/package/yast2-sudo.changes Mon Apr 20 12:09:41 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Apr 20 11:32:27 CEST 2009 - kmachalkova(a)suse.cz + +- Fixed renaming of command aliases (bnc#494384) +- 2.18.2 + +------------------------------------------------------------------- Fri Feb 27 15:03:57 CET 2009 - kmachalkova(a)suse.cz - Do not add extra space to command parameters (bnc#473683) Modified: trunk/sudo/src/dialog-cmnd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-cmnd.ycp?rev=568… ============================================================================== --- trunk/sudo/src/dialog-cmnd.ycp (original) +++ trunk/sudo/src/dialog-cmnd.ycp Mon Apr 20 12:09:41 2009 @@ -72,7 +72,7 @@ continue; } if (name != new_alias) { - if (Sudo::SearchAlias2( name, Sudo::GetCmndAliases2()) ) { + if (Sudo::SearchAlias2( new_alias, Sudo::GetCmndAliases2()) ) { Popup::Error(sformat(_("Alias with name %1 already exists"),new_alias)); UI::SetFocus(`id("cmnd_alias_name")); continue; -- 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] r56843 - in /branches/tmp/SLE-11-SP1-Stash/reipl: package/yast2-reipl.changes src/Reipl.ycp
by jsrain＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jsrain Date: Mon Apr 20 12:02:04 2009 New Revision: 56843 URL: http://svn.opensuse.org/viewcvs/yast?rev=56843&view=rev Log: fixed handling of more than 26 disks (bnc #492326) Modified: branches/tmp/SLE-11-SP1-Stash/reipl/package/yast2-reipl.changes branches/tmp/SLE-11-SP1-Stash/reipl/src/Reipl.ycp Modified: branches/tmp/SLE-11-SP1-Stash/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/reipl/pa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/reipl/package/yast2-reipl.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/reipl/package/yast2-reipl.changes Mon Apr 20 12:02:04 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 20 12:01:39 CEST 2009 - jsrain(a)suse.cz + +- fixed handling of more than 26 disks (bnc #492326) + +------------------------------------------------------------------- Mon Feb 9 09:38:05 CET 2009 - hare(a)suse.de - Final fix for reboot (bnc#471522) Modified: branches/tmp/SLE-11-SP1-Stash/reipl/src/Reipl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/reipl/sr… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/reipl/src/Reipl.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/reipl/src/Reipl.ycp Mon Apr 20 12:02:04 2009 @@ -246,19 +246,24 @@ if (substring (fullDisk, 0, 4) == "dasd") { - string disk = substring (fullDisk, 0, 5); /* broken with more than 26 DASD devices */ - /* - fullDisk contains a device name either starting with "dasd" or with "sd". - I suppose it might be a full block device or just a partition on such a - block device. If it is a partition we have to get rid of the suffix - specifying the partition in order to get the containing block device. - We need something regex-like to get rid of the suffix. - This would work even if we have thousands - of block devices, which is not uncommon on s390. In such a case the - devices would have names such as "dasdaab" or "dasdaab1" and taking the - first five characters would no longer work. Analogous thing applies for - SCSI devices in the FCP case. - */ + string disk = nil; + /* + fullDisk might be a full block device or just a partition on such a + block device. If it is a partition we have to get rid of the suffix + specifying the partition in order to get the containing block device. + This device could have thousands of block devices, which is not uncommon + on s390. In such a case the devices would have names such as "dasdaab" or + "dasdaab1." + */ + list<string> split = regexptokenize (fullDisk, "^(dasd)([a-z]*)([0-9]*)$"); + + if (split == nil || size (split) != 3) { + y2error ("FindBootPartition: Could not regexptokenize fullDisk, split = %1", split); + + fError = true; + } else { + disk = split[0]:"" + split[1]:""; + } y2milestone ("FindBootPartition: found that the MBR uses dasd (%1)", disk); @@ -298,18 +303,23 @@ } else if (substring (fullDisk, 0, 2) == "sd") { - // Handle sdb or sdb4 string disk = nil; + /* + fullDisk might be a full block device or just a partition on such a + block device. If it is a partition we have to get rid of the suffix + specifying the partition in order to get the containing block device. + This device could have thousands of block devices, which is not uncommon + on s390. In such a case the devices would have names such as "sdaab" or + "sdaab1." + */ + list<string> split = regexptokenize (fullDisk, "^(sd)([a-z]*)([0-9]*)$"); + + if (split == nil || size (split) != 3) { + y2error ("FindBootPartition: Could not regexptokenize fullDisk, split = %1", split); - // /dev/sda - if (size (fullDisk) == 3) { - disk = fullDisk; - } - else if (size (fullDisk) == 4) { - disk = substring (fullDisk, 0, 3); /* broken with more than 26 SCSI disk devices */ - } - else { fError = true; + } else { + disk = split[0]:"" + split[1]:""; } y2milestone ("FindBootPartition: found that the MBR uses SCSI (%1)", disk); -- 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] r56842 - /trunk/storage/libstorage/src/EtcFstab.cc
by aschnell＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: aschnell Date: Mon Apr 20 11:16:37 2009 New Revision: 56842 URL: http://svn.opensuse.org/viewcvs/yast?rev=56842&view=rev Log: - use AsciiFile to log file content Modified: trunk/storage/libstorage/src/EtcFstab.cc Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Mon Apr 20 11:16:37 2009 @@ -648,21 +648,6 @@ return( line ); } -static void printFile( const string& fname ) - { - y2mil( "name:" << fname ); - ifstream file( fname.c_str() ); - classic(file); - string line; - int count = 1; - getline( file, line ); - while( file.good() ) - { - y2mil( "line:" << count++ << " \"" << line << "\"" ); - getline( file, line ); - } - file.close(); - } int EtcFstab::flush() { @@ -801,9 +786,9 @@ { crypttab.save(); } - printFile( prefix + "/fstab" ); - printFile( prefix + "/cryptotab" ); - printFile( prefix + "/crypttab" ); + AsciiFile(prefix + "/fstab").logContent(); + AsciiFile(prefix + "/cryptotab").logContent(); + AsciiFile(prefix + "/crypttab").logContent(); y2mil("ret:" << ret); 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] r56841 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h Graph.cc
by aschnell＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: aschnell Date: Mon Apr 20 11:13:51 2009 New Revision: 56841 URL: http://svn.opensuse.org/viewcvs/yast?rev=56841&view=rev Log: - include hostname and datetime in storage graph Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Graph.cc 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 Mon Apr 20 11:13:51 2009 @@ -8,6 +8,7 @@ #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> +#include <sys/utsname.h> #include <dirent.h> #include <string> #include <boost/algorithm/string.hpp> @@ -457,6 +458,29 @@ } + string + hostname() + { + struct utsname buf; + if (uname(&buf) != 0) + return string("unknown"); + return string(buf.nodename) + "." + string(buf.domainname); + } + + + string + datetime() + { + time_t t1 = time(NULL); + struct tm t2; + gmtime_r(&t1, &t2); + char buf[64 + 1]; + if (strftime(buf, sizeof(buf), "%F %T %Z", &t2) == 0) + return string("unknown"); + return string(buf); + } + + const string app_ws = " \t\n"; } Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Mon Apr 20 11:13:51 2009 @@ -78,6 +78,9 @@ string sformat(const char* format, ...); + string hostname(); + string datetime(); + inline const char* _(const char* msgid) { Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Mon Apr 20 11:13:51 2009 @@ -30,8 +30,7 @@ struct Node { Node(NodeType type, const string& id, const string& label, unsigned long long sizeK) - : type(type), id(id), label(label), sizeK(sizeK) - {} + : type(type), id(id), label(label), sizeK(sizeK) {} NodeType type; string id; @@ -45,8 +44,7 @@ struct Edge { Edge(EdgeType type, const string& id1, const string& id2) - : type(type), id1(id1), id2(id2) - {} + : type(type), id1(id1), id2(id2) {} EdgeType type; string id1; @@ -57,8 +55,7 @@ struct Rank { Rank(NodeType type, const char* name) - : type(type), name(name) - {} + : type(type), name(name) {} NodeType type; string name; @@ -377,8 +374,11 @@ ofstream out(filename.c_str()); + classic(out); out << "// generated by YaST (" << PACKAGE_STRING << ")" << endl; + out << "// " << hostname() << ", " << datetime() << endl; + out << endl; out << "digraph storage" << endl; out << "{" << endl; -- 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] r56840 - /trunk/core/package/yast2-core.changes
by jreidinger＠svn.opensuse.org 20 Apr '09

20 Apr '09

Author: jreidinger Date: Mon Apr 20 09:51:21 2009 New Revision: 56840 URL: http://svn.opensuse.org/viewcvs/yast?rev=56840&view=rev Log: changes Modified: trunk/core/package/yast2-core.changes Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Apr 20 09:51:21 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 20 09:50:37 CEST 2009 - jreidinger(a)suse.cz + +- add builtin list::swap for list + +------------------------------------------------------------------- Fri Apr 17 13:17:28 CEST 2009 - juhliarik(a)suse.cz - added fix for problem with adding nil to list (bnc#216177) -- 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] r56839 - in /trunk/storage/libstorage/src: Dasd.cc Disk.cc DmCo.cc DmPartCo.cc EtcFstab.cc EtcFstab.h EtcRaidtab.cc EtcRaidtab.h LoopCo.cc NfsCo.cc Region.h Storage.h StorageTypes.cc StorageTypes.h
by aschnell＠svn.opensuse.org 18 Apr '09

18 Apr '09

Author: aschnell Date: Sat Apr 18 14:19:45 2009 New Revision: 56839 URL: http://svn.opensuse.org/viewcvs/yast?rev=56839&view=rev Log: - minor improvements/cleanups (due to rainy weather) Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/EtcFstab.cc trunk/storage/libstorage/src/EtcFstab.h trunk/storage/libstorage/src/EtcRaidtab.cc trunk/storage/libstorage/src/EtcRaidtab.h trunk/storage/libstorage/src/LoopCo.cc trunk/storage/libstorage/src/NfsCo.cc trunk/storage/libstorage/src/Region.h trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Sat Apr 18 14:19:45 2009 @@ -435,7 +435,7 @@ Disk::getCommitActions( l ); if( init_disk ) { - l.remove_if(stage_equal_to(DECREASE)); + l.remove_if(stage_is(DECREASE)); l.push_front(commitAction(DECREASE, staticType(), dasdfmtText(false), this, true)); } } Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Sat Apr 18 14:19:45 2009 @@ -1810,7 +1810,7 @@ Container::getCommitActions( l ); if( deleted() ) { - l.remove_if(stage_equal_to(DECREASE)); + l.remove_if(stage_is(DECREASE)); l.push_front(commitAction(DECREASE, staticType(), setDiskLabelText(false), this, true)); } } Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Sat Apr 18 14:19:45 2009 @@ -354,7 +354,7 @@ } -inline std::ostream& operator<< (std::ostream& s, const DmCo& d ) + std::ostream& operator<<(std::ostream& s, const DmCo& d) { s << *((Container*)&d); return( s ); Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Sat Apr 18 14:19:45 2009 @@ -725,7 +725,7 @@ y2mil( "l:" << l ); if( deleted() || del_ptable ) { - l.remove_if(stage_equal_to(DECREASE)); + l.remove_if(stage_is(DECREASE)); string txt = deleted() ? removeText(false) : setDiskLabelText(false); l.push_front(commitAction(DECREASE, staticType(), txt, this, true)); } Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Sat Apr 18 14:19:45 2009 @@ -872,6 +872,52 @@ } + std::ostream& operator<<(std::ostream& s, const FstabEntry& v) + { + s << "device:" << v.device + << " dentry:" << v.dentry << " mount:" << v.mount + << " fs:" << v.fs << " opts:" << boost::join(v.opts, ",") + << " freq:" << v.freq << " passno:" << v.passno; + if( v.noauto ) + s << " noauto"; + if( v.crypto ) + s << " crypto"; + if( v.cryptt ) + s << " cryptt"; + if( v.tmpcrypt ) + s << " tmpcrypt"; + if( v.loop ) + s << " loop"; + if( v.dmcrypt ) + s << " dmcrypt"; + if( !v.loop_dev.empty() ) + s << " loop_dev:" << v.loop_dev; + if( !v.cr_key.empty() ) + s << " cr_key:" << v.cr_key; + if( !v.cr_opts.empty() ) + s << " cr_opts:" << v.cr_opts; + if( v.encr != storage::ENC_NONE ) + s << " encr:" << v.encr; + return s; + } + + + std::ostream& operator<<(std::ostream& s, const FstabChange& v) + { + s << "device:" << v.device + << " dentry:" << v.dentry << " mount:" << v.mount + << " fs:" << v.fs << " opts:" << boost::join(v.opts, ",") + << " freq:" << v.freq << " passno:" << v.passno; + if( !v.loop_dev.empty() ) + s << " loop_dev:" << v.loop_dev; + if( v.encr != storage::ENC_NONE ) + s << " encr:" << v.encr; + if( v.tmpcrypt ) + s << " tmpcrypt"; + return s; + } + + unsigned EtcFstab::fstabFields[] = { 20, 20, 10, 21, 1, 1 }; unsigned EtcFstab::cryptotabFields[] = { 11, 15, 20, 10, 10, 1 }; unsigned EtcFstab::crypttabFields[] = { 15, 20, 10, 1 }; Modified: trunk/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.h (original) +++ trunk/storage/libstorage/src/EtcFstab.h Sat Apr 18 14:19:45 2009 @@ -44,34 +44,6 @@ void calcDependent(); }; -inline std::ostream& operator<< (std::ostream& s, const FstabEntry &v ) - { - s << "device:" << v.device - << " dentry:" << v.dentry << " mount:" << v.mount - << " fs:" << v.fs << " opts:" << boost::join( v.opts, "," ) - << " freq:" << v.freq << " passno:" << v.passno; - if( v.noauto ) - s << " noauto"; - if( v.crypto ) - s << " crypto"; - if( v.cryptt ) - s << " cryptt"; - if( v.tmpcrypt ) - s << " tmpcrypt"; - if( v.loop ) - s << " loop"; - if( v.dmcrypt ) - s << " dmcrypt"; - if( !v.loop_dev.empty() ) - s << " loop_dev:" << v.loop_dev; - if( !v.cr_key.empty() ) - s << " cr_key:" << v.cr_key; - if( !v.cr_opts.empty() ) - s << " cr_opts:" << v.cr_opts; - if( v.encr != storage::ENC_NONE ) - s << " encr:" << v.encr; - return( s ); - } struct FstabChange { @@ -110,20 +82,6 @@ return( *this ); } -inline std::ostream& operator<< (std::ostream& s, const FstabChange &v ) - { - s << "device:" << v.device - << " dentry:" << v.dentry << " mount:" << v.mount - << " fs:" << v.fs << " opts:" << boost::join( v.opts, "," ) - << " freq:" << v.freq << " passno:" << v.passno; - if( !v.loop_dev.empty() ) - s << " loop_dev:" << v.loop_dev; - if( v.encr != storage::ENC_NONE ) - s << " encr:" << v.encr; - if( v.tmpcrypt ) - s << " tmpcrypt"; - return( s ); - } class EtcFstab { Modified: trunk/storage/libstorage/src/EtcRaidtab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidta… ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.cc (original) +++ trunk/storage/libstorage/src/EtcRaidtab.cc Sat Apr 18 14:19:45 2009 @@ -3,8 +3,6 @@ Textdomain "storage" */ -#include <sstream> - #include "y2storage/AppUtil.h" #include "y2storage/Regex.h" #include "y2storage/EtcRaidtab.h" Modified: trunk/storage/libstorage/src/EtcRaidtab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidta… ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.h (original) +++ trunk/storage/libstorage/src/EtcRaidtab.h Sat Apr 18 14:19:45 2009 @@ -21,13 +21,11 @@ protected: struct entry { - entry() { first=last=0; } - entry( unsigned f, unsigned l ) { first=f; last=l; } + entry() : first(0), last(0) {} + entry(unsigned f, unsigned l) : first(f), last(l) {} unsigned first; unsigned last; - friend std::ostream& operator<< (std::ostream& s, const entry &v ); }; - friend std::ostream& operator<< (std::ostream& s, const entry &v ); void updateMdadmFile(); void buildMdadmMap(); @@ -37,13 +35,6 @@ AsciiFile mdadm; }; - -inline std::ostream& operator<< (std::ostream& s, const EtcRaidtab::entry& v ) - { - s << "first=" << v.first << " last=" << v.last; - return( s ); - } - } #endif Modified: trunk/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.cc (original) +++ trunk/storage/libstorage/src/LoopCo.cc Sat Apr 18 14:19:45 2009 @@ -346,7 +346,7 @@ } -inline std::ostream& operator<< (std::ostream& s, const LoopCo& d ) + std::ostream& operator<<(std::ostream& s, const LoopCo& d) { s << *((Container*)&d); return( s ); Modified: trunk/storage/libstorage/src/NfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.cc?… ============================================================================== --- trunk/storage/libstorage/src/NfsCo.cc (original) +++ trunk/storage/libstorage/src/NfsCo.cc Sat Apr 18 14:19:45 2009 @@ -207,7 +207,7 @@ } -inline std::ostream& operator<< (std::ostream& s, const NfsCo& d ) + std::ostream& operator<<(std::ostream& s, const NfsCo& d) { s << *((Container*)&d); return( s ); Modified: trunk/storage/libstorage/src/Region.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Region.h?… ============================================================================== --- trunk/storage/libstorage/src/Region.h (original) +++ trunk/storage/libstorage/src/Region.h Sat Apr 18 14:19:45 2009 @@ -41,23 +41,25 @@ unsigned long start() const { return( s ); } unsigned long end() const { return( s+l-1 ); } unsigned long len() const { return( l ); } + + friend std::ostream& operator<<(std::ostream& s, const Region& p); + friend std::istream& operator>>(std::istream& s, Region& p); + protected: unsigned long s; unsigned long l; }; -inline std::ostream& operator<< (std::ostream& s, const Region &p ) + + inline std::ostream& operator<<(std::ostream& s, const Region& p) { - s << "[" << p.start() << "," << p.len() << "]"; - return( s ); + return s << "[" << p.s << "," << p.l << "]"; } -inline std::istream& operator>> (std::istream& s, Region &p ) + + inline std::istream& operator>>(std::istream& s, Region& p) { - unsigned long start, len; - s >> start >> len; - p = Region( start, len ); - return( s ); + return s >> p.s >> p.l; } } Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Sat Apr 18 14:19:45 2009 @@ -33,7 +33,7 @@ namespace storage { -template <int Value> +template <CType Value> class CheckType { public: @@ -43,7 +43,7 @@ } }; -template< class Iter, int Value, class CastResult > +template< class Iter, CType Value, class CastResult > class CastCheckIterator : public CheckType<Value>, public FilterIterator< CheckType<Value>, Iter > { @@ -1749,21 +1749,6 @@ std::list<std::pair<string,string> > infoPopupTxts; }; -inline std::ostream& operator<<(std::ostream& s, const commitAction& a) - { - s << "stage:" << a.stage - << " type:" << a.type - << " cont:" << a.container - << " dest:" << a.destructive; - if( a.container && a.co() ) - s << " name:" << a.co()->name(); - else if( a.vol() ) - s << " name:" << a.vol()->name(); - if( !a.description.empty() ) - s << " desc:" << a.description; - return( s ); - }; - } #endif Modified: trunk/storage/libstorage/src/StorageTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.cc (original) +++ trunk/storage/libstorage/src/StorageTypes.cc Sat Apr 18 14:19:45 2009 @@ -1,3 +1,5 @@ + +#include "y2storage/Storage.h" #include "y2storage/StorageTypes.h" #include "y2storage/Volume.h" @@ -53,6 +55,22 @@ } + std::ostream& operator<<(std::ostream& s, const commitAction& a) + { + s << "stage:" << a.stage + << " type:" << a.type + << " cont:" << a.container + << " dest:" << a.destructive; + if (a.co()) + s << " name:" << a.co()->name(); + if (a.vol()) + s << " name:" << a.vol()->name(); + if (!a.description.empty()) + s << " desc:" << a.description; + return s; + }; + + const string usedBy::device() const { switch (ub_type) Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Sat Apr 18 14:19:45 2009 @@ -122,12 +122,14 @@ { return !(*this < rhs); } bool operator>(const commitAction& rhs) const { return !(*this < rhs && *this == rhs); } + + friend std::ostream& operator<<(std::ostream& s, const commitAction& a); }; - struct stage_equal_to + struct stage_is { - stage_equal_to(CommitStage t) : val(t) {} + stage_is(CommitStage t) : val(t) {} bool operator()(const commitAction& t) const { return t.stage == val; } const CommitStage val; }; -- 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] r56838 - in /trunk/ncurses: package/yast2-ncurses.changes src/NCTable.cc
by kmachalkova＠svn.opensuse.org 17 Apr '09

17 Apr '09

Author: kmachalkova Date: Fri Apr 17 18:43:45 2009 New Revision: 56838 URL: http://svn.opensuse.org/viewcvs/yast?rev=56838&view=rev Log: Fixed misbehaving cursor keys after the table has been sorted by Ctrl-O - #493884 Modified: trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCTable.cc 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 Fri Apr 17 18:43:45 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 17 18:35:52 CEST 2009 - kmachalkova(a)suse.cz + +- Fixed chaotic behaviour of cursor keys after the table has been + sorted (Ctrl-O) - bnc#493884 + +------------------------------------------------------------------- Thu Mar 26 15:06:44 CET 2009 - gs(a)suse.de - Bugfix for IntField widget: draw the value correctly (was hidden Modified: trunk/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.cc?rev=56838… ============================================================================== --- trunk/ncurses/src/NCTable.cc (original) +++ trunk/ncurses/src/NCTable.cc Fri Apr 17 18:43:45 2009 @@ -355,13 +355,15 @@ // Mark currently highlighted table item as selected +// Yeah, it is really already highlighted, so no need to +// selectItem() and setCurrentItem() here again - #493884 void NCTable::selectCurrentItem() { const NCTableLine *cline = myPad()->GetLine( myPad()->CurPos().L ); if ( cline ) - selectItem( cline->origItem(), true ); + YTable::selectItem( cline->origItem(), true ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56837 - /trunk/devtools/devtools/admin/Makefile.am.toplevel
by aschnell＠svn.opensuse.org 17 Apr '09

17 Apr '09

Author: aschnell Date: Fri Apr 17 18:02:03 2009 New Revision: 56837 URL: http://svn.opensuse.org/viewcvs/yast?rev=56837&view=rev Log: - fixed typo Modified: trunk/devtools/devtools/admin/Makefile.am.toplevel Modified: trunk/devtools/devtools/admin/Makefile.am.toplevel URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/Makefile… ============================================================================== --- trunk/devtools/devtools/admin/Makefile.am.toplevel (original) +++ trunk/devtools/devtools/admin/Makefile.am.toplevel Fri Apr 17 18:02:03 2009 @@ -32,7 +32,7 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0