emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"mount" now reports errors from nfsmount() and assumes NFS mount

Browse Source 
if ':' is present in the device name - Pavel Roskin
This commit is contained in:
Pavel Roskin 2000-06-06 17:03:55 +00:00
parent 68480dc30f
commit 680d65a646
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -57,6 +57,8 @@
* Implemented "rm -- <foo>"
* "which" rewritten to use stat(). Fixes to improve its compatability
with traditional implementations -- Pavel Roskin.
* "mount" now reports errors from nfsmount() and assumes NFS mount
if ':' is present in the device name - Pavel Roskin
* More doc updates

11
mount.c
View File

@ -483,11 +483,14 @@ extern int mount_main(int argc, char **argv)
} else {
if (device && directory) {
#ifdef BB_NFSMOUNT
if (strchr(device, ':') != NULL)
filesystemType = "nfs";
if (strcmp(filesystemType, "nfs") == 0) {
if (nfsmount
(device, directory, &flags, &extra_opts, &string_flags,
1) != 0)
exit(FALSE);
int ret;
ret = nfsmount (device, directory, &flags,
&extra_opts, &string_flags, 1);
if (ret != 0)
fatalError("nfsmount failed: %s\n", strerror(errno));
}
#endif
exit(mount_one(device, directory, filesystemType,

11
util-linux/mount.c
View File

@ -483,11 +483,14 @@ extern int mount_main(int argc, char **argv)
} else {
if (device && directory) {
#ifdef BB_NFSMOUNT
if (strchr(device, ':') != NULL)
filesystemType = "nfs";
if (strcmp(filesystemType, "nfs") == 0) {
if (nfsmount
(device, directory, &flags, &extra_opts, &string_flags,
1) != 0)
exit(FALSE);
int ret;
ret = nfsmount (device, directory, &flags,
&extra_opts, &string_flags, 1);
if (ret != 0)
fatalError("nfsmount failed: %s\n", strerror(errno));
}
#endif
exit(mount_one(device, directory, filesystemType,