Imported Debian patch 3.6-1

[debian/elilo] / choosers / textmenu.c

diff --git a/choosers/textmenu.c b/choosers/textmenu.c
index a8067b4b5496b49e344b6369c9f710734416b072..fb5ae007cda8afcb391b402980d66ff5120a0ee6 100644 (file)
--- a/choosers/textmenu.c
+++ b/choosers/textmenu.c
@@ -358,6 +358,7 @@ textmenu_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmd
 #      define BOOT_IMG_STR     L"BOOT_IMAGE="
        CHAR16 label[CMDLINE_MAXLEN];
        CHAR16 initrd_name[CMDLINE_MAXLEN];
+       CHAR16 vmcode_name[CMDLINE_MAXLEN];
        CHAR16 args[CMDLINE_MAXLEN];
        CHAR16 devname[CMDLINE_MAXLEN];
        CHAR16 dpath[FILENAME_MAXLEN];
@@ -382,7 +383,7 @@ textmenu_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmd
                nlabels++;
        }
 restart:
-       initrd_name[0] = kname[0] = cmdline[0] = args[0] = CHAR_NULL;
+       vmcode_name[0] = initrd_name[0] = kname[0] = cmdline[0] = args[0] = CHAR_NULL;
 
        /* reset per image loader options */
        Memset(&elilo_opt.img_opt, 0, sizeof(elilo_opt.img_opt));
@@ -400,7 +401,7 @@ restart:
        if (elilo_opt.alt_check && alternate_kernel(PromptBuf, sizeof(PromptBuf)) == 0) {
                argc    = argify(PromptBuf,sizeof(PromptBuf), argv); 
                index   = 0;
-               label[0] = args[0] = initrd_name[0] = 0;
+               label[0] = args[0] = initrd_name[0] = vmcode_name[0] = 0;
        }
 
        /*
@@ -412,16 +413,16 @@ restart:
         * still be modified by global options in the config file.
         */
        if (label[0])
-               ret = find_label(label, kname, args, initrd_name);
+               ret = find_label(label, kname, args, initrd_name, vmcode_name);
        else
-               ret = find_label((index < argc) ? argv[index] : NULL, kname, args, initrd_name);
+               ret = find_label((index < argc) ? argv[index] : NULL, kname, args, initrd_name, vmcode_name);
 
        /*
         * not found, so assume first argument is kernel name and
         * not label name 
         */
        if (ret == -1) {
-               if ((index < argc) && argv[index])
+               if ((index < argc) && argv[index]) 
                        StrCpy(kname, argv[index]);
                else
                        StrCpy(kname, elilo_opt.default_kernel);
@@ -448,9 +449,14 @@ restart:
                StrCpy(elilo_opt.initrd, initrd_name);
        }
 
+       if (elilo_opt.vmcode[0] == CHAR_NULL && vmcode_name[0] != CHAR_NULL) {
+               StrCpy(elilo_opt.vmcode, vmcode_name);
+       }
+
        VERB_PRT(1,  { Print(L"kernel     is  '%s'\n", kname);
                       Print(L"arguments  are '%s'\n", args);
                        if (elilo_opt.initrd[0]) Print(L"initrd      is '%s'\n", elilo_opt.initrd);
+                       if (elilo_opt.vmcode[0]) Print(L"vmm         is '%s'\n", elilo_opt.vmcode);
                      });
 
        if (elilo_opt.prompt == 0) {
@@ -459,6 +465,7 @@ restart:
                ret = wait_timeout(elilo_opt.delay);
                if (ret != 0) {
                        elilo_opt.prompt = 1;
+                       elilo_opt.initrd[0] = CHAR_NULL;
                        elilo_opt.timeout =  ELILO_TIMEOUT_INFINITY;
                        elilo_opt.initrd[0] = CHAR_NULL;
                        goto restart;
@@ -494,6 +501,7 @@ restart:
        len = StrLen(BOOT_IMG_STR)      /* BOOT_IMAGE= */
             +StrLen(devname)           /* device name */
             +StrLen(kname)             /* kernel name */
+            +elilo_opt.vmcode[0] ? StrLen(elilo_opt.vmcode) : StrLen(kname)
             +1                         /* space */
             +StrLen(args);             /* args length */
 
@@ -505,7 +513,10 @@ restart:
        }
        StrCpy(cmdline, L"BOOT_IMAGE=");
        StrCat(cmdline, devname);
-       StrCat(cmdline, kname);
+       if (elilo_opt.vmcode[0])
+               StrCat(cmdline, elilo_opt.vmcode);
+       else
+               StrCat(cmdline, kname);
        StrCat(cmdline, L" ");
        StrCat(cmdline, args);