Changeset 18882

Timestamp:

03/31/12 06:44:30 (14 months ago)

Author:

BrainSlayer

Message:

small adjustment for factory defaults

Location:

src/router/httpd/modules

Files:

• broadcom.c (modified) (2 diffs)
• upgrade.c (modified) (1 diff)

src/router/httpd/modules/broadcom.c

@@ -1407 +1407 @@
                 int region_sa = 0;
                 if(nvram_default_match("region", "SA", ""))
-                        region_sa = 0;
+                        region_sa = 1;
 #endif
                 killall("udhcpc", SIGKILL);
@@ -1476 +1476 @@
 #endif
 #ifdef HAVE_BUFFALO_SA
+                nvram_set("sv_restore_defaults", "1");
                 if(region_sa)
-                {
-                        nvram_set("sv_restore_defaults", "1");
                         nvram_set("region", "SA");
-                }
 #endif
                 sys_commit();

src/router/httpd/modules/upgrade.c

@@ -476 +476 @@
         int region_sa = 0;
         if(nvram_default_match("region", "SA", ""))
-                region_sa = 0;
+                region_sa = 1;
 #endif
         if (nvram_match("sv_restore_defaults", "1")) {
                 eval("erase", "nvram");
-        }
 #ifdef HAVE_BUFFALO_SA
+                nvram_set("sv_restore_defaults", "1");
                 if(region_sa)
-                {
-                        nvram_set("sv_restore_defaults", "1");
                         nvram_set("region", "SA");
-                }
-#endif
+#endif
+        }
         sys_commit();