[yast-commit] r56087 - in /branches/SuSE-SLE-10-SP3-Branch/repair: VERSION package/yast2-repair.changes src/OSRFstab.ycp

Author: jsuchome Date: Thu Mar 12 09:03:36 2009 New Revision: 56087 URL: http://svn.opensuse.org/viewcvs/yast?rev=56087&view=rev Log: - offer new lines in /etc/fstab with new device names (bnc#431418) - 2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/repair/VERSION branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes branches/SuSE-SLE-10-SP3-Branch/repair/src/OSRFstab.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair/VERSION?rev=56087&r1=56086&r2=56087&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/VERSION Thu Mar 12 09:03:36 2009 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes?rev=56087&r1=56086&r2=56087&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/package/yast2-repair.changes Thu Mar 12 09:03:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 12 08:35:24 CET 2009 - jsuchome@suse.cz + +- offer new lines in /etc/fstab with new device names (bnc#431418) +- 2.13.12 + +------------------------------------------------------------------- Wed Feb 27 07:31:50 CET 2008 - jsuchome@suse.cz - yast2-storage required for build (bnc#359719) Modified: branches/SuSE-SLE-10-SP3-Branch/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/repair/src/OSRFstab.ycp?rev=56087&r1=56086&r2=56087&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/repair/src/OSRFstab.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/repair/src/OSRFstab.ycp Thu Mar 12 09:03:36 2009 @@ -1003,7 +1003,10 @@ define list<term> missing_devs_items( map new_entries)``{ list<term> item_list = []; foreach (string k, map e, (map >)new_entries, ``{ - item_list = add (item_list, `item(`id(k), k, e["mount"]:"")); + string dev_label = k; + if (e["device_by"]:"" != "") + dev_label = sformat ("%1 (%2)", k, e["device_by"]:""); + item_list = add (item_list, `item(`id(k), dev_label, e["mount"]:"")); }); return item_list; } @@ -1041,6 +1044,8 @@ integer other_nr = 1; // count other mounts -> global for wirte_fstab map new_entries = $[]; + symbol mount_by = Storage::GetDefaultMountBy (); + missing_devs = sort (string d1, string d2, missing_devs , ``( d1 < d2)); foreach (string dev, missing_devs, { @@ -1056,6 +1061,7 @@ string start = "/data"; integer count = 2; + // fstabentry could be empty map for some partitions (e.g. // with LVM group) -> suggest_missing_entries could report error 4 while (contains (used_mountpoints , fstabentry["mount"]:"")) @@ -1067,6 +1073,20 @@ } if (size (fstabentry)>0) { + // we are trying to build the device name used in current + // /etc/fstab (bnc#431418) and adding it to fstab info provided + // by Storage.ycp... bleah + string device_by = ""; + // check only `id, others may require additional options + if (mount_by == `id && part["udev_id"]:[] != []) + { + device_by = "/dev/disk/by-id/" + part["udev_id",0]:""; + } + if (device_by != "") + { + fstabentry["device_by"] = device_by; + y2internal ("updated fstab entry: %1", fstabentry); + } new_entries[dev] = fstabentry; } } @@ -1276,7 +1296,8 @@ integer fack_lnr = 0; foreach (string k, map e, (map >)new_entries, ``{ if (e["spec"]:"" != "" && e["mount"]:"" != ""){ - list<string> fstlist = [ k , e["mount"]:"", + string dev = e["device_by"]:k; + list<string> fstlist = [ dev , e["mount"]:"", e["vfstype"]:"", e["mntops"]:"", sformat ("%1",e["freq"]:nil), sformat ("%1",e["passno"]:nil) ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org