Author: juhliarik Date: Thu Oct 16 10:07:58 2008 New Revision: 52279 URL: http://svn.opensuse.org/viewcvs/yast?rev=52279&view=rev Log: added fix for nahdling mountpoints on installed system bcn #431977 Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=52279&r1=52278&r2=52279&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Oct 16 10:07:58 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 16 10:05:03 CEST 2008 - juhliarik@suse.cz + +- added fix for handling mounpoints (bnc #431977) + +------------------------------------------------------------------- Wed Oct 15 12:21:51 CEST 2008 - jsrain@suse.cz - handle multipath devices properly when creating device map Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_iface.ycp?rev=52279&r1=52278&r2=52279&view=diff ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Thu Oct 16 10:07:58 2008 @@ -57,22 +57,7 @@ integer tmp_sz = size (tmpdir); return is (v, string) && substring (k, 0, tmp_sz) != tmpdir; }); - if (! Stage::initial ()) - { - // get what's really mounted - list<map<string,any> > mounted_list = (list<map<string,any> >) - SCR::Read (.proc.mounts); - map<string,string> mounted = listmap (map<string,any> m, mounted_list, { - // make partition canonical ("/dev/disk/by-id/..." -> "/dev/sda5") - map p = Storage::GetPartition( tm, m["spec"]:"" ); - y2debug ("Translated device %1 to canonical device %2", m["spec"]:"", p["device"]:""); - return $[ m["file"]:"" : p["device"]:"" ]; - }); - y2milestone ("Really mounted: %1", mounted); - mountpoints = filter (string k, any v, mountpoints, { - return mounted[k]:nil == v; - }); - } + y2milestone ("Detected mountpoints: %1", mountpoints); list<list<list> > pi = maplist (string disk, map info, tm, Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=52279&r1=52278&r2=52279&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Oct 16 10:07:58 2008 @@ -599,7 +599,7 @@ // 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]:""); + 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; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org