STABLE12-solaris-vfsck-allow-force-runs-when-old-inodes-exist-20020310

if running with -y report old inodes and continue anyway

(cherry picked from commit 2dbc58bc4a00a7ba755327b22b3fbd5fb05889a6)

diff --git a/src/vfsck/pass1.c b/src/vfsck/pass1.c
index 88f4e32e7a6e8ce2ad0021bfa76b8df897b54724..b1173eecb19d204c7f005e4ae7a5d7ba38a5432e 100644 (file)
--- a/src/vfsck/pass1.c
+++ b/src/vfsck/pass1.c
@@ -70,7 +70,8 @@ extern int ge_danger;
 static daddr_t badblk;
 static daddr_t dupblk;
 int pass1check();
-
+static int oldreported;
+ 
 pass1()
 {
        register int c, i, j;
@@ -306,10 +307,19 @@ ignore_direct_block_check:
 #if    defined(AFS_SUN56_ENV) 
                        if ( OLDVICEINODE )
                        {
-                           /* This looks like a sol 2.5 AFS inode */
-                           printf("This vicep partition seems to contain pre Sol2.6 AFS inodes\n");
-                           printf("You should run the AFS file conversion utility before installing Sol 2.6\n");
-                           exit(100); /* unique return code? */
+                           if (yflag) {
+                               if (!oldreported) {
+                                   printf("This vicep partition seems to contain pre Sol2.6 AFS inodes\n");
+                                   printf("You should run the AFS file conversion utility before installing Sol 2.6\n");
+                                   printf("Continuing anyway.\n");
+                                   oldreported++;
+                               }
+                           } else {
+                               /* This looks like a sol 2.5 AFS inode */
+                               printf("This vicep partition seems to contain pre Sol2.6 AFS inodes\n");
+                               printf("You should run the AFS file conversion utility before installing Sol 2.6\n");
+                               exit(100); /* unique return code? */
+                           }
                        }
 #endif
                        statemap[inumber] =