[meego-commits] 8419: Changes to MeeGo:1.1:Core:Testing/e2fsprogs

[Yan Li]

Hi,
I have made the following changes to e2fsprogs in project MeeGo:1.1:Core:Testing. Please review and accept ASAP.

Thank You,
Yan Li

[This message was auto-generated]

---

Request #8419:

  submit:   home:yanli:branches:MeeGo:1.1:Core:Testing/e2fsprogs(r2)(cleanup) -> MeeGo:1.1:Core:Testing/e2fsprogs


Message:
    Synced with MeeGo 1.0 branch, bringing in meego-time-check-preen-ok.patch, which fixes BMC#1794 and BMC#6968

State:   new          2010-10-14T01:31:30 yanli
Comment: None



changes files:
--------------
--- e2fsprogs.changes
+++ e2fsprogs.changes
@@ -0,0 +1,3 @@
+* Mon May 10 2010 Yan Li <yan.i.li at intel.com> - 1.41.9
+- Make last-mount-time and last-write-time checks preen OK (BMC#1794)
+

new:
----
  meego-time-check-preen-ok.patch

spec files:
-----------
--- e2fsprogs.spec
+++ e2fsprogs.spec
@@ -11,6 +11,7 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: ext2_types-wrapper.h
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch10: meego-time-check-preen-ok.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -127,6 +128,7 @@
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
+%patch10 -p1
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --disable-libblkid --disable-uuidd --disable-libuuid

other changes:
--------------

++++++ meego-time-check-preen-ok.patch (new)
--- meego-time-check-preen-ok.patch
+++ meego-time-check-preen-ok.patch
+From: Yan Li <yan.i.li at intel.com>
+Date: Mon, 10 May 2010 11:23:24 +0800
+Subject: [PATCH] (BMC#1794) Make last-mount-time and last-write-time checks preen OK
+
+A wrong last-mount-time or last-write-time is most probably due to a
+broken RTC or a radical clock change, and it shouldn't be fatal.
+Auto preen is OK.
+
+Signed-off-by: Yan Li <yan.i.li at intel.com>
+---
+diff -Nur e2fsprogs-1.41.9/e2fsck/problem.c e2fsprogs-1.41.9.fix/e2fsck/problem.c
+--- e2fsprogs-1.41.9/e2fsck/problem.c	2009-08-23 01:19:04.000000000 +0800
++++ e2fsprogs-1.41.9.fix/e2fsck/problem.c	2010-05-10 11:18:50.000000000 +0800
+@@ -335,12 +335,12 @@
+ 	/* Last mount time is in the future */
+ 	{ PR_0_FUTURE_SB_LAST_MOUNT,
+ 	  N_("@S last mount time (%t,\n\tnow = %T) is in the future.\n"),
+-	  PROMPT_FIX, PR_NO_OK },
++	  PROMPT_FIX, PR_PREEN_OK },
+ 
+ 	/* Last write time is in the future */
+ 	{ PR_0_FUTURE_SB_LAST_WRITE,
+ 	  N_("@S last write time (%t,\n\tnow = %T) is in the future.\n"),
+-	  PROMPT_FIX, PR_NO_OK },
++	  PROMPT_FIX, PR_PREEN_OK },
+ 
+ 	{ PR_0_EXTERNAL_JOURNAL_HINT,
+ 	  N_("@S hint for external superblock @s %X.  "),