Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Sat Jul 25 18:51:39 CEST 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-07-23 13:20:31.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2009-07-23 17:41:48.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 23 17:15:51 CEST 2009 - aschnell@suse.de
+
+- allow user to ignore some consistency checks respecting manual
+ partition setup during installation (fate #305149)
+
+-------------------------------------------------------------------
@@ -8,0 +15,6 @@
+-------------------------------------------------------------------
+Thu Jul 23 13:14:59 CEST 2009 - aschnell@suse.de
+
+- added minimal experimental btrfs support, esp. filesystems over
+ multiple devices are not supported (fate #306587)
+
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.nZrHy3/_old 2009-07-25 18:51:15.000000000 +0200
+++ /var/tmp/diff_new_pack.nZrHy3/_new 2009-07-25 18:51:15.000000000 +0200
@@ -20,7 +20,7 @@
Name: yast2-storage
Version: 2.18.16
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-storage-2.18.16.tar.bz2
Prefix: /usr
++++++ yast2-storage-2.18.16.tar.bz2 ++++++
++++ 5672 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-storage-2.18.16/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.18.16/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.18.16/storage/src/include/custom_part_check_generated.ycp 2009-06-24 12:52:52.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/custom_part_check_generated.ycp 2009-07-23 18:39:59.000000000 +0200
@@ -72,15 +72,16 @@
boolean fat_system_boot = false;
string raid_type = "";
- foreach( string disk, map diskinfo, targetMap,
- ``{
+ foreach (string disk, map diskinfo, targetMap, {
+
list<map> part_info = diskinfo["partitions"]:[];
integer cyl_size = diskinfo["cyl_size"]:1000000;
if (contains([ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ], diskinfo["type"]:`CT_UNKNOWN))
diskless = false;
- foreach( map part, part_info, ``{
+ foreach (map part, part_info, {
+
// All valid partitions ...
integer fsid = part["fsid"]:0;
string mountpoint = part["mount"]:"";
@@ -195,48 +196,57 @@
y2milestone("root_dmraid:%1 root_raid %2 boot_raid %3 raid_type:%4",
root_dmraid, root_raid, boot_raid, raid_type);
- boolean retval = true;
+ boolean ok = true;
if (( !root_found && installation ) || show_all_popups )
{
// popup text
- Popup::Error(_("
-YaST2 needs a root partition to install.
-Assign the root mount point \"/\" to a partition.
-"));
-
- retval = false;
- }
+ string message = _("You have not assigned a root partition for
+installation. This does not work. Assign the root mount point \"/\" to a
+partition.
+Really use this setup?
+");
+ if (!Popup::YesNo(message))
+ ok = false;
+ }
if( fat_system_mount || show_all_popups )
{
// popup text
- Popup::Error(_("You tried to mount a fat partition to
-one of the following mount points: / /usr /home /opt /var.
-Use a Linux file system, such as ext3 or reiserfs, for these mount points.
-"));
+ string message = _("You tried to mount a fat partition to one of
+the following mount points: / /usr /home /opt /var. This will very likely
+cause problems. Use a Linux file system, such as ext3, ext4 or reiserfs, for
+these mount points.
- retval = false;
+Really use this setup?
+");
+
+ if (!Popup::YesNo(message))
+ ok = false;
}
if( fat_system_boot || show_all_popups )
{
// popup text
- Popup::Error(_("You tried to mount a fat partition to the mount point /boot.
-Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point.
-"));
+ string message = _("You tried to mount a fat partition to the
+mount point /boot. This will very likely cause problems. Use a Linux file
+system, such as ext3, ext4 or reiserfs, for this mount point.
- retval = false;
+Really use this setup?
+");
+
+ if (!Popup::YesNo(message))
+ ok = false;
}
if( (boot_found) && installation || show_all_popups )
{
if( boot_end >= Partitions::BootCyl() || show_all_popups )
{
- // popup text %1 is a number
- boolean ret = Popup::YesNo(sformat(_("Warning:
+ // popup text, %1 is a number
+ string message = sformat(_("Warning:
Your boot partition ends above cylinder %1.
Your BIOS does not seem able to boot
partitions above cylinder %1.
@@ -244,23 +254,24 @@
installation might not be directly bootable.
Really use this setup?
-"),Partitions::BootCyl(),Product::name));
+"), Partitions::BootCyl(), Product::name);
- if ( !ret ) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
-
if ( (boot_size_k < 12*1024 && boot_size_check) || show_all_popups )
{
- // popup text
- boolean ret = Popup::YesNo(_("Warning:
-Your boot partition is less than 12MB.
+ // popup text, %1 is a size
+ string message = sformat(_("Warning:
+Your boot partition is smaller than %1.
It is recommended to increase the size of /boot.
Really keep this size of boot partition?
-"));
+"), Storage::KByteToHumanStringOmitZeroes(12*1024));
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
}
@@ -268,7 +279,6 @@
if( (! boot_found && installation ) || show_all_popups )
{
-
// iSeries does not really need a boot partition
// a bootable binary will be written to a kernel slot in /proc
if ((Partitions::PrepBoot() && !Arch::board_iseries() && !diskless) || show_all_popups)
@@ -276,25 +286,24 @@
// popup text
// If the user chooses 'no' here, the system will not be able to
// boot from the hard drive!
- boolean ret = Popup::YesNo(_("Warning: There is no partition mounted as /boot.
+ string message = sformat(_("Warning: There is no partition mounted as /boot.
To boot from your hard disk, a small /boot partition
-(approx. 4MB) is required. Consider creating one.
+(approx. %1) is required. Consider creating one.
(Partitions assigned to /boot will automatically be changed to
type 0x41 PReP/CHRP).
Really use the setup without /boot partition?
-"));
-
- if (ret == false) retval = false;
+"), Storage::KByteToHumanStringOmitZeroes(4*1024));
+ if (!Popup::YesNo(message))
+ ok = false;
}
-
// no boot but root
if( (root_end >= Partitions::BootCyl() || show_all_popups) && AutoinstData::BootCylWarning )
{
// popup text
- boolean ret = Popup::YesNo(sformat(_("Warning: According to your setup, you intend to
+ string message = sformat(_("Warning: According to your setup, you intend to
boot your machine from the root partition (/), which, unfortunately,
has an end cylinder above %1. Your BIOS does not seem capable
of booting partitions beyond the %1 cylinder boundary,
@@ -302,11 +311,11 @@
directly bootable.
Really use this setup?
-"), Partitions::BootCyl(),Product::name));
+"), Partitions::BootCyl(), Product::name);
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
-
}
// iSeries has no problems with this configuration
@@ -316,46 +325,44 @@
AutoinstData::BootRaidWarning)
{
// popup text
- boolean ret = Popup::YesNo(sformat(
-_("Warning: With your current setup, your %1
+ string message = sformat(_("Warning: With your current setup, your %1
installation might not be directly bootable, because
your files below \"/boot\" are on a software RAID device.
The boot loader setup sometimes fails in this configuration.
Really use this setup?
-"),Product::name));
+"), Product::name);
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
// iSeries has no problems with this configuration
// an initrd will be created and you can boot from a kernel slot
- if( installation && !Arch::board_iseries () &&
- ((root_lvm && !boot_found) || show_all_popups ) &&
+ if (installation && !Arch::board_iseries() && ((root_lvm && !boot_found) || show_all_popups) &&
AutoinstData::BootLVMWarning )
{
// popup text
- boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your %1 installation
+ string message = sformat(_("Warning: With your current setup, your %1 installation
will encounter problems when booting, because you have no \"boot\"
partition and your \"root\" partition is an LVM logical volume.
This does not work.
-
If you do not know exactly what you are doing, use a normal
partition for your files below /boot.
Really use this setup?
-"),Product::name));
+"), Product::name);
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
-
if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && (!boot_found || boot_fs != `vfat)) ||
show_all_popups )
{
// popup text
- boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your %2 installation
+ string message = sformat(_("Warning: With your current setup, your %2 installation
will encounter problems when booting, because you have no
FAT partition mounted onto %1.
@@ -365,15 +372,16 @@
FAT partition for your files below %1.
Really use this setup?
-"), Partitions::BootMount(),Product::name));
+"), Partitions::BootMount(), Product::name);
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
if( (root_dmraid && !boot_found) || show_all_popups )
{
// popup text
- boolean ret = Popup::YesNo(sformat(_("Warning: With your current setup, your %2 installation will
+ string message = sformat(_("Warning: With your current setup, your %2 installation will
encounter problems when booting, because you have no
separate %1 partition on your RAID disk.
@@ -383,44 +391,43 @@
partition for your files below %1.
Really use this setup?
-"), Partitions::BootMount(), Product::name));
+"), Partitions::BootMount(), Product::name);
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && boot_found && gpt_boot_ia64) ||
show_all_popups )
{
// popup text
- boolean ret = Popup::YesNo( ia64_gpt_text() + "\n\n" +
- _("Really use this setup ?") );
- if (ret == false) retval = false;
+ string message = ia64_gpt_text() + "\n" + _("Really use this setup?");
+
+ if (!Popup::YesNo(message))
+ ok = false;
}
if ( (!swap_found && Stage::initial() && root_fs!=`nfs) || show_all_popups )
{
// popup text
- boolean ret = Popup::YesNo(_("
+ string message = _("
You have not assigned a swap partition. There is nothing wrong with that, but
in most cases it is highly recommended to create and assign a swap partition.
Swap partitions on your system are listed in the main window with the
type \"Linux Swap\". An assigned swap partition has the mount point \"swap\".
You can assign more than one swap partition, if desired.
-
Really use the setup without swap partition?
-"));
+");
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
-
if( (partition_mounted_but_not_formated && installation) || show_all_popups )
{
// popup text
string message = _("
-WARNING:
-
You chose to install onto an existing partition that will not be
formatted. YaST2 cannot guarantee your installation will succeed,
particularly in any of the following cases:
@@ -442,12 +449,11 @@
Really keep the partition unformatted?
");
- boolean ret = Popup::YesNo( message);
-
- if (ret == false) retval = false;
+ if (!Popup::YesNo(message))
+ ok = false;
}
- return retval;
+ return ok;
}
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-storage-2.18.16/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.18.16/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.18.16/storage/src/include/custom_part_lib.ycp 2009-06-24 12:52:52.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/custom_part_lib.ycp 2009-07-23 13:49:37.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 57661 2009-06-19 12:23:08Z aschnell $
+ $Id: custom_part_lib.ycp 58139 2009-07-23 11:49:39Z aschnell $
*
*/
@@ -638,6 +638,7 @@
`ext2 : [ "e2fsprogs" ],
`ext3 : [ "e2fsprogs" ],
`ext4 : [ "e2fsprogs" ],
+ `btrfs : [ "btrfsprogs" ],
`reiser : [ "reiserfs" ],
`vfat : [ "dosfstools" ],
`ntfs : [ "ntfsprogs" ],
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-storage-2.18.16/storage/src/include/ep-lib.ycp new/yast2-storage-2.18.16/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.18.16/storage/src/include/ep-lib.ycp 2009-07-23 13:17:42.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/ep-lib.ycp 2009-07-24 11:05:42.000000000 +0200
@@ -311,11 +311,11 @@
list <integer> bits = [];
list <string> labels = [];
- void AddSegment(integer bit, string label, integer size_k)
+ void AddSegment(float bit, string label, integer size_k)
{
// Guarantee some minimal share (1%) of total graph width to the segment.
// Prevents small partitions e.g. swaps from disappearing completely.
- bits = add(bits, bit < 1 ? 1 : bit);
+ bits = add(bits, Integer::Clamp(1000 * bit, 10, 1000));
labels = add(labels, label + "\n" + Storage::KByteToHumanString(size_k));
}
@@ -367,7 +367,7 @@
next_cyl = Region::Start( partitions[ i+1, "region" ]:[] );
}
- integer tmp = 100 * Region::Length(region) / disk["cyl_count"]:1;
+ float tmp = (float) Region::Length(region) / (float) disk["cyl_count"]:1;
y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl);
AddSegment(tmp, part["device"]:"", part["size_k"]:0);
@@ -378,7 +378,7 @@
if ( ( Region::End( region ) != next_cyl ) &&
( (Region::End( region) + 1) != next_cyl ) )
{
- integer tmp2 = 100*( next_cyl - Region::End(region))/disk["cyl_count"]:1;
+ float tmp2 = (float) (next_cyl - Region::End(region)) / (float) disk["cyl_count"]:1;
AddSegment(tmp2, emptyspace, ((next_cyl - Region::End(region)) * disk["cyl_size"]:1) / 1024);
}
@@ -399,11 +399,11 @@
foreach(map partition, partitions, {
integer size_k = partition["size_k"]:0;
disk_free_k = disk_free_k - size_k;
- AddSegment(100 * size_k / disk_size_k, partition["device"]:"", size_k);
+ AddSegment((float) size_k / (float) disk_size_k, partition["device"]:"", size_k);
});
if (disk_free_k > 0)
- AddSegment(100 * disk_free_k / disk_size_k, _("Unallocated Space"), disk_free_k);
+ AddSegment((float) disk_free_k / (float) disk_size_k, _("Unallocated Space"), disk_free_k);
}
break;
}
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-storage-2.18.16/storage/src/inst_resize_dialog.ycp new/yast2-storage-2.18.16/storage/src/inst_resize_dialog.ycp
--- old/yast2-storage-2.18.16/storage/src/inst_resize_dialog.ycp 2009-06-24 12:52:52.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/inst_resize_dialog.ycp 2009-07-23 16:59:19.000000000 +0200
@@ -175,7 +175,7 @@
boolean test_simple_ui = false; // set to "true" to test non-graphical version
// Unit for parition resizing - currently Megabytes
- string unit = _("MB");;
+ string unit = _("MB");
// Labels for bar graph. "%1" will be replace with a numeric value.
string bargraph_label_win_used = _("Windows\nUsed\n%1 ") + unit;
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-storage-2.18.16/storage/src/inst_resize_ui.ycp new/yast2-storage-2.18.16/storage/src/inst_resize_ui.ycp
--- old/yast2-storage-2.18.16/storage/src/inst_resize_ui.ycp 2009-06-24 12:52:52.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/inst_resize_ui.ycp 2009-07-23 17:05:29.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: UI for partition resizing
*
*
- * $Id: inst_resize_ui.ycp 57108 2009-05-08 12:38:30Z aschnell $
+ * $Id: inst_resize_ui.ycp 58141 2009-07-23 15:05:31Z aschnell $
*/
{
textdomain "storage";
@@ -555,7 +555,7 @@
boolean test_simple_ui = false; // set to "true" to test non-graphical version
// Unit for parition resizing - currently Megabytes
- string unit = _("MB");;
+ string unit = _("MB");
// Labels for bar graph. "%1" will be replace with a numeric value.
string bargraph_label_win_used = _("Windows\nUsed\n%1 ") + unit;
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-storage-2.18.16/storage/src/modules/FileSystems.ycp new/yast2-storage-2.18.16/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.18.16/storage/src/modules/FileSystems.ycp 2009-06-24 12:52:52.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/modules/FileSystems.ycp 2009-07-24 15:39:32.000000000 +0200
@@ -2,12 +2,13 @@
* Module: FileSystems.ycp
*
* Authors: Johannes Buchhold (jbuch@suse.de)
+ * Arvin Schnell