Do not load configuration in rescue mode

m-labs · Apr 23, 2011 · 2c9f5e7 · 2c9f5e7
1 parent ef61a83
commit 2c9f5e7
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/sysconfig.c b/src/sysconfig.c
@@ -27,6 +27,7 @@
 #include <rtems.h>
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/dhcp.h>
+#include <rtems/bspcmdline.h>
 #include <bsp.h>
 #include <mtklib.h>
 
@@ -158,14 +159,26 @@ static void sysconfig_credentials_lock_init();
 static void sysconfig_credentials_lock();
 static void sysconfig_credentials_unlock();
 
+static int is_rescue()
+{
+	const char *bsp_cmdline;
+
+	bsp_cmdline = rtems_bsp_cmdline_get();
+	if(bsp_cmdline == NULL)
+		return 0;
+	return strcmp(bsp_cmdline, "rescue") == 0;
+}
+
 void sysconfig_load()
 {
 	struct sysconfig conf;
 
 	sysconfig_credentials_lock_init();
 
-	if(readconfig(SYSCONFIG_FILE, &conf))
-		memcpy(&sysconfig, &conf, sizeof(struct sysconfig));
+	if(!is_rescue()) {
+		if(readconfig(SYSCONFIG_FILE, &conf))
+			memcpy(&sysconfig, &conf, sizeof(struct sysconfig));
+	}
 
 	if(sysconfig.dhcp_enable)
 		rtems_bsdnet_config.bootp = my_dhcp;