Add new options into /sbin/grub, and eliminate the completion code from Stage 1.5.

shared_src/disk_io.c

@@ -599,9 +599,11 @@ set_device (char *device)
   current_drive = saved_drive;
   current_partition = 0xFFFFFF;
 
+#ifndef STAGE1_5
   if (*device == '(' && !*(device + 1))
     /* user has given '(' only, let disk_choice handle what disks we have */
     return device + 1;
+#endif
   
   if (*device == '(' && *(++device))
     {
@@ -609,6 +611,7 @@ set_device (char *device)
 	{
 	  char ch = *device;
 
+#ifndef STAGE1_5
 	  if (*device == 'f' || *device == 'h')
 	    {
 	      /* user has given '([fh]', check for resp. add 'd' and 
@@ -623,6 +626,7 @@ set_device (char *device)
 	      else if (*(device + 1) == 'd' && !*(device + 2))
 		return device + 2;
 	    }
+#endif
  
 	  if ((*device == 'f' || *device == 'h')
 	      && (device += 2, (*(device - 1) != 'd')))

shared_src/shared.h

@@ -288,6 +288,10 @@ extern char config_file[];
 extern int use_config_file;
 /* If not using curses, this variable is set to zero, otherwise non-zero.  */
 extern int use_curses;
+/* The flag for verbose messages.  */
+extern int verbose;
+/* The flag for read-only.  */
+extern int read_only;
 #endif
 
 #ifndef STAGE1_5