Skip to content
This repository has been archived by the owner on Jan 3, 2022. It is now read-only.

Commit

Permalink
fix softcenter
Browse files Browse the repository at this point in the history
  • Loading branch information
paldier committed Dec 23, 2021
1 parent 2a78355 commit 94a012a
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 156 deletions.
2 changes: 1 addition & 1 deletion release/src-ra-5010/platform.mak
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ define platformKernelConfig
sed -i "/CONFIG_RT2860V2_AP_CARRIER/d" $(1); \
echo "CONFIG_RT2860V2_AP_CARRIER=y" >>$(1); \
fi; \
if [ "$(RTAC85P)" = "y" ] || [ "$(RMAC2100)" = "y" ] || [ "$(R6800)" = "y"; then \
if [ "$(RTAC85P)" = "y" ] || [ "$(RMAC2100)" = "y" ] || [ "$(R6800)" = "y" ] ; then \
sed -i "/CONFIG_NF_CT_NETLINK/d" $(1); \
echo "CONFIG_NF_CT_NETLINK=m" >>$(1); \
sed -i "/CONFIG_NF_CT_NETLINK_TIMEOUT/d" $(1); \
Expand Down
6 changes: 3 additions & 3 deletions release/src-rt/target.mak
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export RT-AC85P := IPV6SUPP=y HTTPS=y MIPS32=r2 RALINK=y MT7621=y BBEXTRAS=y USB
TEMPROOTFS=y WPSMULTIBAND=y \
NEW_USER_LOW_RSSI=y NEWSSID_REV2=y GETREALIP=y ATCOVER=y LAN50=all \
SW_HW_AUTH=y NATNL_AIHOME=y UUPLUGIN=y OPEN_NAT=y ASD=n AHS=y FRS_LIVE_UPDATE=y REPEATER=y PROXYSTA=n MTK_REP=n DUALWAN=n
export RT-AC85P += BUILD_NAME="RT-AC85P" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_256M=y UBOOT_CMDLINE=y MODEL_RTAC85P=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_EPAELNA=y" SOFTCENTER=y SMARTDNS=y VHT160=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="RTAC85P" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b3" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_KVR=y SWRT_FASTPATH=y
export RT-AC85P += BUILD_NAME="RT-AC85P" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_256M=y UBOOT_CMDLINE=y MODEL_RTAC85P=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_EPAELNA=y" SOFTCENTER=y SMARTDNS=y VHT160=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="RTAC85P" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b4" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_KVR=y SWRT_FASTPATH=y

export RT-ACRH26 := IPV6SUPP=y HTTPS=y MIPS32=r2 RALINK=y MT7621=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y SAMBA3=y MEDIASRV=y PARENTAL2=y ACCEL_PPTPD=y USB="USB" AUTODICT=y LANWAN_LED=y SHP=y RTACRH26=y ODMPID=y DUAL_TRX=y LED_ALL=y NEW_RGDM=y RA_SKU_IN_DRV=y OPENVPN=y VPNC=y DUMP_OOPS_MSG=y DEBUGFS=y BWDPI=y REBOOT_SCHEDULE=y SSH=y HD_SPINDOWN=y\
EXT4FS=y DISK_MONITOR=y MDNS=y EMAIL=y FRS_FEEDBACK=y SYSSTATE=y USB_SWAP=y UTF8_SSID=y FORCE_AUTO_UPGRADE=y \
Expand Down Expand Up @@ -323,7 +323,7 @@ export RM-AC2100 := IPV6SUPP=y HTTPS=y MIPS32=r2 RALINK=y MT7621=y BBEXTRAS=y US
TEMPROOTFS=y WPSMULTIBAND=y \
NEW_USER_LOW_RSSI=y NEWSSID_REV2=y GETREALIP=y ATCOVER=y LAN50=all \
SW_HW_AUTH=y NATNL_AIHOME=y UUPLUGIN=y OPEN_NAT=y ASD=n AHS=y FRS_LIVE_UPDATE=y REPEATER=y PROXYSTA=n MTK_REP=n DUALWAN=n \
BUILD_NAME="RM-AC2100" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_128M=y UBOOT_CMDLINE=y MODEL_RMAC2100=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_IPAILNA=y" SOFTCENTER=y SMARTDNS=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="RMAC2100" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b3" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_KVR=y SWRT_FASTPATH=y
BUILD_NAME="RM-AC2100" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_128M=y UBOOT_CMDLINE=y MODEL_RMAC2100=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_IPAILNA=y" SOFTCENTER=y SMARTDNS=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="RMAC2100" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b4" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_KVR=y SWRT_FASTPATH=y

export SWRT-R6800 := IPV6SUPP=y HTTPS=y MIPS32=r2 RALINK=y MT7621=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y SAMBA3=y MEDIASRV=y PARENTAL2=y ACCEL_PPTPD=y USB="USB" AUTODICT=y LANWAN_LED=y SHP=y R6800=y ODMPID=y DUAL_TRX=y LED_ALL=y NEW_RGDM=y RA_SKU_IN_DRV=y OPENVPN=y VPNC=y DUMP_OOPS_MSG=y DEBUGFS=y REBOOT_SCHEDULE=y SSH=y HD_SPINDOWN=y FORCE_AUTO_UPGRADE=n TFAT=y NTFS="tuxera" HFS="tuxera" \
EXT4FS=y DISK_MONITOR=y MDNS=y EMAIL=y FRS_FEEDBACK=y SYSSTATE=y USB_SWAP=y UTF8_SSID=y NO_SELECT_CHANNEL=y \
Expand All @@ -337,7 +337,7 @@ export SWRT-R6800 := IPV6SUPP=y HTTPS=y MIPS32=r2 RALINK=y MT7621=y BBEXTRAS=y U
TEMPROOTFS=y WPSMULTIBAND=y \
NEW_USER_LOW_RSSI=y NEWSSID_REV2=y GETREALIP=y ATCOVER=y LAN50=all \
SW_HW_AUTH=y NATNL_AIHOME=y UUPLUGIN=y OPEN_NAT=y ASD=n AHS=y FRS_LIVE_UPDATE=y REPEATER=y PROXYSTA=n MTK_REP=n DUALWAN=n
export SWRT-R6800 += BUILD_NAME="R6800" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_256M=y UBOOT_CMDLINE=y MODEL_R6800=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_EPAELNA=y" SOFTCENTER=y SMARTDNS=y VHT160=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="R6800" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b3" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_I2CLED=y SWRT_KVR=y SWRT_FASTPATH=y
export SWRT-R6800 += BUILD_NAME="R6800" EXTRA_KERNEL_CONFIGS="MT7621_BAUDRATE=57600 RT2880_DRAM_256M=y UBOOT_CMDLINE=y MODEL_R6800=y SMART_CARRIER_SENSE_SUPPORT=y MT_DFS_SUPPORT=y DUAL_TRX=y FIRST_IF_IPAILNA=y SECOND_IF_EPAELNA=y" SOFTCENTER=y SMARTDNS=y VHT160=y ENTWARE=y CIFS=y SWRT=y SWRT_NAME="R6800" SWRT_VER_MAJOR="B" SWRT_VER_MINOR="5.1.7b4" SWRT_CODEBASE="52516" SWRT_FULLCONE=y SWRT_I2CLED=y SWRT_KVR=y SWRT_FASTPATH=y

############################################################################
# Qualcomm Atheros platform, linux-3.3.8
Expand Down
5 changes: 0 additions & 5 deletions release/src/router/httpd/httpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1114,11 +1114,6 @@ handle_request(void)
#endif
)
fromapp=1;
else if(strncmp(url, GETAPPSTR, strlen(GETAPPSTR))==0) {
fromapp=1;
strcpy(url, url+strlen(GETAPPSTR));
file += strlen(GETAPPSTR);
}

memset(user_agent, 0, sizeof(user_agent));
if(useragent != NULL)
Expand Down
Binary file modified release/src/router/rc/prebuild/R6800/swrtex.o
Binary file not shown.
Binary file modified release/src/router/rc/prebuild/RMAC2100/swrtex.o
Binary file not shown.
6 changes: 3 additions & 3 deletions release/src/router/rc/services.c
Original file line number Diff line number Diff line change
Expand Up @@ -8036,7 +8036,7 @@ start_services(void)
#endif
run_custom_script("services-start", 0, NULL, NULL);
#if defined(RTCONFIG_SOFTCENTER)
sc_services_start_sig = 1;
nvram_set("sc_services_start_sig", "1");
#endif
#if defined(RTCONFIG_SWRT_KVR) && defined(RTCONFIG_RALINK)
system("/usr/bin/iappd.sh restart");
Expand All @@ -8058,7 +8058,7 @@ stop_services(void)
{
run_custom_script("services-stop", 0, NULL, NULL);
#if defined(RTCONFIG_SOFTCENTER)
sc_services_stop_sig = 1;
nvram_set("sc_services_stop_sig", "1");
#endif
#if defined(RTCONFIG_ENTWARE)
nvram_set_int("entware_stop_sig", 1);
Expand Down Expand Up @@ -13474,7 +13474,7 @@ _dprintf("nat_rule: the nat rule file was not ready. wait %d seconds...\n", retr

run_custom_script("nat-start", 0, NULL, NULL);
#if defined(RTCONFIG_SOFTCENTER)
sc_nat_sig = 1;
nvram_set("sc_nat_sig", "1");
#endif
return NAT_STATE_NORMAL;
}
Expand Down
147 changes: 48 additions & 99 deletions release/src/router/rc/swrt.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
#endif

#if defined(RTCONFIG_SOFTCENTER)
int sc_wan_sig = 0;
int sc_nat_sig = 0;
int sc_mount_sig = 0;
int sc_services_start_sig = 0;
int sc_services_stop_sig = 0;
int sc_unmount_sig = 0;

static void firmware_ver(void)
{
char tmp[6] = {0};
Expand Down Expand Up @@ -82,12 +75,12 @@ void swrt_init()
{
_dprintf("############################ SWRT init #################################\n");
#if defined(RTCONFIG_SOFTCENTER)
sc_wan_sig = 0;
sc_nat_sig = 0;
sc_mount_sig = 0;
sc_services_start_sig = 0;
sc_services_stop_sig = 0;
sc_unmount_sig = 0;
nvram_set("sc_wan_sig", "0");
nvram_set("sc_nat_sig", "0");
nvram_set("sc_mount_sig", "0");
nvram_set("sc_services_start_sig", "0");
nvram_set("sc_services_stop_sig", "0");
nvram_set("sc_unmount_sig", "0");
#endif
#if defined(RTCONFIG_ENTWARE)
nvram_set("entware_wan_sig", "0");
Expand Down Expand Up @@ -339,8 +332,8 @@ void swrt_init_done(){
nvram_set("modelname", "GTAC2900");
#elif defined(GTAC5300)
nvram_set("modelname", "GTAC5300");
#elif defined(RTAX53)
nvram_set("modelname", "RTAX53");
#elif defined(RTAX53U)
nvram_set("modelname", "RTAX53U");
#elif defined(RTAX54)
nvram_set("modelname", "RTAX54");
#elif defined(RTAX55) || defined(RTAX1800)
Expand Down Expand Up @@ -434,6 +427,9 @@ void swrt_init_done(){
#if defined(RAX120)
rax120_lanled();
#endif
#if defined(RTCONFIG_SWRT_LED)
swrt_ledon();//to fix LED state
#endif
}


Expand Down Expand Up @@ -515,87 +511,48 @@ int versioncmp(char *cur_fwver, char *fwver) {
return rlt;
}

size_t getcontentlengthfunc(void *ptr, size_t size, size_t nmemb, void *stream) {
int r;
long len = 0;

/* _snscanf() is Win32 specific */
// r = _snscanf(ptr, size * nmemb, "Content-Length: %ld\n", &len);
r = sscanf(ptr, "Content-Length: %ld\n", &len);
if (r) /* Microsoft: we don't read the specs */
*((long *) stream) = len;

return size * nmemb;
}

size_t wirtefunc(void *ptr, size_t size, size_t nmemb, void *stream)
size_t wirtefunc(void *ptr, size_t size, size_t nmemb, FILE *stream)
{
return fwrite(ptr, size, nmemb, stream);
}
#if 0
size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream)

int curl_download_swrt(const char *url, const char *file_path, long timeout)
{
FILE *f = stream;
size_t n;
FILE *fp;
CURL *curl = NULL;
CURLcode ret;

if (ferror(f))
return CURL_READFUNC_ABORT;
if(url == NULL || file_path == NULL)
return -1;

n = fread(ptr, size, nmemb, f) * size;
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();

return n;
}
#endif
int curl_download_file(CURL *curlhandle, const char * remotepath, const char * localpath, long timeout, long tries)
{
FILE *f;
curl_off_t local_file_len = -1 ;
long filesize =0 ;
if(!curl)
return -3;

CURLcode r = CURLE_GOT_NOTHING;
//int c;
struct stat file_info;
int use_resume = 0;
//if(access(localpath,F_OK) ==0)
unlink(file_path);
if ((fp = fopen(file_path, "wb")) == NULL)
return -2;

if(stat(localpath, &file_info) == 0)
{
local_file_len = file_info.st_size;
use_resume = 1;
}
f = fopen(localpath, "ab+");
if (f == NULL) {
perror(NULL);
return 0;
}
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, wirtefunc);

//curl_easy_setopt(curlhandle, CURLOPT_UPLOAD, 1L);

curl_easy_setopt(curlhandle, CURLOPT_URL, remotepath);
curl_easy_setopt(curlhandle, CURLOPT_CONNECTTIMEOUT, timeout);
curl_easy_setopt(curlhandle, CURLOPT_HEADERFUNCTION, getcontentlengthfunc);
curl_easy_setopt(curlhandle, CURLOPT_HEADERDATA, &filesize);
curl_easy_setopt(curlhandle, CURLOPT_RESUME_FROM_LARGE, use_resume?local_file_len:0);
curl_easy_setopt(curlhandle, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(curlhandle, CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt(curlhandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
curl_easy_setopt(curlhandle, CURLOPT_WRITEDATA, f);
curl_easy_setopt(curlhandle, CURLOPT_WRITEFUNCTION, wirtefunc);

//curl_easy_setopt(curlhandle, CURLOPT_READFUNCTION, readfunc);
//curl_easy_setopt(curlhandle, CURLOPT_READDATA, f);
curl_easy_setopt(curlhandle, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(curlhandle, CURLOPT_VERBOSE, 1);

r = curl_easy_perform(curlhandle);
fclose(f);

if (r == CURLE_OK)
return 1;
else {
fprintf(stderr, "%s\n", curl_easy_strerror(r));
return 0;
}
//curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);

ret = curl_easy_perform(curl);
fclose(fp);
curl_easy_cleanup(curl);

if (ret != CURLE_OK)
return -4;
return 0;
}

int swrt_firmware_check_update_main(int argc, char *argv[])
Expand Down Expand Up @@ -630,17 +587,12 @@ int swrt_firmware_check_update_main(int argc, char *argv[])
unlink("/tmp/wlan_update.txt");
unlink("/tmp/release_note0.txt");
sscanf(tmp_fwver, "%*[A-Z0-9]_%[A-Z0-9.]-%*[a-z0-9]", cur_fwver);
CURL *curlhandle = NULL;

curl_global_init(CURL_GLOBAL_ALL);
curlhandle = curl_easy_init();
snprintf(url, sizeof(url), "%s/%s", serverurl, serverupdate);
//snprintf(log, sizeof(log), "echo \"[FWUPDATE]---- update dl_path_info for general %s/%s ----\" >> /tmp/webs_upgrade.log", serverurl, serverupdate);

FWUPDATE_DBG("---- update dl_path_info for general %s/%s ----", serverurl, serverupdate);
download=curl_download_file(curlhandle , url,localupdate,8,3);
//system(log);
//_dprintf("%d\n",download);
if(download)
download=curl_download_swrt(url, localupdate, 8);
if(!download)
{
fpupdate = fopen(localupdate, "r");
if (!fpupdate)
Expand Down Expand Up @@ -680,15 +632,15 @@ int swrt_firmware_check_update_main(int argc, char *argv[])
//snprintf(log, sizeof(log), "echo \"[FWUPDATE]---- download real release note %s/%s ----\" >> /tmp/webs_upgrade.log", serverurl, releasenote_file);
//system(log);
FWUPDATE_DBG("---- download real release note %s/%s ----", serverurl, releasenote_file);
download=curl_download_file(curlhandle , url,releasenote,8,3);
download=curl_download_swrt(url, releasenote, 8);
if(download ==0 ){
memset(url,'\0',sizeof(url));
snprintf(releasenote_file, sizeof(releasenote_file), "%s_%s_US_note.zip", nvram_get("productid"), nvram_get("webs_state_info"));
snprintf(url, sizeof(url), "%s/%s", serverurl, releasenote_file);
//snprintf(log, sizeof(log), "echo \"[FWUPDATE]---- download real release note %s/%s ----\" >> /tmp/webs_upgrade.log", serverurl, releasenote_file);
//system(log);
FWUPDATE_DBG("---- download real release note %s/%s ----", serverurl, releasenote_file);
curl_download_file(curlhandle , url,releasenote,8,3);
curl_download_swrt(url, releasenote, 8);
}
FWUPDATE_DBG("---- firmware check update finish ----");
return 0;
Expand All @@ -706,9 +658,6 @@ int swrt_firmware_check_update_main(int argc, char *argv[])
}
}

curl_easy_cleanup(curlhandle);
curl_global_cleanup();

GODONE:
#if (defined(RTAC82U) && !defined(RTCONFIG_AMAS)) || defined(RTAC3200) || defined(RTAC85P) || defined(RMAC2100) || defined(R6800)
snprintf(info,sizeof(info),"3004_382_%s",nvram_get("extendno"));
Expand Down
39 changes: 19 additions & 20 deletions release/src/router/rc/swrt.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,26 @@

#ifndef __SWRT_H__
#define __SWRT_H__

#if defined(RTCONFIG_SOFTCENTER)
enum {
SOFTCENTER_WAN=1,
SOFTCENTER_NAT,
SOFTCENTER_MOUNT,
SOFTCENTER_SERVICES_START,
SOFTCENTER_SERVICES_STOP,
SOFTCENTER_CIFS_MOUNT,
SOFTCENTER_UNMOUNT
};

extern void softcenter_trigger(int sig);
#endif
extern void swrt_init(void);
extern void swrt_init_model(void);
extern void swrt_init_done(void);
extern void gen_swrtid(void);
extern int swrt_toolbox(int argc, char **argv);
extern int curl_download_swrt(const char *url, const char *file_path, long timeout);
#if defined(RTAC68U)
extern int swrt_set(const char *name, const char *value);
extern int swrt_unset(const char *name);
Expand Down Expand Up @@ -59,6 +74,9 @@ extern void r7000p_nvram_patch(void);
extern void swrt_patch_nvram(void);
#elif defined(R8000P)
extern void r8000p_nvram_patch(void);
#elif defined(RAX70)
extern void rax70_sys_hack(void);
extern void rax70_nvram_patch(void);
#elif defined(TUFAX3000) || defined(RTAX58U)
extern void enable_4t4r_ax58(void);
extern void enable_4t4r(void);
Expand All @@ -69,7 +87,7 @@ extern void init_mtd8(void);
extern void swrt_patch_nvram(void);
#elif defined(RMAC2100) || defined(R6800)
extern void patch_Factory(void);
#elif defined(RTAX82U)
#elif defined(RTAX82U) || defined(RTAX86U)
extern void swrt_patch_nvram(void);
#endif
#ifdef RTCONFIG_UUPLUGIN
Expand All @@ -82,25 +100,6 @@ extern void exec_uu_swrt(void);
#if defined(RTCONFIG_FRS_LIVE_UPDATE)
extern int swrt_firmware_check_update_main(int argc, char *argv[]);
#endif
#if defined(RTCONFIG_SOFTCENTER)
enum {
SOFTCENTER_WAN=1,
SOFTCENTER_NAT,
SOFTCENTER_MOUNT,
SOFTCENTER_SERVICES_START,
SOFTCENTER_SERVICES_STOP,
SOFTCENTER_CIFS_MOUNT,
SOFTCENTER_UNMOUNT
};

extern int sc_wan_sig;
extern int sc_nat_sig;
extern int sc_mount_sig;
extern int sc_services_start_sig;
extern int sc_services_stop_sig;
extern int sc_unmount_sig;
extern void softcenter_trigger(int sig);
#endif
#if defined(SWRT_VER_MAJOR_R) || defined(SWRT_VER_MAJOR_X) || defined(SBRAC3200P)
extern void check_auth_code(void);
#endif
Expand Down
4 changes: 2 additions & 2 deletions release/src/router/rc/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@ int umount_mountpoint(struct mntent *mnt, uint flags)
int ret = 1, count;
char flagfn[128];
#if defined(RTCONFIG_SOFTCENTER)
sc_unmount_sig = 1;
nvram_set("sc_unmount_sig", "1");
#endif
snprintf(flagfn, sizeof(flagfn), "%s/.autocreated-dir", mnt->mnt_dir);

Expand Down Expand Up @@ -2054,7 +2054,7 @@ _dprintf("usb_path: 4. don't set %s.\n", tmp);

run_custom_script("post-mount", 120, mountpoint, NULL);
#if defined(RTCONFIG_SOFTCENTER)
sc_mount_sig = 1;
nvram_set("sc_mount_sig", "1");
#endif
#if defined(RTCONFIG_APP_PREINSTALLED) && defined(RTCONFIG_CLOUDSYNC)
char word[PATH_MAX], *next_word;
Expand Down
2 changes: 1 addition & 1 deletion release/src/router/rc/wan.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ void update_wan_state(char *prefix, int state, int reason)
#if defined(RTCONFIG_SOFTCENTER)
if(nvram_match("sc_mount", "2") && !f_exists("/jffs/softcenter/.sc_cifs"))
softcenter_trigger(SOFTCENTER_CIFS_MOUNT);
sc_wan_sig = 1;
nvram_set("sc_wan_sig", "1");
#endif
#if defined(RTCONFIG_ENTWARE)
nvram_set_int("entware_wan_sig", 1);
Expand Down
Loading

0 comments on commit 94a012a

Please sign in to comment.