Changeset 1440 for trunk

Timestamp:

09/14/11 01:14:25 (8 months ago)

Author:

stefanct

Message:

Make the laptop warning less scary if unsure

Telling the user to use "force_I_want_a_brick" if it is not even a
laptop, is a bit over-the-top. Introduce a new laptop parameter
"this_is_not_a_laptop" that allows to force operation, but only if
the detection is not sure.

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

File:

• trunk/internal.c (modified) (4 diffs)

trunk/internal.c

@@ -140 +140 @@
 #endif
         int force_laptop = 0;
+        int not_a_laptop = 0;
         char *arg;
 
@@ -171 +172 @@
 
         arg = extract_programmer_param("laptop");
-        if (arg && !strcmp(arg,"force_I_want_a_brick")) {
+        if (arg && !strcmp(arg, "force_I_want_a_brick"))
                 force_laptop = 1;
-        } else if (arg && !strlen(arg)) {
+        else if (arg && !strcmp(arg, "this_is_not_a_laptop"))
+                not_a_laptop = 1;
+        else if (arg && !strlen(arg)) {
                 msg_perr("Missing argument for laptop.\n");
                 free(arg);
@@ -238 +241 @@
                                  "not detect this for sure because your vendor has not setup the SMBIOS\n"
                                  "tables correctly. You can enforce execution by adding\n"
-                                 "'-p internal:laptop=force_I_want_a_brick' to the command line, but\n"
+                                 "'-p internal:laptop=this_is_not_a_laptop' to the command line, but\n"
                                  "please read the following warning if you are not sure.\n\n");
                 }
@@ -252 +255 @@
                          "========================================================================\n");
 
-                if (force_laptop) {
-                        msg_perr("Proceeding anyway because user specified "
-                                 "laptop=force_I_want_a_brick\n");
+                if (force_laptop || (not_a_laptop && (is_laptop == 2))) {
+                        msg_perr("Proceeding anyway because user forced us to.\n");
                 } else {
                         msg_perr("Aborting.\n");