Changeset 3969cd92c20f6b1f8a56ea1362617fe257643ac5

Timestamp:

11/02/09 12:40:51 (3 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

eed4119f07af14cb24ec3ae4e9678dbeb5de80de

Parents:

291f0542a26110868069d9f92d7d71c9974e28ff, ad501c9ca99dad2f52af62399c3ff7da9bfe09b5

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-11-02T13:40:51Z+0100

Message:

Merge remote branch 'pam/hdt-0.3.5'

Location:

com32/hdt

Files:

• hdt-cli-hdt.c (modified) (2 diffs)
• hdt-cli.h (modified) (1 diff)
• hdt-common.c (modified) (2 diffs)
• hdt-common.h (modified) (1 diff)
• hdt-menu-about.c (modified) (2 diffs)
• hdt-menu.c (modified) (1 diff)
• hdt.c (modified) (1 diff)
• hdt.h (modified) (1 diff)

com32/hdt/hdt-cli-hdt.c

@@ -253 +253 @@
 }
 
+/**
+ * do_reboot - reboot the system
+ **/
+static void do_reboot(int argc __unused, char** argv __unused,
+                          struct s_hardware *hardware)
+{
+    /* Use specific syslinux call if needed */
+    if (issyslinux())
+        return runsyslinuxcmd(hardware->reboot_label);
+    else
+        return csprint(hardware->reboot_label, 0x07);
+}
+
 /* Default hdt mode */
 struct cli_callback_descr list_hdt_default_modules[] = {
@@ -270 +283 @@
                 .name = CLI_MENU,
                 .exec = goto_menu,
+        },
+        {
+                .name = CLI_REBOOT,
+                .exec = do_reboot,
         },
         {

com32/hdt/hdt-cli.h

@@ -49 +49 @@
 #define CLI_EXIT "exit"
 #define CLI_HELP "help"
+#define CLI_REBOOT "reboot"
 #define CLI_SHOW "show"
 #define CLI_SET "set"

com32/hdt/hdt-common.c

@@ -73 +73 @@
         sizeof(hardware->memtest_label));
       convert_isolinux_filename(hardware->memtest_label,hardware);
+    } else if (!strncmp(argv[i], "reboot=", 7)) {
+      strncpy(hardware->reboot_label, argv[i] + 7,
+        sizeof(hardware->reboot_label));
+      convert_isolinux_filename(hardware->reboot_label,hardware);
     }
   }
@@ -134 +138 @@
          sizeof hardware->modules_alias_path);
   memset(hardware->memtest_label, 0, sizeof hardware->memtest_label);
+  memset(hardware->reboot_label, 0, sizeof hardware->reboot_label);
   strcat(hardware->pciids_path, "pci.ids");
   strcat(hardware->modules_pcimap_path, "modules.pcimap");
   strcat(hardware->modules_alias_path, "modules.alias");
   strcat(hardware->memtest_label, "memtest");
+  strcat(hardware->reboot_label, "reboot.c32");
 }
 

com32/hdt/hdt-common.h

@@ -163 +163 @@
   char pciids_path[255];
   char memtest_label[255];
+  char reboot_label[255];
 };
 

com32/hdt/hdt-menu-about.c

@@ -40 +40 @@
   set_menu_pos(SUBMENU_Y, SUBMENU_X);
 
-  snprintf(buffer, sizeof buffer, "Product     : %s", PRODUCT_NAME);
+  snprintf(buffer, sizeof buffer, "Product        : %s", PRODUCT_NAME);
   snprintf(statbuffer, sizeof statbuffer, "Product : %s", PRODUCT_NAME);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Version     : %s", VERSION);
-  snprintf(statbuffer, sizeof statbuffer, "Version : %s", VERSION);
+  snprintf(buffer, sizeof buffer, "Version        : %s (%s)", VERSION, CODENAME);
+  snprintf(statbuffer, sizeof statbuffer, "Version : %s (%s)", VERSION,CODENAME);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Author      : %s", AUTHOR);
-  snprintf(statbuffer, sizeof statbuffer, "Author  : %s", AUTHOR);
+  snprintf(buffer, sizeof buffer, "Project Leader : %s", AUTHOR);
+  snprintf(statbuffer, sizeof statbuffer, "Project Leader  : %s", AUTHOR);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Contact     : %s", CONTACT);
+  snprintf(buffer, sizeof buffer, "Contact        : %s", CONTACT);
   snprintf(statbuffer, sizeof statbuffer, "Contact : %s", CONTACT);
+  add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+  menu->items_count++;
+
+  snprintf(buffer, sizeof buffer, "Core Developer : %s", CORE_DEVELOPER);
+  snprintf(statbuffer, sizeof statbuffer, "Core Developer  : %s", CORE_DEVELOPER);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
@@ -62 +67 @@
   char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS;
   for (int c=0; c<NB_CONTRIBUTORS; c++) {
-   snprintf(buffer, sizeof buffer, "Contributor : %s", contributors[c]);
+   snprintf(buffer, sizeof buffer, "Contributor    : %s", contributors[c]);
    snprintf(statbuffer, sizeof statbuffer, "Contributor : %s", contributors[c]);
    add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);

com32/hdt/hdt-menu.c

@@ -293 +293 @@
   add_item("<A>bout", "About Menu", OPT_SUBMENU, NULL,
      hdt_menu->about_menu.menu);
+  add_item("<R>eboot", "Reboot", OPT_RUN, hardware->reboot_label, 0);
   add_item("E<x>it","Exit", OPT_EXITMENU,NULL,0);
   hdt_menu->main_menu.items_count++;

com32/hdt/hdt.c

@@ -49 +49 @@
   struct s_hardware hardware;
 
-  snprintf(version_string, sizeof version_string, "%s %s",
-           PRODUCT_NAME,VERSION);
+  snprintf(version_string, sizeof version_string, "%s %s (%s)",
+           PRODUCT_NAME,VERSION, CODENAME);
 
   /* Opening the Syslinux console */

com32/hdt/hdt.h

@@ -32 +32 @@
 #define PRODUCT_NAME "Hardware Detection Tool"
 #define AUTHOR "Erwan Velu"
+#define CORE_DEVELOPER "Pierre-Alexandre Meyer"
 #define CONTACT "hdt@zytor.com"
-#define VERSION "0.3.5-pre1"
-#define NB_CONTRIBUTORS 3
-#define CONTRIBUTORS {"Pierre-Alexandre Meyer", "Sebastien Gonzalve", "Gert Hulselmans"}
+#define VERSION "0.3.5-pre2"
+#define CODENAME "mojito"
+#define NB_CONTRIBUTORS 2 
+#define CONTRIBUTORS {"Sebastien Gonzalve", "Gert Hulselmans"}
 
 #define ATTR_PACKED __attribute__((packed))