December 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66991 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootELILO.ycp
by snwint＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: snwint Date: Tue Dec 6 15:51:05 2011 New Revision: 66991 URL: http://svn.opensuse.org/viewcvs/yast?rev=66991&view=rev Log: - use elilo to handle efi boot menu entries (bnc #717828) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootELILO.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Tue Dec 6 15:51:05 2011 @@ -1 +1 @@ -2.17.83 +2.17.84 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Tue Dec 6 15:51:05 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 6 15:49:53 CET 2011 - snwint(a)suse.de + +- use elilo to handle efi boot menu entries (bnc #717828) + +------------------------------------------------------------------- Mon Nov 14 17:11:14 CET 2011 - snwint(a)suse.de - ppc: use proper root device link (bnc #726607) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootELILO.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootELILO.ycp Tue Dec 6 15:51:05 2011 @@ -470,156 +470,21 @@ return ret; } -/** bnc #438215 - YaST creates efibootloader entry twice - * Function convert number of partition to hexa - * - * @param any number of boot partition (10 or "10") - * @return string number boot partition in hexa ("a") - without "0x" - */ -string tomyhexa(any boot_part) -{ - string ret = "1000"; - - integer int_boot_part = tointeger(boot_part); - if (int_boot_part != nil) - { - string hexa = tohexstring(int_boot_part); - if (search(hexa, "x")!= nil) - { - list <string> hexa_without_0x = splitstring(hexa, "x"); - if (size(hexa_without_0x)>1) - ret = hexa_without_0x[1]:"1000"; - } - } - return ret; -} - -/** bnc #269198 change efi-label - * Function check if there exist same efi-label or different for - * same partition if efi-label is different delete it and create new one - * if it is same nothing to do it. +/** bnc #717828 + * Let elilo do all the efi label work. */ boolean updateEFILabel() { - boolean ret = true; - string cmd = ""; - map mp = Storage::GetMountPoints(); - string boot_dev = mp[getEfiMountPoint (), 0]:"/boot/efi"; - map splited = Storage::GetDiskPartition (boot_dev); - any boot_part = splited["nr"]:0; - any boot_disk = splited["disk"]:""; - - - // command for checking same boot entry in efi bnc #438215 (YaST creates efibootloader entry twice) - cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\"", - BootCommon::globals["boot_efilabel"]:"", tomyhexa(boot_part)); - - // check how many entries with same label and partition is actually in efi - y2milestone("run command %1", cmd); - map out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - - // check number of same boot entries in efi - // if boot entry is added -> don't add it again - if (deletechars(out["stdout"]:"","\n") != "0") - { - if (out["exit"]:0 == 0) - y2milestone("Skip adding new boot entry - EFI Label exist"); - else - y2error("Calling command %1 faild", cmd); - return ret; - - } else { - - cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"HD(%1.*File(.\\efi.\\SuSE.\\elilo.efi)\"", tomyhexa(boot_part)); - // check how many entries with same label and partition is actually in efi - y2milestone("run command %1", cmd); - map out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - - // check how many boot entries have same number of partitions - if (deletechars(out["stdout"]:"","\n") != "0") - { - // delete old boot entry - - cmd = sformat("efibootmgr -v |grep \"HD(%1.*File(.\\efi.\\SuSE.\\elilo.efi)\" | cut -d \" \" -f 1", - tomyhexa(boot_part)); - y2milestone("run command %1", cmd); - out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - - string boot_entries = out["stdout"]:""; - y2milestone("EFI boot entries with \"same\" boot partition %1",boot_entries); - - list<string> list_boot_entries = splitstring(boot_entries, "\n"); - - y2milestone("list_boot_entries=%1",list_boot_entries); - - foreach(string entry, list_boot_entries, - { - if ((deletechars(entry, "\n*") != "") && (deletechars(entry, "\n*") != nil)) - { - cmd = sformat("/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;", - substring (deletechars(entry, "\n*"),4, 4)); - y2milestone("run command %1", cmd); - out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - } - }); - - } - // add new boot entry - string bl_logfile = "/var/log/YaST2/y2log_bootloader"; - string bl_command = sformat ( "/usr/sbin/efibootmgr -v --create --label \"%1\" " + - "--disk %2 --part %3 " + - "--loader '\\efi\\SuSE\\elilo.efi' --write-signature >> %4 2>&1", - BootCommon::globals["boot_efilabel"]:"", boot_disk, boot_part, bl_logfile - ); - ret = ret && installBootLoader (bl_command, bl_logfile); - } - return ret; -} + // now elilo manages efi boot entries + string cmd = "/sbin/elilo --refresh-EBM"; + y2milestone("running command %1: %2", cmd, (map)SCR::Execute(.target.bash_output, cmd)); -/** FIXME: efibootmgr doesn't provide info about disk! - * bnc #450682 - adding boot entry to EFI - * function delete all existing boot entry with same name and partition number - * @param string name of label - * @param string number of partition - */ - -void deleteSameEFIBootEntry(string name, any part_no) -{ - - boolean still_exist = true; - - string cmd = sformat("efibootmgr -v |grep \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\" | cut -d \" \" -f 1", - name, tomyhexa(part_no)); - y2milestone("run command %1", cmd); - map out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - - string boot_entries = out["stdout"]:""; - y2milestone("EFI boot entries with \"same\" boot partition %1",boot_entries); - - list<string> list_boot_entries = splitstring(boot_entries, "\n"); - - y2milestone("list_boot_entries=%1",list_boot_entries); - - foreach(string entry, list_boot_entries, - { - if ((deletechars(entry, "\n*") != "") && (deletechars(entry, "\n*") != nil)) - { - cmd = sformat("/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;", - substring (deletechars(entry, "\n*"),4, 4)); - y2milestone("run command %1", cmd); - out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone("output of command %1", out); - } - }); + return true; } + /** * Write bootloader settings to disk * @return boolean true on success @@ -639,157 +504,8 @@ computer, you need to load ELILO via the EFI shell."), 10); } - if (Mode::normal()) - updateEFILabel(); + if (ret) ret = updateEFILabel(); - if (BootCommon::location_changed || create_efi_entry) - { - map mp = Storage::GetMountPoints(); - string boot_dev = mp[getEfiMountPoint (), 0]:"/boot/efi"; - map splited = Storage::GetDiskPartition (boot_dev); - any boot_part = splited["nr"]:0; - any boot_disk = splited["disk"]:""; - y2milestone ("Disk: %1, Part: %2", boot_disk, boot_part); - - /* - * Create new EFI Bootmgr Label if specified - */ - if (BootCommon::globals["boot_efilabel"]:"" != "") - { - string bl_logfile = "/var/log/YaST2/y2log_bootloader"; - string bl_command = sformat ( - "/usr/sbin/efibootmgr -v --create --label \"%1\" " + - "--disk %2 --part %3 " + - "--loader '\\efi\\SuSE\\elilo.efi' --write-signature >> %4 2>&1", - BootCommon::globals["boot_efilabel"]:"", boot_disk, boot_part, bl_logfile - ); - - // command for checking same boot entry in efi bnc #438215 (YaST creates efibootloader entry twice) - string cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\"", - BootCommon::globals["boot_efilabel"]:"", tomyhexa(boot_part)); - y2milestone("Command for checking same boot entry: %1", cmd); - - // check how many entries with same label and partition is actually in efi - map out = (map)SCR::Execute (.target.bash_output, cmd); - - // check number of same boot entries in efi - // if boot entry is added -> don't add it again - if (deletechars(out["stdout"]:"","\n") == "0") - { - ret = ret && installBootLoader (bl_command, bl_logfile); - } else { - - if (added_label_to_efi) - { - y2milestone("Skip adding boot entry: %1 to EFI. There already exist and was added: %2 with - same label and partition.", BootCommon::globals["boot_efilabel"]:"", - deletechars(out["stdout"]:"","\n")); - } else { - // delete efi entry with same label name and partition - deleteSameEFIBootEntry(BootCommon::globals["boot_efilabel"]:"", boot_part); - // add new efi boot entry - ret = ret && installBootLoader (bl_command, bl_logfile); - } - - } - } - - - /* - * Remove existing old, obsolete menu entries - * - * FIXME should be handled completly through the library - */ - - // Detect the current default boot entry (e.g. "0007") - map default_entry_map = (map)SCR::Execute (.target.bash_output, - "/usr/sbin/efibootmgr |grep ^BootOrder: | " + - "cut -d ' ' -f 2 | cut -d ',' -f 1" - ); - string new_entry = default_entry_map["stdout"]:""; - - // Check for validity -- returned default_entry has to be 4 chars long - // and be composed of numbers and characters only - if (size (new_entry) != 4 - && regexpmatch (new_entry, "[0-9A-F]") == false) - { - y2error ("BootELILO: Found default boot entry %1 isn't valid", - new_entry); - } - else - { - // Remove newlines and carriage returns in string - new_entry = deletechars (new_entry, "\n\r"); - - // Attach prefix "Boot" for proper matching - new_entry = "Boot" + new_entry; - - // Prepare command for fetching string "HD(...)" - // from efibootmgr output - string command = sformat ( - "set -o pipefail; /usr/sbin/efibootmgr -v | " + - "grep '%1' |sed 's/%1.*\$HD(.*)File(.*)\$.*/\\1/'", - String::Quote (new_entry) - ); - - map hd_descr_map = (map)SCR::Execute (.target.bash_output, command); - y2milestone ("BootELILO: hd_descr_map = %1", hd_descr_map); - - // Remove newlines and carriage returns in string - string hd_descr = deletechars (hd_descr_map["stdout"]:"", "\n\r"); - - // Prepare command for fetching boot entry number corresponding - // to "HD(...)" string from efibootmgr output - command = sformat ( - "set -o pipefail; /usr/sbin/efibootmgr -v |" + - "grep '%1' |awk '{print $1}'", - String::Quote (hd_descr) - ); - - map entries2remove_map = (map)SCR::Execute (.target.bash_output, command); - y2milestone ("BootELILO: entries2remove_map = %1", entries2remove_map); - string entries2remove_string = entries2remove_map["stdout"]:""; - - // Convert the string containing the entries to be removed to a list - list<string> entries2remove_list = splitstring (entries2remove_string, "\n"); - - // Check if there are entries to remove, thus if listsize is greater than 0 - integer listsize = size (entries2remove_list); - if (listsize > 0) - { - // Rermove the last entry of the list (because it's an empty one) - integer lastentry = listsize - 1; - entries2remove_list = remove (entries2remove_list, lastentry); - y2milestone ("BootELILO: entries2remove_list = %1", entries2remove_list); - - // Filter the bootnumbers from strings for further usage - entries2remove_list = maplist (string entry2remove, entries2remove_list, { - if (issubstring (entry2remove, new_entry) == false) - { - entry2remove = substring (entry2remove, 4, 4); - return entry2remove; - } - }); - - // Delete obsolete bootentries by bootnumbers - foreach (string entry2remove, entries2remove_list, { - string command = sformat ( - "/usr/sbin/efibootmgr --delete-bootnum --bootnum %1 -q;", - entry2remove - ); - - y2milestone ("Running command %1", command); - map ret_map = (map)SCR::Execute (.target.bash_output, command); - y2milestone ("BootELILO: ret_map = %1", ret_map); - ret = (ret_map["exit"]:1 == 0); - }); - } - else - { - y2milestone ("BootELILO: No obsolete entry to remove"); - } - } - } return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66990 - /tags/branch-Code-11-SP2-2_17_54/pkg-bindings/
by lslezak＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: lslezak Date: Tue Dec 6 15:36:52 2011 New Revision: 66990 URL: http://svn.opensuse.org/viewcvs/yast?rev=66990&view=rev Log: Created tag branch-Code-11-SP2-2_17_54 for pkg-bindings Added: tags/branch-Code-11-SP2-2_17_54/pkg-bindings/ (props changed) - copied from r66989, branches/SuSE-Code-11-SP2-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66989 - /tags/branch-Code-11-SP2-2_17_54/
by lslezak＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: lslezak Date: Tue Dec 6 15:36:48 2011 New Revision: 66989 URL: http://svn.opensuse.org/viewcvs/yast?rev=66989&view=rev Log: Created tag branch-Code-11-SP2-2_17_54 Added: tags/branch-Code-11-SP2-2_17_54/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66988 - in /branches/SuSE-Code-11-SP2-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Service.cc
by lslezak＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: lslezak Date: Tue Dec 6 14:56:22 2011 New Revision: 66988 URL: http://svn.opensuse.org/viewcvs/yast?rev=66988&view=rev Log: - fixed reloading of repositories which have been removed during service reload (bnc#724449) - 2.17.54 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION Tue Dec 6 14:56:22 2011 @@ -1 +1 @@ -2.17.53 +2.17.54 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Dec 6 14:56:22 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 6 13:29:53 UTC 2011 - lslezak(a)suse.cz + +- fixed reloading of repositories which have been removed during + service reload (bnc#724449) +- 2.17.54 + +------------------------------------------------------------------- Fri Oct 7 10:12:22 UTC 2011 - lslezak(a)suse.cz - solver reset - reset also the distupgrade solver flag Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Service.cc Tue Dec 6 14:56:22 2011 @@ -382,11 +382,24 @@ // reload all repositories for (RepoCont::size_type idx = 0; idx != repos.size(); ++idx) { + YRepo_Ptr repo = repos[idx]; + // the repo has not been removed - if (!(repos[idx])->isDeleted()) + if (!repo->isDeleted()) { - y2milestone("Reloading repository %s", (repos[idx])->repoInfo().alias().c_str()); - repos[idx]->repoInfo() = repomanager.getRepositoryInfo((repos[idx])->repoInfo().alias()); + zypp::RepoInfo info(repo->repoInfo()); + y2milestone("Reloading repository %s", info.alias().c_str()); + + if (repomanager.hasRepo(info)) + { + repos[idx]->repoInfo() = repomanager.getRepositoryInfo(info.alias()); + } + else + { + y2milestone("Repository %s has been removed, unloading it", (info.alias().c_str())); + RemoveResolvablesFrom(repo); + repo->setDeleted(); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66987 - in /trunk/storage: package/ storage/src/include/ storage/src/modules/
by aschnell＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: aschnell Date: Tue Dec 6 14:15:20 2011 New Revision: 66987 URL: http://svn.opensuse.org/viewcvs/yast?rev=66987&view=rev Log: - add nofail for volumes using iSCSI disks (bnc#734786) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-raid-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.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Dec 6 14:15:20 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 06 14:08:41 CET 2011 - aschnell(a)suse.de + +- add nofail for volumes using iSCSI disks (bnc#734786) + +------------------------------------------------------------------- Fri Nov 25 12:25:53 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Dec 6 14:15:20 2011 @@ -220,6 +220,8 @@ "cyl_count" : disk["cyl_count"]:0, "slots" : slots ]; + data["using_devices"] = [ disk_device ]; + if (DlgCreatePartition(data)) { string device = data["device"]:"error"; Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Tue Dec 6 14:15:20 2011 @@ -207,6 +207,7 @@ data["max_size_k"] = (target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0) / 1024; data["max_stripes"] = size(MergeDevices((map<string, any>) target_map[device]:$[])); + data["using_devices"] = [ device ]; symbol Commit() { Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Tue Dec 6 14:15:20 2011 @@ -188,6 +188,8 @@ integer size_k = 0; Storage::ComputeMdSize(tosymbol(raid_type), devices, size_k); data["size_k"] = size_k; + + data["using_devices"] = devices; } y2milestone("MiniWorkflowStepRaidTypeDevices data:%1 ret:%2", data, widget); Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Dec 6 14:15:20 2011 @@ -1356,29 +1356,46 @@ } } - any dp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); string dev = part["device"]:""; - LibStorage::StorageInterface::getContVolInfo(sint, dev, dp); - integer t = LibStorage::ContVolInfo::swig_ctype_get(dp); - if( t == LibStorage::DISK() && part["mount"]:""!="/" ) + + if (part["mount"]:"" != "/") + { + boolean need_nofail = false; + + list<string> devs = part["using_devices"]:[dev]; + y2milestone("DefaultFstabOptions devs:%1", devs); + + list<string> usedby_devices = []; + if (LibStorage::StorageInterface::getRecursiveUsedBy(sint, devs, true, usedby_devices) == 0) { - any infos = LibStorage::DiskInfo::new("LibStorage::DiskInfo"); - string disk = LibStorage::ContVolInfo::swig_cdevice_get(dp); - y2milestone( "DefaultFstabOptions disk:%1", disk ); - integer r = LibStorage::StorageInterface::getDiskInfo(sint, disk, infos); - if( r==0 ) - { - integer t = LibStorage::DiskInfo::swig_transport_get(infos); - list<integer> hotpl = [ LibStorage::USB(), LibStorage::FCOE(), LibStorage::ISCSI() ]; - y2milestone( "DefaultFstabOptions transport:%1 list:%2", t, hotpl ); - if( contains( hotpl, t )) + // USB since those might actually not be present during boot + // iSCSI since the boot scripts need it + list<integer> hotplug_transports = [ LibStorage::USB(), LibStorage::ISCSI() ]; + + foreach (string usedby_device, usedby_devices, { + + any dp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); + if (LibStorage::StorageInterface::getContVolInfo(sint, usedby_device, dp) == 0 && + LibStorage::ContVolInfo::swig_ctype_get(dp) == LibStorage::DISK()) { - if( size(fst_default)>0 ) + string disk = LibStorage::ContVolInfo::swig_cdevice_get(dp); + any infos = LibStorage::DiskInfo::new("LibStorage::DiskInfo"); + if (LibStorage::StorageInterface::getDiskInfo(sint, disk, infos) == 0 && + contains(hotplug_transports, LibStorage::DiskInfo::swig_transport_get(infos))) + { + need_nofail = true; + } + } + }); + + if (need_nofail) + { + if (!isempty(fst_default)) fst_default = fst_default + ","; fst_default = fst_default + "nofail"; - } } } + } if( substring(fst_default,0,1)=="," ) fst_default = substring(fst_default,1); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66986 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: aschnell Date: Tue Dec 6 14:13:27 2011 New Revision: 66986 URL: http://svn.opensuse.org/viewcvs/yast?rev=66986&view=rev Log: - add nofail for volumes using iSCSI disks (bnc#734786) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Device.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-hd-lib.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-lvm-lib.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-raid-dialogs.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Device.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Device.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Device.h Tue Dec 6 14:13:27 2011 @@ -93,6 +93,8 @@ bool isUsedBy(UsedByType type) const; const list<UsedBy>& getUsedBy() const { return uby; } + virtual list<string> getUsing() const { return list<string>(); } + void logDifference(std::ostream& log, const Device& rhs) const; friend std::ostream& operator<<(std::ostream& s, const Device& d); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc Tue Dec 6 14:13:27 2011 @@ -503,6 +503,15 @@ } + list<string> + Dm::getUsing() const + { + list<string> ret; + ret.push_back(cont->device()); + return ret; + } + + void Dm::getInfo( DmInfo& tinfo ) const { Volume::getInfo(info.v); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.h Tue Dec 6 14:13:27 2011 @@ -85,6 +85,8 @@ static string devToTable( const string& dev ); + virtual list<string> getUsing() const; + bool equalContent(const Dm& rhs) const; void logDifference(std::ostream& log, const Dm& rhs) const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc Tue Dec 6 14:13:27 2011 @@ -528,6 +528,15 @@ } + list<string> + Md::getUsing() const + { + list<string> ret = devs; + ret.insert(ret.end(), spare.begin(), spare.end()); + return ret; + } + + void Md::getInfo( MdInfo& tinfo ) const { Volume::getInfo(info.v); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.h Tue Dec 6 14:13:27 2011 @@ -89,6 +89,8 @@ bool updateEntry(EtcMdadm* mdadm) const; + virtual list<string> getUsing() const; + protected: void computeSize(); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.cc Tue Dec 6 14:13:27 2011 @@ -186,6 +186,16 @@ return txt; } + + list<string> + MdPart::getUsing() const + { + list<string> ret; + ret.push_back(cont->device()); + return ret; + } + + void MdPart::getInfo( MdPartInfo& tinfo ) const { Volume::getInfo(info.v); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPart.h Tue Dec 6 14:13:27 2011 @@ -69,6 +69,8 @@ virtual string procName() const { return nm; } virtual string sysfsPath() const; + virtual list<string> getUsing() const; + protected: const MdPartCo* co() const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc Tue Dec 6 14:13:27 2011 @@ -1589,6 +1589,15 @@ } + list<string> + MdPartCo::getUsing() const + { + list<string> ret = devs; + ret.insert(ret.end(), spare.begin(), spare.end()); + return ret; + } + + bool MdPartCo::active = false; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.h Tue Dec 6 14:13:27 2011 @@ -117,6 +117,8 @@ Partition* getPartition( unsigned nr, bool del ); + virtual list<string> getUsing() const; + void getInfo( storage::MdPartCoInfo& info ) const; bool equalContent( const Container& rhs ) const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.cc Tue Dec 6 14:13:27 2011 @@ -571,6 +571,15 @@ } + list<string> + Partition::getUsing() const + { + list<string> ret; + ret.push_back(cont->device()); + return ret; + } + + void Partition::getInfo( PartitionAddInfo& tinfo ) const { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Partition.h Tue Dec 6 14:13:27 2011 @@ -120,6 +120,8 @@ bool operator> ( const Partition& rhs ) const { return( !(*this<=rhs) ); } + virtual list<string> getUsing() const; + protected: Region reg; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.cc Tue Dec 6 14:13:27 2011 @@ -819,4 +819,18 @@ setChildValue(node, "pe_free", free_pe); } + + list<string> + PeContainer::getUsing() const + { + list<string> ret; + for (list<Pv>::const_iterator it = pv.begin(); it != pv.end(); ++it) + ret.push_back(it->device); + for (list<Pv>::const_iterator it = pv_add.begin(); it != pv_add.end(); ++it) + ret.push_back(it->device); + for (list<Pv>::const_iterator it = pv_remove.begin(); it != pv_remove.end(); ++it) + ret.remove(it->device); + return ret; + } + } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/PeContainer.h Tue Dec 6 14:13:27 2011 @@ -63,6 +63,8 @@ string getDeviceByNumber( const string& majmin ) const; + virtual list<string> getUsing() const; + protected: struct Pv { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue Dec 6 14:13:27 2011 @@ -1101,6 +1101,56 @@ } +int +Storage::getRecursiveUsedBy(const list<string>& devices, bool itself, list<string>& usedby_devices) +{ + y2mil("devices:" << devices); + assertInit(); + int ret = 0; + usedby_devices.clear(); + for (list<string>::const_iterator it = devices.begin(); it != devices.end(); ++it) + { + ret = getRecursiveUsedByHelper(*it, itself, usedby_devices); + if (ret != 0) + break; + } + + y2mil("ret:" << ret << " usedby_devices:" << usedby_devices); + return ret; +} + + +int +Storage::getRecursiveUsedByHelper(const string& device, bool itself, list<string>& usedby_devices) +{ + int ret = 0; + + const Device* p = findDevice(device, true); + if (p) + { + if (itself && find(usedby_devices.begin(), usedby_devices.end(), + p->device()) == usedby_devices.end()) + usedby_devices.push_back(p->device()); + + list<string> tmp = p->getUsing(); + for (list<string>::const_iterator it = tmp.begin(); it != tmp.end(); ++it) + { + if (find(usedby_devices.begin(), usedby_devices.end(), *it) == usedby_devices.end()) + { + usedby_devices.push_back(*it); + getRecursiveUsedByHelper(*it, itself, usedby_devices); + } + } + } + else + { + ret = STORAGE_DEVICE_NOT_FOUND; + } + + return ret; +} + + void Storage::setZeroNewPartitions(bool val) { y2mil("val:" << val); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h Tue Dec 6 14:13:27 2011 @@ -429,6 +429,9 @@ int getRecursiveUsing(const string& device, list<string>& devices); int getRecursiveUsingHelper(const string& device, list<string>& devices); + int getRecursiveUsedBy(const list<string>& device, bool itself, list<string>& usedby_devices); + int getRecursiveUsedByHelper(const string& device, bool itself, list<string>& usedby_devices); + void setZeroNewPartitions( bool val=true ); bool getZeroNewPartitions() const { return zeroNewPartitions; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h Tue Dec 6 14:13:27 2011 @@ -1706,6 +1706,18 @@ virtual int getRecursiveUsing(const string& device, list<string>& devices) = 0; /** + * Recursively get all devices used by devices. Containers of volumes are + * also considered as used by the devices. + * + * @param devices list of name of devices, e.g. /dev/sda1 + * @param itself whether the device itself is included in the result + * @param usedby_devices name of devices used by devices, e.g. /dev/sda + * @return zero if all is ok, a negative number to indicate an error + */ + virtual int getRecursiveUsedBy(const list<string>& devices, bool itself, + list<string>& usedby_devices) = 0; + + /** * Set handling of newly created partitions. With this flag * once can make the library overwrite start and end of newly * created partitions with zeroes. This prevents that obsolete Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Dec 6 14:13:27 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 06 14:08:41 CET 2011 - aschnell(a)suse.de + +- add nofail for volumes using iSCSI disks (bnc#734786) + +------------------------------------------------------------------- Wed Nov 23 15:25:59 CET 2011 - aschnell(a)suse.de - add name in /dev/md/ to alt-names of partitioned RAID Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-hd-lib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-hd-lib.ycp Tue Dec 6 14:13:27 2011 @@ -220,6 +220,8 @@ "cyl_count" : disk["cyl_count"]:0, "slots" : slots ]; + data["using_devices"] = [ disk_device ]; + if (DlgCreatePartition(data)) { string device = data["device"]:"error"; Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-lvm-lib.ycp Tue Dec 6 14:13:27 2011 @@ -207,6 +207,7 @@ data["max_size_k"] = (target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0) / 1024; data["max_stripes"] = size(MergeDevices((map<string, any>) target_map[device]:$[])); + data["using_devices"] = [ device ]; symbol Commit() { Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/ep-raid-dialogs.ycp Tue Dec 6 14:13:27 2011 @@ -188,6 +188,8 @@ integer size_k = 0; Storage::ComputeMdSize(tosymbol(raid_type), devices, size_k); data["size_k"] = size_k; + + data["using_devices"] = devices; } y2milestone("MiniWorkflowStepRaidTypeDevices data:%1 ret:%2", data, widget); Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Tue Dec 6 14:13:27 2011 @@ -1342,29 +1342,46 @@ } } - any dp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); string dev = part["device"]:""; - LibStorage::StorageInterface::getContVolInfo(sint, dev, dp); - integer t = LibStorage::ContVolInfo::swig_ctype_get(dp); - if( t == LibStorage::DISK() && part["mount"]:""!="/" ) + + if (part["mount"]:"" != "/") + { + boolean need_nofail = false; + + list<string> devs = part["using_devices"]:[dev]; + y2milestone("DefaultFstabOptions devs:%1", devs); + + list<string> usedby_devices = []; + if (LibStorage::StorageInterface::getRecursiveUsedBy(sint, devs, true, usedby_devices) == 0) { - any infos = LibStorage::DiskInfo::new("LibStorage::DiskInfo"); - string disk = LibStorage::ContVolInfo::swig_cdevice_get(dp); - y2milestone( "DefaultFstabOptions disk:%1", disk ); - integer r = LibStorage::StorageInterface::getDiskInfo(sint, disk, infos); - if( r==0 ) - { - integer t = LibStorage::DiskInfo::swig_transport_get(infos); - list<integer> hotpl = [ LibStorage::USB(), LibStorage::FCOE(), LibStorage::ISCSI() ]; - y2milestone( "DefaultFstabOptions transport:%1 list:%2", t, hotpl ); - if( contains( hotpl, t )) + // USB since those might actually not be present during boot + // iSCSI since the boot scripts need it + list<integer> hotplug_transports = [ LibStorage::USB(), LibStorage::ISCSI() ]; + + foreach (string usedby_device, usedby_devices, { + + any dp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo"); + if (LibStorage::StorageInterface::getContVolInfo(sint, usedby_device, dp) == 0 && + LibStorage::ContVolInfo::swig_ctype_get(dp) == LibStorage::DISK()) { - if( size(fst_default)>0 ) + string disk = LibStorage::ContVolInfo::swig_cdevice_get(dp); + any infos = LibStorage::DiskInfo::new("LibStorage::DiskInfo"); + if (LibStorage::StorageInterface::getDiskInfo(sint, disk, infos) == 0 && + contains(hotplug_transports, LibStorage::DiskInfo::swig_transport_get(infos))) + { + need_nofail = true; + } + } + }); + + if (need_nofail) + { + if (!isempty(fst_default)) fst_default = fst_default + ","; fst_default = fst_default + "nofail"; - } } } + } if( substring(fst_default,0,1)=="," ) fst_default = substring(fst_default,1); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66985 - /tags/branch-Code-11-SP2-2_17_23/fcoe-client/
by gs＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: gs Date: Tue Dec 6 13:55:08 2011 New Revision: 66985 URL: http://svn.opensuse.org/viewcvs/yast?rev=66985&view=rev Log: Created tag branch-Code-11-SP2-2_17_23 for fcoe-client Added: tags/branch-Code-11-SP2-2_17_23/fcoe-client/ - copied from r66984, branches/SuSE-Code-11-SP2-Branch/fcoe-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66984 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: VERSION package/yast2-fcoe-client.changes
by gs＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: gs Date: Tue Dec 6 13:55:00 2011 New Revision: 66984 URL: http://svn.opensuse.org/viewcvs/yast?rev=66984&view=rev Log: 2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/VERSION Tue Dec 6 13:55:00 2011 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/package/yast2-fcoe-client.changes Tue Dec 6 13:55:00 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 6 13:52:56 CET 2011 - gs(a)suse.de + +- Don't allow to change AUTO_VLAN setting for a configured device, + set interface for fcoeadm -d according to AUTO_VLAN setting +- 2.17.23 + +------------------------------------------------------------------- Wed Nov 23 10:07:53 CET 2011 - gs(a)suse.de - Set BOOTPROTO to 'static' when creating ifcfg-file, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66983 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 06 Dec '11

06 Dec '11

Author: gs Date: Tue Dec 6 13:50:04 2011 New Revision: 66983 URL: http://svn.opensuse.org/viewcvs/yast?rev=66983&view=rev Log: don't call fcoeadm -d when revert FCoE creation on Cancel (will fail here) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Tue Dec 6 13:50:04 2011 @@ -369,7 +369,10 @@ status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); // command to be able to revert the creation of FCoE VLAN interface in case of 'Cancel' - FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig rem %2", status_map["cfg_device"]:"", fcoe_vlan_interface ) ); + // FcoeClient::AddRevertCommand( sformat("fcoeadm -d %1 && vconfig rem %2", status_map["cfg_device"]:"", fcoe_vlan_interface ) ); + // 'fcoeadm -d <if>/<if>.<vlan>' fails here, 'vconfig rem <if>.<vlan>' succeeds + // and removes the interface properly (tested on RC1) + FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66982 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 05 Dec '11

05 Dec '11

Author: gs Date: Mon Dec 5 12:56:23 2011 New Revision: 66982 URL: http://svn.opensuse.org/viewcvs/yast?rev=66982&view=rev Log: use Report:: to avoid blocking of autoyast install Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Mon Dec 5 12:56:23 2011 @@ -451,7 +451,7 @@ if ( !FileUtils::Exists( file_name ) ) { y2warning( "Cannot read config file for %1 in /etc/fcoe", vlan_device_name ); - Popup::Warning( sformat(_("Cannot read config file for %1. + Report::Warning( sformat(_("Cannot read config file for %1. You may edit the settings and recreate the FCoE VLAN interface to get a valid configuration."), vlan_device_name) ); return status_map; @@ -599,7 +599,7 @@ else { y2error( "Cannot start service lldpad - '/etc/init.d/boot.lldpad start' failed" ); - Popup::Error( "Cannot start service lldpad. + Report::Error( "Cannot start service lldpad. '/etc/init.d/boot.lldpad start' failed" ); ret = false; } @@ -620,7 +620,7 @@ else { y2error( "Cannot start FCoE service - '/etc/init.d/boot.fcoe start' failed" ); - Popup::Error( "Cannot start FCoE service. + Report::Error( "Cannot start FCoE service. '/etc/init.d/boot.fcoe start' failed" ); ret = false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0