Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65302 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
Author: fehr
Date: Wed Aug 10 16:47:19 2011
New Revision: 65302

URL: http://svn.opensuse.org/viewcvs/yast?rev=65302&view=rev
Log:
allow label on btrfs when format is true

Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/custom_part_dialogs.ycp
trunk/storage/storage/src/modules/FileSystems.ycp

Modified: trunk/storage/package/yast2-storage.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=65302&r1=65301&r2=65302&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Wed Aug 10 16:47:19 2011
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Aug 10 14:59:41 CEST 2011 - fehr@xxxxxxx
+
+- allow label on btrfs when format is true
+
+-------------------------------------------------------------------
Tue Aug 9 16:29:08 CEST 2011 - fehr@xxxxxxx

- fix bugs in subvolume handling during install

Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=65302&r1=65301&r2=65302&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Wed Aug 10
16:47:19 2011
@@ -551,9 +551,11 @@
map enab = $[];
boolean tmp = !contains( no_mountby_type, new["type"]:`primary );
enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown
) &&
+ (new["used_fs"]:`unknown!=`btrfs||new["format"]:false) &&
new["enc_type"]:`none==`none;
enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) &&
- FileSystems::MountUuid( new["used_fs"]:`unknown );
+ FileSystems::MountUuid( new["used_fs"]:`unknown ) &&
+ new["enc_type"]:`none==`none;
tmp = contains(mountby_id_path_type, new["type"]:`none);
enab[`id] = tmp && size(new["udev_id"]:[])>0;
enab[`path] = tmp && size(new["udev_path"]:"")>0;

Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=65302&r1=65301&r2=65302&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Wed Aug 10 16:47:19 2011
@@ -68,7 +68,7 @@
global list<string> crypt_m_points() { return [ "/",
Partitions::BootMount(), "/usr" ]; }
global const list<string> swap_m_points = [ "swap" ];
global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ];
- global string default_subvol = "A";
+ global string default_subvol = "UNDEFINED";

list<string> suggest_m_points = [];
list<string> suggest_tmp_points = [];
@@ -999,8 +999,7 @@
{
string ret =
LibStorage::StorageInterface::getDefaultSubvolName(sint);
y2milestone( "InitSlib libstorage default_subvol:\"%1\"", ret );
- ret = "@";
- //ret = "";
+ ret = "";
LibStorage::StorageInterface::setDefaultSubvolName(sint,ret);
ret = LibStorage::StorageInterface::getDefaultSubvolName(sint);
default_subvol = ret;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages