removing the brittle 'file' check of image and kernel

eucalyptus · Mar 10, 2010 · 5335207 · 5335207
1 parent b3bf50c
commit 5335207
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/storage/ami2vmx.c b/storage/ami2vmx.c
@@ -213,10 +213,7 @@ int verify_input(char *file, char *kernel, char *ramdisk, char *modules, int for
   }
   if (strstr(output, "ext2 filesystem") || strstr(output, "ext3 filesystem") || strstr(output, "ext4 filesystem")) {
   } else {
-    printf("ERROR: supplied image is not an ext2, ext3 or ext4 filesystem '%s'\n", file);
+    printf("WARNING: supplied image is not an ext2, ext3 or ext4 filesystem '%s'\n", file);
-    if (!force) {
-      return(1);
-    }
   }
   free(output);
 
@@ -228,8 +225,7 @@ int verify_input(char *file, char *kernel, char *ramdisk, char *modules, int for
   }
   if (strstr(output, "Linux kernel")) {
   } else {
-    printf("ERROR: supplied kernel is not a Linux kernel '%s'\n", kernel);
+    printf("WARNING: supplied kernel may not be a Linux kernel '%s'\n", kernel);
-    if (!force) return(1);
   }
   free(output);