Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Dec 9th, 2009  |  syntax: None  |  size: 1.66 KB  |  views: 123  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -urN fsarchiver-0.6.2/ChangeLog fsarchiver-0.6.2-b/ChangeLog
  2. --- fsarchiver-0.6.2/ChangeLog  2009-12-08 19:36:02.000000000 +0000
  3. +++ fsarchiver-0.6.2-b/ChangeLog        2009-12-09 15:41:19.000000000 +0000
  4.  -1,5 +1,7 @@
  5.  fsarchiver: Filesystem Archiver for Linux [http://www.fsarchiver.org]
  6.  =====================================================================
  7. +* 0.6.3 (not released yet):
  8. +  - Don't fail when e2fsck returns 1 in extfs_mkfs() since it means the filesystem has been fixed
  9.  * 0.6.2 (2009-12-08):
  10.    - Dynamic memory allocation for ntfs specific extended-attributes in create.c
  11.    - Fix related the the ntfs attributes when lgetxattr returns a negative size
  12. diff -urN fsarchiver-0.6.2/src/fs_ext2.c fsarchiver-0.6.2-b/src/fs_ext2.c
  13. --- fsarchiver-0.6.2/src/fs_ext2.c      2009-12-06 10:30:42.000000000 +0000
  14. +++ fsarchiver-0.6.2-b/src/fs_ext2.c    2009-12-09 15:39:28.000000000 +0000
  15.  -141,6 +141,7 @@
  16.      int compat_type;
  17.      u64 temp64;
  18.      int ret=0;
  19. +    int res;
  20.      int i;
  21.  
  22.      // init
  23.  -282,8 +283,8 @@
  24.          // http://article.gmane.org/gmane.comp.file-systems.ext4/11181
  25.          if (extfstype==EXTFSTYPE_EXT4 && e2fstoolsver<PROGVER(1,41,4))
  26.          {
  27. -            if (exec_command(command, sizeof(command), NULL, 0, NULL, 0, "e2fsck -fy %s", partition)!=0)
  28. -            {   errprintf("command [%s] failed\n", command);
  29. +            if ( ((res=exec_command(command, sizeof(command), NULL, 0, NULL, 0, "e2fsck -fy %s", partition))!=0) && (res!=1) )
  30. +            {   errprintf("command [%s] failed with return status=%d\n", command, res);
  31.                  ret=-1;
  32.                  goto extfs_mkfs_cleanup;
  33.              }