April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56546 - /tags/branch-SLE-10-SP2-2_13_79/
by charlesa＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: charlesa Date: Wed Apr 1 17:02:24 2009 New Revision: 56546 URL: http://svn.opensuse.org/viewcvs/yast?rev=56546&view=rev Log: Created tag branch-SLE-10-SP2-2_13_79 Added: tags/branch-SLE-10-SP2-2_13_79/ -- 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] r56545 - in /branches/SuSE-SLE-10-SP2-Branch/vm: VERSION package/yast2-vm.changes src/vm_finish.ycp
by charlesa＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: charlesa Date: Wed Apr 1 17:01:57 2009 New Revision: 56545 URL: http://svn.opensuse.org/viewcvs/yast?rev=56545&view=rev Log: bnc#488598 - chkconfig and insserv fail on init scripts that depend on /etc/init.d/boot.clock in Xen domU Modified: branches/SuSE-SLE-10-SP2-Branch/vm/VERSION branches/SuSE-SLE-10-SP2-Branch/vm/package/yast2-vm.changes branches/SuSE-SLE-10-SP2-Branch/vm/src/vm_finish.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/vm/VER… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/vm/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/vm/VERSION Wed Apr 1 17:01:57 2009 @@ -1 +1 @@ -2.13.78 +2.13.79 Modified: branches/SuSE-SLE-10-SP2-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/vm/pac… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/vm/package/yast2-vm.changes Wed Apr 1 17:01:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 1 08:59:31 MDT 2009 - carnold(a)novell.com + +- bnc#488598 - chkconfig and insserv fail on init scripts that + depend on /etc/init.d/boot.clock in Xen domU + +------------------------------------------------------------------- Thu Apr 3 15:06:18 MDT 2008 - carnold(a)novell.com - bnc#375482 - Xen networking does not work with the firewall Modified: branches/SuSE-SLE-10-SP2-Branch/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/vm/src… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/vm/src/vm_finish.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/vm/src/vm_finish.ycp Wed Apr 1 17:01:57 2009 @@ -89,15 +89,6 @@ } ); - // these services need force option to disable them - list<string> disable_services_force = ["boot.clock"]; - y2milestone("disabling services (forced): %1", disable_services_force); - foreach(string s, disable_services_force, { - integer disabled = (integer) SCR::Execute(.target.bash, sformat("/sbin/insserv -r -f %1", s)); - y2milestone("insserv-force: service %1 disabled: %2", s, (disabled == 0) ? true : false); - } - ); - // We no longer need to do remove these entries now that we use xvc //SCR::Execute(.target.bash, "/bin/sed -i 's/.*mingetty tty[2-9]$//' /etc/inittab"); -- 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] r56544 - in /trunk/storage/libstorage/src: Dasd.cc Disk.cc ProcPart.cc ProcPart.h
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 16:55:29 2009 New Revision: 56544 URL: http://svn.opensuse.org/viewcvs/yast?rev=56544&view=rev Log: - templated programming Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/ProcPart.cc trunk/storage/libstorage/src/ProcPart.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 Wed Apr 1 16:55:29 2009 @@ -199,9 +199,9 @@ if( !reg.empty() && reg.find( '/' )!=string::npos && isdigit(reg[reg.length()-1]) ) reg += "p"; - reg += "[0-9]+"; - list<string> ps = ppart.getMatchingEntries( reg ); - y2mil("regex " << reg << " ps " << ps); + reg = "^" + reg + "[0-9]+" "$"; + list<string> ps = ppart.getMatchingEntries(regex_matches(reg)); + y2mil("regex:\"" << reg << "\" ps:" << ps); unsigned long dummy = 0; if( !checkPartedValid( ppart, nm, pl, dummy ) ) { 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 Wed Apr 1 16:55:29 2009 @@ -872,9 +872,9 @@ if( !reg.empty() && reg.find( '/' )!=string::npos && isdigit(reg[reg.length()-1]) ) reg += "p"; - reg += "[0-9]+"; - list<string> ps = pp.getMatchingEntries( reg ); - y2mil("regex " << reg << " ps " << ps); + reg = "^" + reg + "[0-9]+" "$"; + list<string> ps = pp.getMatchingEntries(regex_matches(reg)); + y2mil("regex:\"" << reg << "\" ps:" << ps); for( list<string>::const_iterator i=ps.begin(); i!=ps.end(); i++ ) { pair<string,unsigned> p = getDiskPartition( *i ); Modified: trunk/storage/libstorage/src/ProcPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.… ============================================================================== --- trunk/storage/libstorage/src/ProcPart.cc (original) +++ trunk/storage/libstorage/src/ProcPart.cc Wed Apr 1 16:55:29 2009 @@ -5,7 +5,6 @@ #include "y2storage/AppUtil.h" -#include "y2storage/Regex.h" #include "y2storage/StorageTmpl.h" #include "y2storage/AsciiFile.h" #include "y2storage/ProcPart.h" @@ -59,15 +58,11 @@ list<string> - ProcPart::getMatchingEntries(const string& regexp) const + ProcPart::getEntries() const { - Regex reg("^" + regexp + "$"); list<string> ret; for (map<string, unsigned long long>::const_iterator i = data.begin(); i != data.end(); ++i) - { - if (reg.match(i->first)) - ret.push_back(i->first); - } + ret.push_back(i->first); return ret; } Modified: trunk/storage/libstorage/src/ProcPart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.… ============================================================================== --- trunk/storage/libstorage/src/ProcPart.h (original) +++ trunk/storage/libstorage/src/ProcPart.h Wed Apr 1 16:55:29 2009 @@ -24,7 +24,17 @@ bool getSize(const string& device, unsigned long long& sizeK) const; - list<string> getMatchingEntries(const string& regexp) const; + list<string> getEntries() const; + + template<class Pred> + list<string> getMatchingEntries(Pred pred) const + { + list<string> ret; + for (map<string, unsigned long long>::const_iterator i = data.begin(); i != data.end(); ++i) + if (pred(i->first)) + ret.push_back(i->first); + return ret; + } protected: -- 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] r56543 - in /trunk/bootloader/src: modules/BootLILO.ycp modules/BootPOWERLILO.ycp routines/lib_iface.ycp routines/lilolike.ycp
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 16:54:51 2009 New Revision: 56543 URL: http://svn.opensuse.org/viewcvs/yast?rev=56543&view=rev Log: - use 'used_by_device' instead of 'used_by' Modified: trunk/bootloader/src/modules/BootLILO.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp 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 Wed Apr 1 16:54:51 2009 @@ -242,7 +242,7 @@ }); // filter partitions to relevant list according to raid name - list<map> md_list = filter (map e, partitions, ``(e["used_by"]:"" == substring(device,5))); + list<map> md_list = filter (map e, partitions, ``(e["used_by_device"]:"" == device)); // get the devices list<string> dev_list = maplist (map e, md_list, ``(e["device"]:"")); dev_list = filter (string d, dev_list, ``(d != "")); 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 1 16:54:51 2009 @@ -177,7 +177,7 @@ foreach (string dev, map info, tm, { list<map> partitions = info["partitions"]:[]; foreach (map p, partitions, { - if (p["used_by"]:"" == vg) { + if (p["used_by_device"]:"" == "/dev/" + vg) { root_disks = add (root_disks, dev); } }); 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 1 16:54:51 2009 @@ -121,12 +121,11 @@ list<list> parts = maplist (map p, (list<map>)partitions, { string raid = ""; if( p["used_by_type"]:`UB_NONE==`UB_MD ) - raid = p["used_by"]:""; + 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 != "") { - raid = "/dev/" + raid; if (haskey (md_info, raid)) { list<string> members = md_info[raid]:[]; members = add (members, device); 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 1 16:54:51 2009 @@ -380,7 +380,7 @@ list<map<string,any> > partitions = (list<map<string,any> >) descr["partitions"]:[]; foreach (map<string,any> partition, partitions, ``{ - if (partition["used_by"]:"" == substring(md_device,5)) + if (partition["used_by_device"]:"" == md_device) { string d = (string)(partition["device"]:""); ret[d] = bios_id; -- 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] r56542 - in /trunk/autoinstallation/src/modules: AutoinstLVM.ycp AutoinstPartPlan.ycp
by ug＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: ug Date: Wed Apr 1 16:23:30 2009 New Revision: 56542 URL: http://svn.opensuse.org/viewcvs/yast?rev=56542&view=rev Log: storage lib compatibility with "used_by" Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Wed Apr 1 16:23:30 2009 @@ -171,7 +171,7 @@ // all possible PVs on all available devices list<map> all_possible_pvs = filter( map part, get_possible_pvs( Storage::GetTargetMap() ), - ``( ((part["used_by_device"]:"" == vgname && part["used_by_type"]:`UB_NONE == usedBy ) || + ``( ((part["used_by_device"]:"" == "/dev/"+vgname && part["used_by_type"]:`UB_NONE == usedBy ) || part["used_by_type"]:`UB_NONE == `UB_NONE) && !part["delete"]:false )); y2milestone("all pvs= %1", all_possible_pvs); Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Wed Apr 1 16:23:30 2009 @@ -430,7 +430,7 @@ // LVM Group if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_LVM) { - new_pe["lvm_group"] = pe["used_by_device"]:""; + new_pe["lvm_group"] = substring(pe["used_by_device"]:"", 5); } // LV @@ -441,7 +441,7 @@ } if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_MD) { - new_pe["raid_name"] = "/dev/"+pe["used_by_device"]:""; + new_pe["raid_name"] = pe["used_by_device"]:""; } // Used 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] r56541 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp src/modules/AutoinstPartPlan.ycp
by ug＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: ug Date: Wed Apr 1 16:11:16 2009 New Revision: 56541 URL: http://svn.opensuse.org/viewcvs/yast?rev=56541&view=rev Log: storage lib compatibility with "used_by" Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Apr 1 16:11:16 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 1 16:11:08 CEST 2009 - ug(a)suse.de + +- storage lib compatibility with "used_by" + +------------------------------------------------------------------- Tue Mar 31 15:38:16 CEST 2009 - locilka(a)suse.cz - Adapted to RootPart API cleanup. Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Wed Apr 1 16:11:16 2009 @@ -171,7 +171,7 @@ // all possible PVs on all available devices list<map> all_possible_pvs = filter( map part, get_possible_pvs( Storage::GetTargetMap() ), - ``( ((part["used_by"]:"" == vgname && part["used_by_type"]:`UB_NONE == usedBy ) || + ``( ((part["used_by_device"]:"" == vgname && part["used_by_type"]:`UB_NONE == usedBy ) || part["used_by_type"]:`UB_NONE == `UB_NONE) && !part["delete"]:false )); y2milestone("all pvs= %1", all_possible_pvs); Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Wed Apr 1 16:11:16 2009 @@ -430,7 +430,7 @@ // LVM Group if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_LVM) { - new_pe["lvm_group"] = pe["used_by"]:""; + new_pe["lvm_group"] = pe["used_by_device"]:""; } // LV @@ -441,7 +441,7 @@ } if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_MD) { - new_pe["raid_name"] = "/dev/"+pe["used_by"]:""; + new_pe["raid_name"] = "/dev/"+pe["used_by_device"]:""; } // Used 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] r56540 - in /trunk/storage/libstorage/src: Dasd.cc Disk.cc DmPartCo.cc LvmVg.cc MdCo.cc NfsCo.cc Storage.cc Storage.h Volume.cc
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 16:04:43 2009 New Revision: 56540 URL: http://svn.opensuse.org/viewcvs/yast?rev=56540&view=rev Log: - make some functions const/static - some cleanup Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/NfsCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc 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 Wed Apr 1 16:04:43 2009 @@ -405,7 +405,7 @@ if( i->created() ) { unsigned long long s; - getStorage()->waitForDevice( i->device() ); + Storage::waitForDevice(i->device()); i->setCreated( false ); if( ppart.getSize( i->device(), s )) { 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 Wed Apr 1 16:04:43 2009 @@ -2015,7 +2015,7 @@ if( ret==0 ) { if( !dmp_slave ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); p->changeIdDone(); } } @@ -2251,7 +2251,7 @@ if( !dmp_slave ) { if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); else Storage::waitForDevice(); if( p->type()==LOGICAL && getStorage()->instsys() ) @@ -2274,7 +2274,7 @@ y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { - ret = getStorage()->zeroDevice(p->device(), p->sizeK()); + ret = Storage::zeroDevice(p->device(), p->sizeK()); } else if( !dmp_slave && !p->getFormat() ) { @@ -2298,7 +2298,7 @@ { SystemCmd c("/sbin/blockdev --rereadpt " + quote(device())); if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); } } else @@ -2540,7 +2540,7 @@ ret = DISK_RESIZE_PARTITION_PARTED_FAILED; } if( ret==0 && !dmp_slave ) - getStorage()->waitForDevice( p->device() ); + Storage::waitForDevice(p->device()); if( !getPartedValues( p )) { if( ret==0 ) 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 Wed Apr 1 16:04:43 2009 @@ -777,7 +777,7 @@ l->updateSize( pp ); } if( p->type()!=EXTENDED ) - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); } y2mil("ret:" << ret); return( ret ); @@ -876,7 +876,7 @@ ProcPart pp; updateMinor(); l->updateSize( pp ); - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); } if( ret==0 && remount ) ret = l->mount(); Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Apr 1 16:04:43 2009 @@ -32,7 +32,7 @@ getVgData( Name, false ); LvmLvPair p=lvmLvPair(lvNotCreated); if( !p.empty() ) - getStorage()->waitForDevice( p.begin()->device() ); + Storage::waitForDevice(p.begin()->device()); } else { @@ -1367,7 +1367,7 @@ } if( ret==0 ) { - getStorage()->waitForDevice( l->device() ); + Storage::waitForDevice(l->device()); l->setCreated(false); getVgData( name() ); checkConsistency(); Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Apr 1 16:04:43 2009 @@ -613,14 +613,14 @@ } if( ret==0 ) { - getStorage()->waitForDevice( m->device() ); + Storage::waitForDevice(m->device()); getMdData( m->nr() ); updateEntry( m ); bool used_as_pv = m->getUsedByType() == UB_LVM; y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { - ret = getStorage()->zeroDevice(m->device(), m->sizeK()); + ret = Storage::zeroDevice(m->device(), m->sizeK()); } } } 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 Wed Apr 1 16:04:43 2009 @@ -183,8 +183,7 @@ n->setFstabOption( boost::join(i->opts, "," ) ); addToList( n ); } - unsigned long long sz = getStorage()->getDfSize( i->mount ); - n->setSize( sz ); + n->setSize(Storage::getDfSize(i->mount)); } } l.clear(); 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 Wed Apr 1 16:04:43 2009 @@ -4821,7 +4821,7 @@ ret = false; danglingUsedBy[dev] = storage::usedBy(ub_type, ub_name); y2mil("adding ub_type:" << ub_type << " ub_name:" << ub_name << - " for dev: " << dev << " to dangling usedby"); + " for dev:" << dev << " to dangling usedby"); } } else @@ -5040,16 +5040,19 @@ return( ret ); } -bool Storage::deletedDevice( const string& dev ) - { - VPair p = vPair( Volume::isDeleted ); - VolIterator v = p.begin(); + +bool +Storage::deletedDevice(const string& dev) const +{ + ConstVolPair p = volPair(Volume::isDeleted); + ConstVolIterator v = p.begin(); while( v!=p.end() && v->device()!=dev ) ++v; bool ret = v!=p.end(); y2mil("dev:" << dev << " ret:" << ret); - return( ret ); - } + return ret; +} + bool Storage::isDisk( const string& dev ) { @@ -5093,8 +5096,10 @@ return( ret ); } -string Storage::deviceByNumber( const string& majmin ) - { + +string +Storage::deviceByNumber(const string& majmin) const +{ string ret=""; string::size_type pos = majmin.find( ":" ); if( pos!=string::npos ) @@ -5130,8 +5135,9 @@ } } y2mil("majmin:" << majmin << " ret:" << ret); - return( ret ); - } + return ret; +} + unsigned long long Storage::deviceSize( const string& dev ) { @@ -5344,9 +5350,10 @@ return( ret ); } -unsigned long long -Storage::getDfSize( const string& mp ) - { + +unsigned long long +Storage::getDfSize(const string& mp) +{ unsigned long long ret = 0; struct statvfs64 fsbuf; if( statvfs64( mp.c_str(), &fsbuf )==0 ) @@ -5362,8 +5369,9 @@ y2war( "errno:" << errno << " " << strerror(errno)); } y2mil( "mp:" << mp << " ret:" << ret ); - return( ret ); - } + return ret; +} + bool Storage::getFreeInfo( const string& device, unsigned long long& resize_free, @@ -5779,7 +5787,7 @@ int -Storage::waitForDevice(const string& device) const +Storage::waitForDevice(const string& device) { int ret = 0; waitForDevice(); @@ -5803,22 +5811,6 @@ } -void Storage::checkDeviceExclusive( const string& device, unsigned secs ) -{ - const int delay = 50000; - const unsigned count = secs * 1000000/delay; - y2mil( "dev:" << device << " sec:" << secs << " count:" << count ); - for( unsigned i=0; i<count; i++ ) - { - int fd = open( device.c_str(), O_RDONLY|O_EXCL ); - y2mil( "count:" << i << " fd:" << fd ); - if( fd>=0 ) - close(fd); - usleep( delay ); - } -} - - int Storage::zeroDevice(const string& device, unsigned long long sizeK, bool random, unsigned long long startK, unsigned long long endK) 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 Wed Apr 1 16:04:43 2009 @@ -241,11 +241,11 @@ bool setDmcryptData( const string& dev, const string& dm, unsigned dmnum, unsigned long long siz, storage::EncryptType typ ); - bool deletedDevice( const string& dev ); + bool deletedDevice(const string& dev) const; bool isDisk( const string& dev ); const Volume* getVolume( const string& dev ); unsigned long long deviceSize( const string& dev ); - string deviceByNumber( const string& majmin ); + string deviceByNumber(const string& majmin) const; void rootMounted(); bool isRootMounted() const { return( root_mounted ); } string findNormalDevice( const string& device ); @@ -382,7 +382,7 @@ unsigned long long& df_free, unsigned long long& used, bool& win, bool& efi, bool use_cache ); - unsigned long long getDfSize( const string& mp ); + static unsigned long long getDfSize(const string& mp); int createBackupState( const string& name ); int removeBackupState( const string& name ); int restoreBackupState( const string& name ); @@ -448,10 +448,10 @@ void eraseFreeInfo( const string& device ); static void waitForDevice(); - int waitForDevice(const string& device) const; - void checkDeviceExclusive( const string& device, unsigned secs ); - int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, - unsigned long long beginK = 200, unsigned long long endK = 10); + static int waitForDevice(const string& device); + + static int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, + unsigned long long beginK = 200, unsigned long long endK = 10); void getDiskList( bool (* CheckFnc)( const Disk& ), std::list<Disk*>& dl ); 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 Wed Apr 1 16:04:43 2009 @@ -708,7 +708,7 @@ } if( ret==0 && encryption!=ENC_NONE ) { - ret = cont->getStorage()->zeroDevice(mountDevice(), size_k, true); + ret = Storage::zeroDevice(mountDevice(), size_k, true); } if( ret==0 && mountDevice()!=dev && !cont->getStorage()->test() ) { @@ -1667,7 +1667,7 @@ string use_dev = dmcrypt_dev; if( c.retcode()==0 ) { - cont->getStorage()->waitForDevice( use_dev ); + Storage::waitForDevice(use_dev); updateFsData(); if( detected_fs!=FSUNKNOWN ) { @@ -1768,7 +1768,7 @@ unlink( fname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); } - cont->getStorage()->waitForDevice( loop_dev ); + Storage::waitForDevice(loop_dev); } if( ret==0 ) { @@ -1890,7 +1890,7 @@ } unlink( fname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); - cont->getStorage()->waitForDevice( dmcrypt_dev ); + Storage::waitForDevice(dmcrypt_dev); } if( ret==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] r56539 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 15:54:42 2009 New Revision: 56539 URL: http://svn.opensuse.org/viewcvs/yast?rev=56539&view=rev Log: - added one more bug number Modified: trunk/storage/package/yast2-storage.changes 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 Wed Apr 1 15:54:42 2009 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Apr 01 12:11:44 CEST 2009 - aschnell(a)suse.de -- improved used-by handling during detection (fixes bnc #472803) +- improved used-by handling during detection (fixes bnc #472803 + and partly bnc #391281) - 2.18.10 ------------------------------------------------------------------- -- 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] r56538 - /branches/tmp/gs/ncurses/
by gs＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: gs Date: Wed Apr 1 14:27:44 2009 New Revision: 56538 URL: http://svn.opensuse.org/viewcvs/yast?rev=56538&view=rev Log: create a tmp branch Added: branches/tmp/gs/ncurses/ - copied from r56536, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56537 - /tags/branch-Code-11-2_17_16/sound/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:27:37 2009 New Revision: 56537 URL: http://svn.opensuse.org/viewcvs/yast?rev=56537&view=rev Log: Created tag branch-Code-11-2_17_16 for sound Added: tags/branch-Code-11-2_17_16/sound/ - copied from r56536, branches/SuSE-Code-11-Branch/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0