Author: fehr Date: Thu Apr 22 16:48:53 2010 New Revision: 61826 URL: http://svn.opensuse.org/viewcvs/yast?rev=61826&view=rev Log: - add missing hunk to finally fix bnc #594347 - 2.17.98 Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/VERSION?rev=61826&r1=61825&r2=61826&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Thu Apr 22 16:48:53 2010 @@ -1 +1 @@ -2.17.97 +2.17.98 Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc?rev=61826&r1=61825&r2=61826&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/EtcFstab.cc Thu Apr 22 16:48:53 2010 @@ -511,16 +511,12 @@ ls.push_back( mergeString( e.opts, "," ) ); if( e.dmcrypt && e.mount!="swap" ) { - if( find( e.opts.begin(), e.opts.end(), "noauto" )==e.opts.end() ) + if( find( e.opts.begin(), e.opts.end(), "nofail" )==e.opts.end() ) { if( ls.back() == "defaults" ) - ls.back() = "noauto"; + ls.back() = "nofail"; else - ls.back() += ",noauto"; - } - if( find( e.opts.begin(), e.opts.end(), "nofail" )==e.opts.end() ) - { - ls.back() += ",nofail"; + ls.back() += ",nofail"; } } if( !e.cryptotab ) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc?rev=61826&r1=61825&r2=61826&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc Thu Apr 22 16:48:53 2010 @@ -2505,7 +2505,7 @@ unsigned Volume::fstabPassno() const { unsigned ret = 2; - if( noFreqPassno() || (encryption!=ENC_NONE&&!dmcrypt()) ) + if( noFreqPassno() || (encryption!=ENC_NONE&&dmcrypt()) ) ret = 0; else if( mp=="/" ) ret = 1; Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=61826&r1=61825&r2=61826&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Thu Apr 22 16:48:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 22 16:25:56 CEST 2010 - fehr@suse.de + +- add missing hunk to finally fix bnc #594347 +- 2.17.98 + +------------------------------------------------------------------- Thu Apr 22 15:13:21 CEST 2010 - aschnell@suse.de - log temporary mdadm.conf (see bnc #598827) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org