Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Tue Apr 20 02:08:04 CEST 2010.
--------
--- yast2-storage/yast2-storage.changes 2010-04-16 14:29:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-04-19 14:14:07.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 19 12:17:36 CEST 2010 - aschnell@suse.de
+
+- added list of possible root filesystems to FileSystems module
+- 2.19.12
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.19.11.tar.bz2
New:
----
yast2-storage-2.19.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.YlI32c/_old 2010-04-20 02:07:49.000000000 +0200
+++ /var/tmp/diff_new_pack.YlI32c/_new 2010-04-20 02:07:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.19.11)
+# spec file for package yast2-storage (Version 2.19.12)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-storage
-Version: 2.19.11
+Version: 2.19.12
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.19.11.tar.bz2
+Source0: yast2-storage-2.19.12.tar.bz2
Prefix: /usr
@@ -56,7 +56,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.19.11
+%setup -n yast2-storage-2.19.12
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.19.11.tar.bz2 -> yast2-storage-2.19.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.11/VERSION new/yast2-storage-2.19.12/VERSION
--- old/yast2-storage-2.19.11/VERSION 2010-04-09 15:35:12.000000000 +0200
+++ new/yast2-storage-2.19.12/VERSION 2010-04-19 12:13:11.000000000 +0200
@@ -1 +1 @@
-2.19.11
+2.19.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.11/configure new/yast2-storage-2.19.12/configure
--- old/yast2-storage-2.19.11/configure 2010-04-16 15:59:29.000000000 +0200
+++ new/yast2-storage-2.19.12/configure 2010-04-19 14:12:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.11.
+# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.19.11'
-PACKAGE_STRING='yast2-storage 2.19.11'
+PACKAGE_VERSION='2.19.12'
+PACKAGE_STRING='yast2-storage 2.19.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1537,7 +1537,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.19.11 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.19.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1608,7 +1608,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.19.11:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.19.12:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.19.11
+yast2-storage configure 2.19.12
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1734,7 +1734,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.19.11, which was
+It was created by yast2-storage $as_me 2.19.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2714,7 +2714,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.19.11'
+ VERSION='2.19.12'
cat >>confdefs.h <<_ACEOF
@@ -2836,7 +2836,7 @@
-VERSION="2.19.11"
+VERSION="2.19.12"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -17373,7 +17373,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.19.11, which was
+This file was extended by yast2-storage $as_me 2.19.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17436,7 +17436,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-storage config.status 2.19.11
+yast2-storage config.status 2.19.12
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.11/configure.in new/yast2-storage-2.19.12/configure.in
--- old/yast2-storage-2.19.11/configure.in 2010-04-16 15:59:20.000000000 +0200
+++ new/yast2-storage-2.19.12/configure.in 2010-04-19 14:12:38.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.19.11, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.19.12, http://bugs.opensuse.org/, yast2-storage)
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.19.11"
+VERSION="2.19.12"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.11/storage/src/include/ep-import.ycp new/yast2-storage-2.19.12/storage/src/include/ep-import.ycp
--- old/yast2-storage-2.19.11/storage/src/include/ep-import.ycp 2010-04-16 15:53:37.000000000 +0200
+++ new/yast2-storage-2.19.12/storage/src/include/ep-import.ycp 2010-04-19 12:08:53.000000000 +0200
@@ -70,17 +70,16 @@
* Find and read fstab by installation. Scan existing partitions.
* @parm target_map all targets
* @parm search_point mount point where partitions can be mounted
- * @return list list with fstab data found
+ * @return map map with device and fstab data found
*/
- list<list> FindExistingFstabs(map target_map, string search_point)
+ map FindExistingFstabs(map target_map, string search_point)
{
- list<list> fstabs = [];
- list<symbol> skip_fs = [ `none, `unknown, `swap, `vfat, `ntfs ];
+ map fstabs = $[];
foreach( string disk_device, map disk, target_map, {
list<map> partitions = filter(map part, disk["partitions"]:[], {
- return !contains(skip_fs, part["detected_fs"]:`unknown);
+ return contains(FileSystems::possible_root_fs, part["detected_fs"]:`unknown);
});
foreach(map part, partitions, {
@@ -130,7 +129,7 @@
}
if (!isempty(fstab))
- fstabs = add(fstabs, fstab);
+ fstabs[part_device] = fstab;
}
}
@@ -146,82 +145,67 @@
/**
- * Scan and Read and return fstab.
+ * Scan and Read and return fstabs.
* @parm target_map all targets
- * @parm file_systems filesystem map
- * @return list list with fstab
+ * @return map map with device and fstab data found
*/
- list<list> ScanAndReadExistingFstabs(map target_map)
+ map ScanAndReadExistingFstabs(map target_map)
{
string search_point = Directory::tmpdir + "/tmp-mp";
if (!((map) SCR::Read(.target.stat, search_point))["isdir"]:false)
SCR::Execute(.target.mkdir, search_point);
- list<list> fstabs = FindExistingFstabs(target_map, search_point);
+ map fstabs = FindExistingFstabs(target_map, search_point);
- return fstabs;
+ return fstabs;
}
/**
* Merge fstab with target_map.
*/
- map AddFstabToTargetMap(map target_map, list<map> fstab, boolean format_sys)
+ map AddFstabToTargetMap(map target_map, list<map> fstab, boolean format_sys)
{
y2milestone("AddFstabToTargetMap fstab:%1", fstab);
- string root = "";
-
- map new_target_map = target_map;
-
- foreach( string disk_device, map disk, target_map, {
+ map new_target_map = mapmap(string disk_device, map disk, target_map, {
- list new_partitions = [];
+ disk["partitions"] = maplist(map partition, disk["partitions"]:[], {
- foreach( map partition, disk["partitions"]:[], {
+ string part_device = partition["device"]:"";
- map new_partition = partition;
-
- string part_device = partition["device"]:"";
-
- foreach( map fstab_entry, fstab, {
+ if (!Storage::IsInstallationSource(part_device))
+ {
+ foreach(map fstab_entry, fstab, {
- string dev_fstab = fstab_entry["device"]:"";
- string mount_fstab = fstab_entry["mount"]:"";
+ string dev_fstab = fstab_entry["device"]:"";
+ string mount_fstab = fstab_entry["mount"]:"";
- if (dev_fstab == part_device && !Storage::IsInstallationSource(part_device))
- {
- new_partition["mount"] = mount_fstab;
- if (format_sys && FileSystems::IsSystemMp(mount_fstab, false))
- new_partition["format"] = true;
- if( !isempty(fstab_entry["fstopt"]:"") &&
- fstab_entry["fstopt"]:"" != "default" )
+ if (dev_fstab == part_device)
{
- new_partition["fstopt"] = fstab_entry["fstopt"]:"";
+ partition["mount"] = mount_fstab;
+ if (format_sys && FileSystems::IsSystemMp(mount_fstab, false))
+ partition["format"] = true;
+ if (!isempty(fstab_entry["fstopt"]:"") && fstab_entry["fstopt"]:"" != "default")
+ partition["fstopt"] = fstab_entry["fstopt"]:"";
+ if (fstab_entry["mountby"]:`device != `device)
+ partition["mountby"] = fstab_entry["mountby"]:`device;
+ if (fstab_entry["enc_type"]:`none != `none)
+ partition["enc_type"] = fstab_entry["enc_type"]:`none;
}
- if( fstab_entry["mountby"]:`device != `device )
- new_partition["mountby"] = fstab_entry["mountby"]:`device;
- if( fstab_entry["enc_type"]:`none != `none )
- new_partition["enc_type"] = fstab_entry["enc_type"]:`none;
+ });
+ }
- if (mount_fstab == "/")
- root = dev_fstab;
- }
- });
- new_partitions = add( new_partitions, new_partition);
+ return partition;
});
- disk["partitions"] = new_partitions;
- new_target_map[disk_device] = disk;
+
+ return $[ disk_device : disk ];
});
- map ret = $[
- "root" : root,
- "new_target_map" : new_target_map
- ];
+ y2milestone("AddFstabToTargetMap new_target_map:%1", new_target_map);
- y2milestone("AddFstabToTargetMap ret:%1", ret);
- return ret;
+ return new_target_map;
}
@@ -231,7 +215,7 @@
* Ask the user if he like to use the new or old target_map
* (with or without found mountpoints)
*/
- integer FstabAddDialog(map target_map, list<list> fstabs, boolean& format_sys)
+ string FstabAddDialog(map target_map, map fstabs, boolean& format_sys)
{
y2milestone("FstabAddDialog target_map:%1", target_map);
y2milestone("FstabAddDialog fstabs:%1", fstabs);
@@ -240,9 +224,11 @@
{
// popup text
Popup::Message(_("No previous system with mount points was detected."));
- return -1;
+ return "";
}
+ list<string> devices = maplist(string device, list fstab, fstabs, { return device; });
+
list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `type, `fs_type,
`label, `mount_point ]);
@@ -298,17 +284,19 @@
repeat
{
- list<map> fstab = (list<map>) fstabs[idx]:[];
+ string device = devices[idx]:"";
+
+ list<map> fstab = (list<map>) fstabs[device]:[];
- map tmp = AddFstabToTargetMap(target_map, fstab, format_sys);
+ map new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys);
// popup text %1 is replaced by a device name (e.g. /dev/hda1)
string str = sformat(
_("A previous system with the following mount points was detected:
-/etc/fstab found on %1"), tmp["root"]:"error");
+/etc/fstab found on %1"), device);
UI::ReplaceWidget( `id(`heading), `Heading( str ) );
- list<term> table_contents = StorageFields::TableContents(fields, tmp["new_target_map"]:$[],
+ list<term> table_contents = StorageFields::TableContents(fields, new_target_map,
StorageFields::PredicateMountpoint);
UI::ChangeWidget(`id(`table), `Items, table_contents);
UI::ChangeWidget(`id(`table), `CurrentItem, nil);
@@ -340,9 +328,9 @@
UI::CloseDialog();
- integer ret = userinput == `ok ? idx : -1;
- y2milestone("FstabAddDialog ret:%1", ret);
- return ret;
+ string device = userinput == `ok ? devices[idx]:"" : "";
+ y2milestone("FstabAddDialog device:%1", device);
+ return device;
}
@@ -353,19 +341,17 @@
map target_map = Storage::GetOndiskTarget();
- list<list> fstabs = ScanAndReadExistingFstabs(target_map);
+ map fstabs = ScanAndReadExistingFstabs(target_map);
y2milestone("ImportMountPoints fstabs:%1", fstabs);
boolean format_sys = true;
- integer idx = FstabAddDialog(target_map, fstabs, format_sys);
- if( idx>=0 )
+ string device = FstabAddDialog(target_map, fstabs, format_sys);
+ if (!isempty(device))
{
- y2milestone("ImportMountPoints idx:%1", idx);
- list<map> fstab = (list<map>) fstabs[idx]:[];
-
- map tmp = AddFstabToTargetMap(target_map, fstab, format_sys);
+ y2milestone("ImportMountPoints device:%1", device);
+ list<map> fstab = (list<map>) fstabs[device]:[];
- map new_target_map = tmp["new_target_map"]:$[];
+ map new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys);
foreach(string d, map disk, new_target_map, {
foreach(map p, disk["partitions"]:[], {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.11/storage/src/modules/FileSystems.ycp new/yast2-storage-2.19.12/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.19.11/storage/src/modules/FileSystems.ycp 2010-03-29 16:12:57.000000000 +0200
+++ new/yast2-storage-2.19.12/storage/src/modules/FileSystems.ycp 2010-04-19 12:27:59.000000000 +0200
@@ -8,7 +8,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 61525 2010-03-29 14:12:57Z aschnell $
+ * $Id: FileSystems.ycp 61748 2010-04-19 10:27:58Z aschnell $
*/
{
module "FileSystems";
@@ -59,6 +59,10 @@
}
+ // filesystems possible for root volume. used during scan for root volumes.
+ global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
+
+
global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ];
global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ];
global const list<string> swap_m_points = [ "swap" ];
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org