rc/shared: disable obsolete exec code

RMerl · May 19, 2019 · 23f2aef · 23f2aef
1 parent de88069
commit 23f2aef
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/release/src/router/rc/jffs2.c b/release/src/router/rc/jffs2.c
@@ -201,12 +201,14 @@ void format_mount_2nd_jffs2(void)
 
 	notice_set("2nd_jffs", format ? "Formatted" : "Loaded");
 
+/* obsolete, keep for merge
 	if (((p = nvram_get("jffs2_exec")) != NULL) && (*p != 0)) {
 		chdir(SECOND_JFFS2_PATH);
 		system(p);
 		chdir("/");
 	}
 	run_userfile(SECOND_JFFS2_PATH, ".asusrouter", SECOND_JFFS2_PATH, 3);
+*/
 }
 #endif
 /* */
@@ -336,11 +338,13 @@ void start_jffs2(void)
 	notice_set("jffs", format ? "Formatted" : "Loaded");
 	jffs2_fail = 0;
 
+/* obsolete, keep for merge
 	if (((p = nvram_get("jffs2_exec")) != NULL) && (*p != 0)) {
 		chdir("/jffs");
 		system(p);
 		chdir("/");
 	}
+*/
 
 #ifdef HND_ROUTER
 #ifdef RTCONFIG_JFFS_NVRAM
@@ -350,7 +354,9 @@ void start_jffs2(void)
 #endif
 #endif
 
+/* obsolete, keep for merge
 	run_userfile("/jffs", ".asusrouter", "/jffs", 3);
+*/
 
 #ifdef CONFIG_BCMWL5
 #if !defined(RTAC3200) && !defined(RTAC56U) && !defined(RTAC87U)	//kludge

diff --git a/release/src/router/rc/ubifs.c b/release/src/router/rc/ubifs.c
@@ -269,6 +269,7 @@ void start_ubifs(void)
 
 	notice_set("ubifs", format ? "Formatted" : "Loaded");
 
+/* obsolete, keep for merge
 #ifndef RTCONFIG_NVRAM_FILE
 	if (((p = nvram_get("ubifs_exec")) != NULL) && (*p != 0)) {
 		chdir(UBIFS_MNT_DIR);
@@ -277,6 +278,7 @@ void start_ubifs(void)
 	}
 #endif
 	run_userfile(UBIFS_MNT_DIR, ".asusrouter", UBIFS_MNT_DIR, 3);
+*/
 
 #ifndef RTCONFIG_NVRAM_FILE
 #if defined(RTCONFIG_TEST_BOARDDATA_FILE)

diff --git a/release/src/router/rc/yaffs.c b/release/src/router/rc/yaffs.c
@@ -109,13 +109,14 @@ void start_yaffs(void)
 
 	notice_set("yaffs", format ? "Formatted" : "Loaded");
 
+/* obsolete, keep for merge
 	if (((p = nvram_get("yaffs_exec")) != NULL) && (*p != 0)) {
 		chdir(YAFFS_MNT_DIR);
 		system(p);
 		chdir("/");
 	}
 	run_userfile(YAFFS_MNT_DIR, ".asusrouter", YAFFS_MNT_DIR, 3);
-
+*/
 }
 
 void stop_yaffs(int stop)

diff --git a/release/src/router/shared/defaults.c b/release/src/router/shared/defaults.c
@@ -1955,17 +1955,23 @@ struct nvram_tuple router_defaults[] = {
 
 #if defined(RTCONFIG_JFFS2) || defined(RTCONFIG_BRCM_NAND_JFFS2)
 	{ "jffs2_on", "1", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+/* obsolete, keep for merge
 	{ "jffs2_exec", "", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+*/
 #endif
 
 #ifdef RTCONFIG_UBIFS
 	{ "ubifs_on", "1", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+/* obsolete, keep for merge
 	{ "ubifs_exec", "", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+*/
 #endif
 
 #ifdef RTCONFIG_YAFFS
 	{ "yaffs_on", "1", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+/* obsolete, keep for merge
 	{ "yaffs_exec", "", CKN_STR_DEFAULT, CKN_TYPE_DEFAULT, CKN_ACC_LEVEL_DEFAULT, CKN_ENC_DEFAULT, 0 },
+*/
 #endif
 
 #ifdef RTCONFIG_REBOOT_SCHEDULE