diff options
Diffstat (limited to 'apps/nshlib')
-rw-r--r-- | apps/nshlib/Kconfig | 2 | ||||
-rw-r--r-- | apps/nshlib/README.txt | 2 | ||||
-rw-r--r-- | apps/nshlib/nsh_proccmds.c | 6 | ||||
-rw-r--r-- | apps/nshlib/rcS.template | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index 3e212e746..0036ed928 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -384,7 +384,7 @@ config NSH_CMDOPT_HEXDUMP default y if !DEFAULT_SMALL depends on !NSH_DISABLE_HEXDUMP -config NSH_PROC_MOUNTPOUNT +config NSH_PROC_MOUNTPOINT string "procfs mountpoint" default "/proc" depends on FS_PROCFS diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt index b49daf2a0..01f2401bb 100644 --- a/apps/nshlib/README.txt +++ b/apps/nshlib/README.txt @@ -188,7 +188,7 @@ NSH to behave as follows at NSH startup time: - By default, the contents of rcS script are: - # Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX + # Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX mkrd -m 1 -s 512 1024 mkfatfs /dev/ram1 diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c index f72d8877f..6d3b6ab66 100644 --- a/apps/nshlib/nsh_proccmds.c +++ b/apps/nshlib/nsh_proccmds.c @@ -53,8 +53,8 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_NSH_PROC_MOUNTPOUNT -# define CONFIG_NSH_PROC_MOUNTPOUNT "/proc" +#ifndef CONFIG_NSH_PROC_MOUNTPOINT +# define CONFIG_NSH_PROC_MOUNTPOINT "/proc" #endif #undef HAVE_CPULOAD @@ -215,7 +215,7 @@ static int loadavg(pid_t pid, FAR char *buffer, size_t buflen) /* Form the full path to the 'loadavg' pseudo-file */ - snprintf(path, sizeof(path), CONFIG_NSH_PROC_MOUNTPOUNT "/%d/loadavg", + snprintf(path, sizeof(path), CONFIG_NSH_PROC_MOUNTPOINT "/%d/loadavg", (int)pid); /* Read the 'loadavg' pseudo-file into the user buffer */ diff --git a/apps/nshlib/rcS.template b/apps/nshlib/rcS.template index 996f37fb1..452760e22 100644 --- a/apps/nshlib/rcS.template +++ b/apps/nshlib/rcS.template @@ -1,5 +1,5 @@ -# Create a RAMDISK and mount it at XXXRDMOUNTPOUNTXXX +# Create a RAMDISK and mount it at XXXRDMOUNTPOINTXXX mkrd -m XXXMKRDMINORXXX -s XXMKRDSECTORSIZEXXX XXMKRDBLOCKSXXX mkfatfs /dev/ramXXXMKRDMINORXXX -mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOUNTXXX +mount -t vfat /dev/ramXXXMKRDMINORXXX XXXRDMOUNTPOINTXXX |