Author: aschnell Date: Sat Aug 9 10:45:50 2008 New Revision: 49899 URL: http://svn.opensuse.org/viewcvs/yast?rev=49899&view=rev Log: - added usedByDevice in StorageInterface.h - added "used_by_device" in target map Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Sat Aug 9 10:45:50 2008 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Sat Aug 9 10:45:50 2008 @@ -285,8 +285,9 @@ info.name = name(); info.device = device(); info.volcnt = vp.length(); - info.usedBy = getUsedByType(); - info.usedByName = usedByName(); + info.usedByType = uby.type(); + info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.readonly = readonly(); } Modified: trunk/storage/libstorage/src/Container.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.h?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.h (original) +++ trunk/storage/libstorage/src/Container.h Sat Aug 9 10:45:50 2008 @@ -146,7 +146,6 @@ void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } - const string& usedByName() const { return uby.name(); } bool readonly() const { return ronly; } unsigned long minorNr() const { return mnr; } Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Sat Aug 9 10:45:50 2008 @@ -4934,24 +4934,23 @@ int Storage::removeUsing(const string& device, const storage::usedBy& uby) { y2mil("device:" << device << " uby:" << uby); - string name = uby.name(); int ret=0; switch( uby.type() ) { case UB_MD: - ret = removeVolume( "/dev/" + name ); + ret = removeVolume(uby.device()); break; case UB_DM: - ret = removeVolume( "/dev/mapper/" + name ); + ret = removeVolume(uby.device()); break; case UB_LVM: - ret = removeLvmVg( name ); + ret = removeLvmVg(uby.name()); break; case UB_DMRAID: //ret = removeDmraidCo( name ); break; case UB_NONE: - y2warning( "%s used by none", device.c_str() ); + y2war(device << " used by none"); break; default: ret = STORAGE_REMOVE_USING_UNKNOWN_TYPE; Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Sat Aug 9 10:45:50 2008 @@ -170,8 +170,9 @@ unsigned volcnt; string device; string name; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; bool readonly; }; @@ -243,8 +244,9 @@ string device; string mount; MountByType mount_by; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; string fstab_options; string uuid; string label; Modified: trunk/storage/libstorage/src/StorageTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTypes.cc?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.cc (original) +++ trunk/storage/libstorage/src/StorageTypes.cc Sat Aug 9 10:45:50 2008 @@ -52,6 +52,24 @@ } + const string usedBy::device() const + { + switch (ub_type) + { + case UB_NONE: + return ""; + + case UB_LVM: + case UB_MD: + case UB_DMRAID: + return "/dev/" + ub_name; + + case UB_DM: + return "/dev/mapper/" + ub_name; + } + } + + usedBy::operator string() const { string st; Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTypes.h?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Sat Aug 9 10:45:50 2008 @@ -100,6 +100,8 @@ class usedBy { + // TODO: save device instead of name? + public: usedBy() : ub_type(storage::UB_NONE) {} usedBy(storage::UsedByType type, const string& name) : ub_type(type), ub_name(name) {} @@ -117,8 +119,9 @@ storage::UsedByType type() const { return ub_type; } const string& name() const { return ub_name; } + const string device() const; - friend std::ostream& operator<< (std::ostream&, const usedBy&); + friend std::ostream& operator<<(std::ostream&, const usedBy&); private: storage::UsedByType ub_type; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Sat Aug 9 10:45:50 2008 @@ -2695,8 +2695,9 @@ info.device = dev; info.mount = mp; info.mount_by = mount_by; - info.usedBy = uby.type(); + info.usedByType = uby.type(); info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.fstab_options = fstab_opt; info.uuid = uuid; info.label = label; Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Sat Aug 9 10:45:50 2008 @@ -56,7 +56,6 @@ void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } - const string& usedByName() const { return uby.name(); } void getFsInfo( const Volume* source ); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Sat Aug 9 10:45:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Aug 09 10:42:06 CEST 2008 - aschnell@suse.de + +- added usedByDevice in StorageInterface.h +- version 2.17.15 + +------------------------------------------------------------------- Fri Aug 08 21:56:00 CEST 2008 - aschnell@suse.de - added tab with used devices for device mapper devices @@ -7,7 +13,7 @@ ------------------------------------------------------------------- Fri Aug 08 15:01:11 CEST 2008 - aschnell@suse.de -- integrated redesigned expert partitioner into installation +- integrated redesigned expert partitioner into installation workflow - version 2.17.13 @@ -103,7 +109,7 @@ - do not attempt to install yast2-iscsi-client during installation (bnc #392972) -- version 2.16.24 +- version 2.16.24 ------------------------------------------------------------------- Mon May 19 10:45:02 CEST 2008 - aschnell@suse.de Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-dialogs.ycp?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Sat Aug 9 10:45:50 2008 @@ -229,8 +229,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; }); - list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == vgname; }); + list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == ""; }); + list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == "/dev/" + vgname; }); term contents = `VBox(); Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-dialogs.ycp?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Sat Aug 9 10:45:50 2008 @@ -267,8 +267,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map target_map = Storage::GetTargetMap(); - list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == ""; }); - list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return "/dev/" + dev["used_by"]:"" == device; }); + list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == ""; }); + list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == device; }); term contents = `VBox(); Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sat Aug 9 10:45:50 2008 @@ -51,11 +51,11 @@ global boolean no_fsid_menu = Arch::s390 (); - global string raid_name = "MD Raid"; + global string raid_name = "MD RAID"; global string lv_name = "LV"; global string dm_name = "DM"; global string loop_name = "Loop Device"; - global string dmraid_name = "DM Raid"; + global string dmraid_name = "DM RAID"; global string nfs_name = "NFS"; // filesystems for /win Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sat Aug 9 10:45:50 2008 @@ -1417,11 +1417,12 @@ t = LibStorage::VolumeInfo::swig_mount_by_get(vinfo); p["mountby"] = toSymbol( conv_mountby, t ); } - t = LibStorage::VolumeInfo::swig_usedBy_get(vinfo); + t = LibStorage::VolumeInfo::swig_usedByType_get(vinfo); if( t!=LibStorage::UB_NONE() ) { p["used_by_type"] = toSymbol( conv_usedby, t ); p["used_by"] = LibStorage::VolumeInfo::swig_usedByName_get(vinfo); + p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); if( size(tmp)>0 ) @@ -1727,7 +1728,7 @@ { list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by", "partitions", "dasdfmt", + "used_by_type", "used_by", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1751,11 +1752,12 @@ c["device"] = LibStorage::ContainerInfo::swig_device_get(info); integer t = LibStorage::ContainerInfo::swig_type_get(info); c["type"] = toSymbol( conv_ctype, t ); - t = LibStorage::ContainerInfo::swig_usedBy_get(info); + t = LibStorage::ContainerInfo::swig_usedByType_get(info); if( t!=LibStorage::UB_NONE() ) { c["used_by_type"] = toSymbol( conv_usedby, t ); c["used_by"] = LibStorage::ContainerInfo::swig_usedByName_get(info); + c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); if( b ) Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=49899&r1=49898&r2=49899&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Sat Aug 9 10:45:50 2008 @@ -394,7 +394,7 @@ case `used_by: { - string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by"]:""); + string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by_device"]:""); if (style == `table) return value; else @@ -754,25 +754,16 @@ */ global symbol PredicateUsedByDevice(map disk, map partition, list<string> devices) { - // TODO: this should come from libstorage - string UsedByDevice(map tmp) - { - if (tmp["used_by_type"]:`UB_NONE == `UB_DM) - return "/dev/mapper/" + tmp["used_by"]:""; - else - return "/dev/" + tmp["used_by"]:""; - } - if (partition == nil) { - if (contains(devices, UsedByDevice(disk))) + if (contains(devices, disk["used_by_device"]:"")) return `showandfollow; else return `follow; } else { - if (contains(devices, UsedByDevice(partition))) + if (contains(devices, partition["used_by_device"]:"")) return `show; else return `ignore; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org