Author: fehr Date: Tue Jan 18 14:52:12 2011 New Revision: 63198 URL: http://svn.opensuse.org/viewcvs/yast?rev=63198&view=rev Log: adaptations for unattended migration Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp 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/storage/package/yast2-storage.changes?rev=63198&r1=63197&r2=63198&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 18 14:52:12 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 18 14:49:17 CET 2011 - jsrain@suse.cz + +- adaptations for unattended migration + +------------------------------------------------------------------- Mon Jan 17 17:10:56 CET 2011 - aschnell@suse.de - fix for mmcblk devices (bnc #663528) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp?rev=63198&r1=63197&r2=63198&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 18 14:52:12 2011 @@ -319,7 +319,7 @@ any env = LibStorage::Environment::new("LibStorage::Environment", readonly); LibStorage::Environment::swig_testmode_set(env, Mode::test()); LibStorage::Environment::swig_autodetect_set(env, true); - LibStorage::Environment::swig_instsys_set(env, Mode::installation() || Mode::repair()); + LibStorage::Environment::swig_instsys_set(env, Stage::initial() || Mode::repair()); integer locker_pid = 0; sint = LibStorage::createStorageInterfacePid(env, locker_pid); @@ -5164,6 +5164,25 @@ } } +global define void UpdateFstabOptions() { + y2milestone( "UpdateFstabOptions" ); + string tabpath = PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + string n = ""; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + string options = l["fields", 3]:""; + if (regexpmatch (options, "^\(.*,\)\?hotplug\(,.*\)\?$")) { + options = regexpsub (options, "^\(.*,\)\?hotplug\(,.*\)\?$", "\\1nofail\\2"); + AsciiFile::ChangeLineField( fstab, line, 3, options ); + } + line = line+1; + } + AsciiFile::RewriteFile( fstab, tabpath ); +} + global string HdToIseries( string input ) ``{ string ret = input; @@ -5550,6 +5569,10 @@ UpdateFstabPersistentNames(); } + + // FIXME: proper fix + UpdateFstabOptions(); + // remove EVMS // FIXME add appropriate condition if needed (does not seem so) UpdateFstabEvms2Lvm(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org