Hello community,
here is the log from the commit of package yast2-repair
checked in at Fri Nov 7 15:55:35 CET 2008.
--------
--- yast2-repair/yast2-repair.changes 2008-11-06 12:53:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-repair/yast2-repair.changes 2008-11-07 13:24:55.271874000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 7 13:17:16 CET 2008 - jsuchome@suse.cz
+
+- offer new lines in /etc/fstab with new device names (bnc#431418)
+- 2.17.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-repair-2.17.6.tar.bz2
New:
----
yast2-repair-2.17.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.d32542/_old 2008-11-07 15:55:27.000000000 +0100
+++ /var/tmp/diff_new_pack.d32542/_new 2008-11-07 15:55:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-repair (Version 2.17.6)
+# spec file for package yast2-repair (Version 2.17.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-repair
-Version: 2.17.6
+Version: 2.17.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-repair-2.17.6.tar.bz2
+Source0: yast2-repair-2.17.7.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-storage yast2-testsuite yast2-update
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage yast2-update
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-repair-2.17.6
+%setup -n yast2-repair-2.17.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,9 @@
/usr/share/YaST2/include/repair/*
%doc %{prefix}/share/doc/packages/yast2-repair
%changelog
+* Fri Nov 07 2008 jsuchome@suse.cz
+- offer new lines in /etc/fstab with new device names (bnc#431418)
+- 2.17.7
* Thu Nov 06 2008 jsuchome@suse.cz
- added "Boot Installed System" option to Repair Tools (bnc#441188)
(copied from inst_mode.ycp of 10.3)
++++++ yast2-repair-2.17.6.tar.bz2 -> yast2-repair-2.17.7.tar.bz2 ++++++
++++ 4044 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/configure.in new/yast2-repair-2.17.7/configure.in
--- old/yast2-repair-2.17.6/configure.in 2008-04-14 13:44:38.000000000 +0200
+++ new/yast2-repair-2.17.7/configure.in 2008-11-07 10:38:53.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-repair
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-repair, 2.16.8, http://bugs.opensuse.org/, yast2-repair)
+AC_INIT(yast2-repair, 2.17.6, http://bugs.opensuse.org/, yast2-repair)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.8"
+VERSION="2.17.6"
RPMNAME="yast2-repair"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/src/inst_repair.ycp new/yast2-repair-2.17.7/src/inst_repair.ycp
--- old/yast2-repair-2.17.6/src/inst_repair.ycp 2008-11-06 11:05:45.000000000 +0100
+++ new/yast2-repair-2.17.7/src/inst_repair.ycp 2008-11-07 09:11:20.000000000 +0100
@@ -12,7 +12,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: inst_repair.ycp 35103 2007-01-05 13:36:05Z jsuchome $
+ * $Id: inst_repair.ycp 52975 2008-11-06 11:54:08Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/src/OSRFstab.ycp new/yast2-repair-2.17.7/src/OSRFstab.ycp
--- old/yast2-repair-2.17.6/src/OSRFstab.ycp 2008-10-30 16:18:06.000000000 +0100
+++ new/yast2-repair-2.17.7/src/OSRFstab.ycp 2008-11-07 13:14:59.000000000 +0100
@@ -1094,7 +1094,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;
}
@@ -1132,6 +1135,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, {
@@ -1147,6 +1152,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"]:""))
@@ -1158,6 +1164,22 @@
}
if (size (fstabentry)>0)
{
+ // this is ugly hack - no, this hack could be the definition
+ // of ugliness, it is the ugliness in its deepest form
+ // so: 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;
}
}
@@ -1358,7 +1380,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) ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/src/osr_module_partition.ycp new/yast2-repair-2.17.7/src/osr_module_partition.ycp
--- old/yast2-repair-2.17.6/src/osr_module_partition.ycp 2008-11-06 11:14:22.000000000 +0100
+++ new/yast2-repair-2.17.7/src/osr_module_partition.ycp 2008-11-07 09:11:20.000000000 +0100
@@ -11,7 +11,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: osr_module_partition.ycp 47796 2008-05-22 13:09:40Z jsuchome $
+ * $Id: osr_module_partition.ycp 52975 2008-11-06 11:54:08Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/src/OSRRepairUI.ycp new/yast2-repair-2.17.7/src/OSRRepairUI.ycp
--- old/yast2-repair-2.17.6/src/OSRRepairUI.ycp 2008-11-06 11:09:36.000000000 +0100
+++ new/yast2-repair-2.17.7/src/OSRRepairUI.ycp 2008-11-07 09:11:20.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: UI functions
* Authors: Johannes Buchhold
*
- * $Id: OSRRepairUI.ycp 48157 2008-06-09 11:07:05Z jsuchome $
+ * $Id: OSRRepairUI.ycp 52975 2008-11-06 11:54:08Z jsuchome $
*/
{
module "OSRRepairUI";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.17.6/VERSION new/yast2-repair-2.17.7/VERSION
--- old/yast2-repair-2.17.6/VERSION 2008-11-06 11:05:52.000000000 +0100
+++ new/yast2-repair-2.17.7/VERSION 2008-11-07 13:18:03.000000000 +0100
@@ -1 +1 @@
-2.17.6
+2.17.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org