July 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62324 - in /trunk/network: package/yast2-network.changes src/isdn/lowlevel.ycp
by mzugec＠svn.opensuse.org 30 Jul '10

30 Jul '10

Author: mzugec Date: Fri Jul 30 13:38:43 2010 New Revision: 62324 URL: http://svn.opensuse.org/viewcvs/yast?rev=62324&view=rev Log: ISDN: removed deprecated documentation URL (bnc#590742) Modified: trunk/network/package/yast2-network.changes trunk/network/src/isdn/lowlevel.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jul 30 13:38:43 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jul 30 13:37:32 CEST 2010 - mzugec(a)suse.cz + +- ISDN: removed deprecated documentation URL (bnc#590742) + +------------------------------------------------------------------- Thu Jul 29 10:30:49 CEST 2010 - mzugec(a)suse.cz - fixed typo (bnc#626280) Modified: trunk/network/src/isdn/lowlevel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/isdn/lowlevel.ycp?re… ============================================================================== --- trunk/network/src/isdn/lowlevel.ycp (original) +++ trunk/network/src/isdn/lowlevel.ycp Fri Jul 30 13:38:43 2010 @@ -735,20 +735,15 @@ ISDN::only_dsl = false; if ((Default_TYPE == 8002) || (Default_TYPE == 8003) || (Default_TYPE == 8004)) { - // #151148 - string url = "http://en.opensuse.org/SDB:Notes_on_the_FRITZ!Card_DSL_Configuration"; // multiline Popup::YesNo text - if (! Popup::YesNo (sformat (_(" WARNING + if (! Popup::YesNo (_(" WARNING You have selected a binary-only driver that is not part of our distribution. You can only use this driver -after installing additional packages from AVM. -Refer to the release notes and get -further instructions from the following Web page: -%1 +after installing additional packages from AVM manually. Continue? -"), url))) +"))) continue; } break; -- 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] r62323 - /tags/branch-Code-11-SP1-2_17_22/iscsi-client/
by mzugec＠svn.opensuse.org 30 Jul '10

30 Jul '10

Author: mzugec Date: Fri Jul 30 11:40:05 2010 New Revision: 62323 URL: http://svn.opensuse.org/viewcvs/yast?rev=62323&view=rev Log: Created tag branch-Code-11-SP1-2_17_22 for iscsi-client Added: tags/branch-Code-11-SP1-2_17_22/iscsi-client/ (props changed) - copied from r62322, branches/SuSE-Code-11-SP1-Branch/iscsi-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] r62322 - in /branches/SuSE-Code-11-SP1-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/widgets.ycp
by mzugec＠svn.opensuse.org 30 Jul '10

30 Jul '10

Author: mzugec Date: Fri Jul 30 11:39:58 2010 New Revision: 62322 URL: http://svn.opensuse.org/viewcvs/yast?rev=62322&view=rev Log: login into multipath (bnc#599818) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/widgets.ycp Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-client/VERSION Fri Jul 30 11:39:58 2010 @@ -1 +1 @@ -2.17.21 +2.17.22 Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-client/package/yast2-iscsi-client.changes Fri Jul 30 11:39:58 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 30 11:39:40 CEST 2010 - mzugec(a)suse.de + +- login into multipath (bnc#599818) +- 2.17.22 + +------------------------------------------------------------------- Tue May 11 14:54:04 CEST 2010 - mzugec(a)suse.de - delete discovered targets (bnc#602108) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/widgets.ycp Fri Jul 30 11:39:58 2010 @@ -600,7 +600,7 @@ "username_in" : user_in, "password_in" : pass_in ]; - if (IscsiClientLib::connected(false) || IscsiClientLib::loginIntoTarget(target)) { + if (IscsiClientLib::connected(true) || IscsiClientLib::loginIntoTarget(target)) { // IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; IscsiClientLib::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClientLib::readSessions(); -- 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] r62321 - /tags/stable-2_19_7/iscsi-client/
by mzugec＠svn.opensuse.org 30 Jul '10

30 Jul '10

Author: mzugec Date: Fri Jul 30 11:25:52 2010 New Revision: 62321 URL: http://svn.opensuse.org/viewcvs/yast?rev=62321&view=rev Log: Created tag stable-2_19_7 for iscsi-client Added: tags/stable-2_19_7/iscsi-client/ - copied from r62320, trunk/iscsi-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] r62320 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/widgets.ycp
by mzugec＠svn.opensuse.org 30 Jul '10

30 Jul '10

Author: mzugec Date: Fri Jul 30 11:25:39 2010 New Revision: 62320 URL: http://svn.opensuse.org/viewcvs/yast?rev=62320&view=rev Log: login into multipath (bnc#599818) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=62320&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Fri Jul 30 11:25:39 2010 @@ -1 +1 @@ -2.19.6 +2.19.7 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Fri Jul 30 11:25:39 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 30 11:19:48 CEST 2010 - mzugec(a)suse.cz + +- login into multipath (bnc#599818) +- 2.19.7 + +------------------------------------------------------------------- Mon May 24 15:03:36 CEST 2010 - mzugec(a)suse.cz - summary overview for autoyast (bnc#581682) Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Fri Jul 30 11:25:39 2010 @@ -602,7 +602,7 @@ "username_in" : user_in, "password_in" : pass_in ]; - if (IscsiClientLib::connected(false) || IscsiClientLib::loginIntoTarget(target)) { + if (IscsiClientLib::connected(true) || IscsiClientLib::loginIntoTarget(target)) { // IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""]; IscsiClientLib::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value)); IscsiClientLib::readSessions(); -- 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] r62319 - in /branches/SuSE-Linux-11_3-Branch/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/include/ep-import.ycp storage/src/modules/StorageUpdate.ycp
by fehr＠svn.opensuse.org 29 Jul '10

29 Jul '10

Author: fehr Date: Thu Jul 29 16:04:19 2010 New Revision: 62319 URL: http://svn.opensuse.org/viewcvs/yast?rev=62319&view=rev Log: - fix bug that destroys encrypted volumes when wron password is entered in read fstab dialog (#625490) - replace "nofail" with "noauto" for encrypted volumes in fstab during update Modified: branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp branches/SuSE-Linux-11_3-Branch/storage/storage/src/modules/StorageUpdate.ycp Modified: branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes Thu Jul 29 16:04:19 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jul 29 15:53:11 CEST 2010 - fehr(a)suse.de + +- fix bug that destroys encrypted volumes when wron password is + entered in read fstab dialog (#625490) +- replace "nofail" with "noauto" for encrypted volumes in fstab + during update + +------------------------------------------------------------------- Mon Jun 21 16:42:34 CEST 2010 - aschnell(a)suse.de - avoid unreadable buttons (bnc #615377) Modified: branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp Thu Jul 29 16:04:19 2010 @@ -41,20 +41,23 @@ symbol check_devices_used( list<map> partitions, boolean not_cr ); -define string DlgCreateCryptFs( string device, integer minpwlen, boolean format, +define string DlgPasswdCryptFs( string device, integer minpwlen, boolean format, boolean tmpcrypt ) ``{ string helptext = GetCreateCryptFsHelptext(minpwlen, format, tmpcrypt); - y2milestone( "DlgCreateCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4", + y2milestone( "DlgPasswdCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4", device, minpwlen, format, tmpcrypt ); // heading text string h = _("Enter your Password for the Encrypted File System."); - // label text - string label = _("Don't forget what you enter here!"); + string label = ""; + if( format ) + // label text + label = _("Don't forget what you enter here!"); if( tmpcrypt ) { - label = label + " "; + if( size(label)>0 ) + label = label + " "; label = label + _("Empty password allowed."); } Modified: branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp Thu Jul 29 16:04:19 2010 @@ -346,31 +346,59 @@ boolean format_sys = true; string device = FstabAddDialog(target_map, fstabs, format_sys); + map<string, map> new_target_map = $[]; + boolean import_ok = false; if (!isempty(device)) { y2milestone("ImportMountPoints device:%1", device); list<map> fstab = (list<map>) fstabs[device]:[]; + import_ok = true; - map<string, map> new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys); + new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys); foreach(string d, map disk, new_target_map, { foreach(map p, disk["partitions"]:[], { + string key = (p["type"]:`unknown != `loop) ? (p["device"]:"error") : (p["fpath"]:"error"); if (!isempty(p["mount"]:"") && p["enc_type"]:`none!=`none && - !p["tmpcrypt"]:false) + !p["tmpcrypt"]:false && Storage::NeedCryptPwd(key) ) { - string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false ); - if( pwd != nil && !isempty(pwd) ) - Storage::SetCryptPwd( p["device"]:"", pwd ); + boolean ok = false; + string dev = p["device"]:""; + string pwd = ""; + do + { + ok = false; + pwd = DlgPasswdCryptFs( dev, 1, false, false ); + if( pwd != nil && !isempty(pwd) ) + { + if( Storage::CheckCryptOk( dev, pwd, true, + false ) ) + { + ok = Storage::SetCryptPwd( dev, pwd ) && + Storage::SetCrypt( dev, true, false ); + } + else + { + Popup::Error(_("Wrong Password provided.")); + } + } + else if( size(pwd)==0 ) + { + ok = true; + import_ok = false; + } + } + while( !ok ); + } }); }); - Storage::SetTargetMap(new_target_map); } + if( import_ok ) + Storage::SetTargetMap(new_target_map); else - { Storage::RestoreTargetBackup("import"); - } Storage::DisposeTargetBackup("import"); } Modified: branches/SuSE-Linux-11_3-Branch/storage/storage/src/modules/StorageUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/storage/storage/src/modules/StorageUpdate.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/storage/storage/src/modules/StorageUpdate.ycp Thu Jul 29 16:04:19 2010 @@ -288,6 +288,35 @@ AsciiFile::RewriteFile( crtab, tabpath ); } +void UpdateFstabCryptNofail() + { + y2milestone( "UpdateFstabCryptNofail called" ); + string tabpath = Storage::PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + boolean update = false; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + if( search( l["fields",0]:"", "/dev/mapper/cr_" )==0 ) + { + list<string> ls = splitstring( l["fields",3]:"", "," ); + ls = filter( string s, ls, ``(s!="noauto")); + if( size(filter( string s, ls, ``(s=="nofail")))==0 ) + { + ls = add( ls, "nofail" ); + AsciiFile::ChangeLineField( fstab, line, 3, + mergestring( ls, "," )); + update = true; + } + } + line = line+1; + } + if( update ) + { + AsciiFile::RewriteFile( fstab, tabpath ); + } + } /** * Updates fstab on disk @@ -388,6 +417,8 @@ bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); } + if( oldv["major"]:0<11 || (oldv["major"]:0==11 && oldv["minor"]:0<=2)) + UpdateFstabCryptNofail(); // set flag -> it indicates that Update was already called called_update = true; } -- 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] r62318 - /trunk/storage/package/yast2-storage.changes
by fehr＠svn.opensuse.org 29 Jul '10

29 Jul '10

Author: fehr Date: Thu Jul 29 16:01:39 2010 New Revision: 62318 URL: http://svn.opensuse.org/viewcvs/yast?rev=62318&view=rev Log: improve changelog Modified: trunk/storage/package/yast2-storage.changes 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 Thu Jul 29 16:01:39 2010 @@ -4,6 +4,7 @@ - fix bug that destroys encrypted volumes when wron password is entered in read fstab dialog (#625490) - replace "nofail" with "noauto" for encrypted volumes in fstab + during update ------------------------------------------------------------------- Tue Jul 20 11:26:30 CEST 2010 - fehr(a)suse.de -- 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] r62317 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageUpdate.ycp
by fehr＠svn.opensuse.org 29 Jul '10

29 Jul '10

Author: fehr Date: Thu Jul 29 15:56:21 2010 New Revision: 62317 URL: http://svn.opensuse.org/viewcvs/yast?rev=62317&view=rev Log: replace "nofail" with "noauto" for encrypted volumes in fstab Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageUpdate.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 Thu Jul 29 15:56:21 2010 @@ -3,6 +3,7 @@ - fix bug that destroys encrypted volumes when wron password is entered in read fstab dialog (#625490) +- replace "nofail" with "noauto" for encrypted volumes in fstab ------------------------------------------------------------------- Tue Jul 20 11:26:30 CEST 2010 - fehr(a)suse.de Modified: trunk/storage/storage/src/modules/StorageUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageUpdate.ycp (original) +++ trunk/storage/storage/src/modules/StorageUpdate.ycp Thu Jul 29 15:56:21 2010 @@ -288,6 +288,35 @@ AsciiFile::RewriteFile( crtab, tabpath ); } +void UpdateFstabCryptNofail() + { + y2milestone( "UpdateFstabCryptNofail called" ); + string tabpath = Storage::PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + boolean update = false; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + if( search( l["fields",0]:"", "/dev/mapper/cr_" )==0 ) + { + list<string> ls = splitstring( l["fields",3]:"", "," ); + ls = filter( string s, ls, ``(s!="noauto")); + if( size(filter( string s, ls, ``(s=="nofail")))==0 ) + { + ls = add( ls, "nofail" ); + AsciiFile::ChangeLineField( fstab, line, 3, + mergestring( ls, "," )); + update = true; + } + } + line = line+1; + } + if( update ) + { + AsciiFile::RewriteFile( fstab, tabpath ); + } + } /** * Updates fstab on disk @@ -388,6 +417,8 @@ bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); } + if( oldv["major"]:0<11 || (oldv["major"]:0==11 && oldv["minor"]:0<=2)) + UpdateFstabCryptNofail(); // set flag -> it indicates that Update was already called called_update = true; } -- 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] r62316 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/include/ep-import.ycp
by fehr＠svn.opensuse.org 29 Jul '10

29 Jul '10

Author: fehr Date: Thu Jul 29 15:54:42 2010 New Revision: 62316 URL: http://svn.opensuse.org/viewcvs/yast?rev=62316&view=rev Log: fix bug that destroys encrypted volumes when wron password is entered in read fstab dialog (#625490) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/ep-import.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 Thu Jul 29 15:54:42 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 29 15:53:11 CEST 2010 - fehr(a)suse.de + +- fix bug that destroys encrypted volumes when wron password is + entered in read fstab dialog (#625490) + +------------------------------------------------------------------- Tue Jul 20 11:26:30 CEST 2010 - fehr(a)suse.de - add support for additional parity values for raid5, raid6, raid10 Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Jul 29 15:54:42 2010 @@ -41,20 +41,23 @@ symbol check_devices_used( list<map> partitions, boolean not_cr ); -define string DlgCreateCryptFs( string device, integer minpwlen, boolean format, +define string DlgPasswdCryptFs( string device, integer minpwlen, boolean format, boolean tmpcrypt ) ``{ string helptext = GetCreateCryptFsHelptext(minpwlen, format, tmpcrypt); - y2milestone( "DlgCreateCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4", + y2milestone( "DlgPasswdCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4", device, minpwlen, format, tmpcrypt ); // heading text string h = _("Enter your Password for the Encrypted File System."); - // label text - string label = _("Don't forget what you enter here!"); + string label = ""; + if( format ) + // label text + label = _("Don't forget what you enter here!"); if( tmpcrypt ) { - label = label + " "; + if( size(label)>0 ) + label = label + " "; label = label + _("Empty password allowed."); } Modified: trunk/storage/storage/src/include/ep-import.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-i… ============================================================================== --- trunk/storage/storage/src/include/ep-import.ycp (original) +++ trunk/storage/storage/src/include/ep-import.ycp Thu Jul 29 15:54:42 2010 @@ -357,31 +357,59 @@ boolean format_sys = true; string device = FstabAddDialog(target_map, fstabs, format_sys); + map<string, map> new_target_map = $[]; + boolean import_ok = false; if (!isempty(device)) { y2milestone("ImportMountPoints device:%1", device); list<map> fstab = (list<map>) fstabs[device]:[]; + import_ok = true; - map<string, map> new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys); + new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys); foreach(string d, map disk, new_target_map, { foreach(map p, disk["partitions"]:[], { + string key = (p["type"]:`unknown != `loop) ? (p["device"]:"error") : (p["fpath"]:"error"); if (!isempty(p["mount"]:"") && p["enc_type"]:`none!=`none && - !p["tmpcrypt"]:false) + !p["tmpcrypt"]:false && Storage::NeedCryptPwd(key) ) { - string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false ); - if( pwd != nil && !isempty(pwd) ) - Storage::SetCryptPwd( p["device"]:"", pwd ); + boolean ok = false; + string dev = p["device"]:""; + string pwd = ""; + do + { + ok = false; + pwd = DlgPasswdCryptFs( dev, 1, false, false ); + if( pwd != nil && !isempty(pwd) ) + { + if( Storage::CheckCryptOk( dev, pwd, true, + false ) ) + { + ok = Storage::SetCryptPwd( dev, pwd ) && + Storage::SetCrypt( dev, true, false ); + } + else + { + Popup::Error(_("Wrong Password provided.")); + } + } + else if( size(pwd)==0 ) + { + ok = true; + import_ok = false; + } + } + while( !ok ); + } }); }); - Storage::SetTargetMap(new_target_map); } + if( import_ok ) + Storage::SetTargetMap(new_target_map); else - { Storage::RestoreTargetBackup("import"); - } Storage::DisposeTargetBackup("import"); } -- 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] r62315 - in /trunk/network: package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 29 Jul '10

29 Jul '10

Author: mzugec Date: Thu Jul 29 10:31:15 2010 New Revision: 62315 URL: http://svn.opensuse.org/viewcvs/yast?rev=62315&view=rev Log: fixed typo (bnc#626280) Modified: trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jul 29 10:31:15 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 29 10:30:49 CEST 2010 - mzugec(a)suse.cz + +- fixed typo (bnc#626280) + +------------------------------------------------------------------- Tue Jul 27 16:20:24 CEST 2010 - mzugec(a)suse.cz - YaPI: allow dhcp + static hostname (bnc#624655) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Thu Jul 29 10:31:15 2010 @@ -471,7 +471,7 @@ string mask=(string) UI::QueryWidget (`netmask, `Value); if(!validPrefixOrNetmask(ipa, mask)){ - Popup::Error(_("No valid netmask or prefix lenght.")); + Popup::Error(_("No valid netmask or prefix length.")); UI::SetFocus(`netmask); return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0