Changeset 17023

Timestamp:

05/11/11 16:35:06 (2 years ago)

Author:

BrainSlayer

Message:

REE small changes for X86

File:

• src/router/services/sysinit/sysinit-x86.c (modified) (2 diffs)

src/router/services/sysinit/sysinit-x86.c

@@ -97 +97 @@
                 exit(0);
         }
-#ifdef HAVE_ERC
-        if (nvram_match("ree_resetme", "1")) {
-                fprintf(stderr, "Restoring REE default nvram\n");
-                eval("nvram","restore","/etc/defaults/x86ree.backup");
-                eval("reboot");
-                eval("event", "5", "1", "15");
-                }
-#endif
 
         FILE *in = fopen("/usr/local/nvram/nvram.db", "rb");
@@ -150 +142 @@
         if (!nvram_match("disable_watchdog", "1"))
                 eval("watchdog");       // system watchdog
+#ifdef HAVE_ERC
+        if (isregistered_real() && nvram_match("ree_resetme", "1")) {
+                fprintf(stderr, "Restoring REE default nvram\n");
+                eval("nvram","restore","/etc/defaults/x86ree.backup");
+                eval("reboot");
+                eval("event", "5", "1", "15");
+                }
+#endif
 
         cprintf("sysinit() setup console\n");