[maemo-commits] [maemo-commits] r18152 - in projects/haf/trunk/dosfstools/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-23 17:20:02 +0300 (Thu, 23 Apr 2009)
New Revision: 18152

Added:
   projects/haf/trunk/dosfstools/debian/patches/18-skip_backup_boot.patch
   projects/haf/trunk/dosfstools/debian/patches/19-no_writes.patch
Modified:
   projects/haf/trunk/dosfstools/debian/changelog
   projects/haf/trunk/dosfstools/debian/patches/series
Log:
ignore backup boot sector


Modified: projects/haf/trunk/dosfstools/debian/changelog
===================================================================
--- projects/haf/trunk/dosfstools/debian/changelog	2009-04-23 11:02:57 UTC (rev 18151)
+++ projects/haf/trunk/dosfstools/debian/changelog	2009-04-23 14:20:02 UTC (rev 18152)
@@ -1,3 +1,11 @@
+dosfstools (3.0.1-1maemo4~unreleased) unstable; urgency=low
+
+  * Add two patches from Leonid.
+  * Fixes: NB#105485 - External memory card is becoming read-only when it is
+    renamed.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 23 Apr 2009 16:56:01 +0300
+
 dosfstools (3.0.1-1maemo3) unstable; urgency=low
 
   * Add patch from Leonid to add support for -I command line option.

Added: projects/haf/trunk/dosfstools/debian/patches/18-skip_backup_boot.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/18-skip_backup_boot.patch	2009-04-23 11:02:57 UTC (rev 18151)
+++ projects/haf/trunk/dosfstools/debian/patches/18-skip_backup_boot.patch	2009-04-23 14:20:02 UTC (rev 18152)
@@ -0,0 +1,84 @@
+Index: dosfstools-3.0.1/src/boot.c
+===================================================================
+--- dosfstools-3.0.1.orig/src/boot.c	2009-04-20 16:35:27.000000000 +0300
++++ dosfstools-3.0.1/src/boot.c		2009-04-20 16:39:31.000000000 +0300
+@@ -136,7 +136,7 @@
+     printf("%10u sectors total\n", sectors ? sectors : CF_LE_L(b->total_sect));
+ }
+ 
+-static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss)
++static void check_backup_boot(DOS_FS *fs, struct boot_sector *b, int lss, int skip_trivial_errors)
+ {
+     struct boot_sector b2;
+ 
+@@ -194,8 +194,10 @@
+ 	}
+ 	printf( "\n" );
+ 
+-	printf("Copying backup to original\n");
+-	fs_write(0,sizeof(b2),&b2);
++	if ( !skip_trivial_errors ) {
++		printf("Copying backup to original\n");
++		fs_write(0,sizeof(b2),&b2);
++	}
+     }
+ }
+ 
+@@ -276,7 +278,7 @@
+ 	fs->free_clusters = CF_LE_L(i.free_clusters);
+ }
+ 
+-void read_boot(DOS_FS *fs)
++void read_boot(DOS_FS *fs, int skip_trivial_errors)
+ {
+     struct boot_sector b;
+     unsigned total_sectors;
+@@ -337,7 +339,7 @@
+ 			fs->clusters, FAT16_THRESHOLD);
+ 
+ 	fs->backupboot_start = CF_LE_W(b.backup_boot)*logical_sector_size;
+-	check_backup_boot(fs,&b,logical_sector_size);
++	check_backup_boot(fs,&b,logical_sector_size,skip_trivial_errors);
+ 
+ 	read_fsinfo(fs,&b,logical_sector_size);
+     }
+Index: dosfstools-3.0.1/src/boot.h
+===================================================================
+--- dosfstools-3.0.1.orig/src/boot.h	2009-04-20 16:35:26.000000000 +0300
++++ dosfstools-3.0.1/src/boot.h		2009-04-20 16:37:47.000000000 +0300
+@@ -23,7 +23,7 @@
+ #ifndef _BOOT_H
+ #define _BOOT_H
+ 
+-void read_boot(DOS_FS *fs);
++void read_boot(DOS_FS *fs, int skip_trivial_errors);
+ void write_label(DOS_FS *fs, char *label);
+ 
+ /* Reads the boot sector from the currently open device and initializes *FS */
+Index: dosfstools-3.0.1/src/dosfsck.c
+===================================================================
+--- dosfstools-3.0.1.orig/src/dosfsck.c	2009-04-20 16:37:06.000000000 +0300
++++ dosfstools-3.0.1/src/dosfsck.c	2009-04-20 16:37:35.000000000 +0300
+@@ -198,7 +198,7 @@
+ 
+     printf( "dosfsck " VERSION ", " VERSION_DATE ", FAT32, LFN\n" );
+     fs_open(argv[optind],rw);
+-    read_boot(&fs);
++    read_boot(&fs, skip_trivial_errors);
+     fprintf(stderr, "alleged total clusters: %lu\n", fs.clusters);
+     cluster_step = fs.clusters / 100;
+     if (verify) printf("Starting check/repair pass.\n");
+Index: dosfstools-3.0.1/src/dosfslabel.c
+===================================================================
+--- dosfstools-3.0.1.orig/src/dosfslabel.c  2009-04-20 16:50:57.000000000 +0300
++++ dosfstools-3.0.1/src/dosfslabel.c       2009-04-20 16:51:11.000000000 +0300
+@@ -115,7 +115,7 @@
+     }
+
+     fs_open(device, rw);
+-    read_boot(&fs);
++    read_boot(&fs, 0);
+     if (!rw) {
+         fprintf(stdout, "%s\n", fs.label);
+         exit(0);
+

Added: projects/haf/trunk/dosfstools/debian/patches/19-no_writes.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/19-no_writes.patch	2009-04-23 11:02:57 UTC (rev 18151)
+++ projects/haf/trunk/dosfstools/debian/patches/19-no_writes.patch	2009-04-23 14:20:02 UTC (rev 18152)
@@ -0,0 +1,12 @@
+Index: dosfstools-3.0.1/src/dosfsck.c
+===================================================================
+--- dosfstools-3.0.1.orig/src/dosfsck.c	2009-04-02 14:21:29.000000000 +0300
++++ dosfstools-3.0.1/src/dosfsck.c	2009-04-02 14:22:08.000000000 +0300
+@@ -180,6 +180,7 @@
+                 }
+ 		break;
+ 	    case 'I':
++		rw = 0;
+ 		skip_trivial_errors = 1;
+ 		break;
+ 	    default:

Modified: projects/haf/trunk/dosfstools/debian/patches/series
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/series	2009-04-23 11:02:57 UTC (rev 18151)
+++ projects/haf/trunk/dosfstools/debian/patches/series	2009-04-23 14:20:02 UTC (rev 18152)
@@ -13,3 +13,5 @@
 15-osso-memory.patch
 16-time_limit.patch
 17-ignore-free-clusters.patch
+18-skip_backup_boot.patch
+19-no_writes.patch