diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-04 18:30:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-04 18:30:26 +0000 |
| commit | f0000653e90fdbddcd49adb69909ab60c88feda5 (patch) | |
| tree | ff0f31ed8b10e7219125de6a0a77253d2d1bd74a /util-linux | |
| parent | 21b83cfb275e723559559c24e8df22a7dc5723a9 (diff) | |
| download | busybox-w32-f0000653e90fdbddcd49adb69909ab60c88feda5.tar.gz busybox-w32-f0000653e90fdbddcd49adb69909ab60c88feda5.tar.bz2 busybox-w32-f0000653e90fdbddcd49adb69909ab60c88feda5.zip | |
mount: ignore NFS bg option on NOMMU machines
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mount.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index e7818ac9f..3aadbf72d 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -725,6 +725,7 @@ next: | |||
| 725 | return &p; | 725 | return &p; |
| 726 | } | 726 | } |
| 727 | 727 | ||
| 728 | #if BB_MMU | ||
| 728 | static int daemonize(void) | 729 | static int daemonize(void) |
| 729 | { | 730 | { |
| 730 | int fd; | 731 | int fd; |
| @@ -744,6 +745,9 @@ static int daemonize(void) | |||
| 744 | logmode = LOGMODE_SYSLOG; | 745 | logmode = LOGMODE_SYSLOG; |
| 745 | return 1; | 746 | return 1; |
| 746 | } | 747 | } |
| 748 | #else | ||
| 749 | static inline int daemonize(void) { return -ENOSYS; } | ||
| 750 | #endif | ||
| 747 | 751 | ||
| 748 | // TODO | 752 | // TODO |
| 749 | static inline int we_saw_this_host_before(const char *hostname) | 753 | static inline int we_saw_this_host_before(const char *hostname) |
| @@ -786,7 +790,11 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) | |||
| 786 | int port; | 790 | int port; |
| 787 | int mountport; | 791 | int mountport; |
| 788 | int proto; | 792 | int proto; |
| 789 | int bg; | 793 | #if BB_MMU |
| 794 | int bg = 0; | ||
| 795 | #else | ||
| 796 | enum { bg = 0 }; | ||
| 797 | #endif | ||
| 790 | int soft; | 798 | int soft; |
| 791 | int intr; | 799 | int intr; |
| 792 | int posix; | 800 | int posix; |
| @@ -867,7 +875,6 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) | |||
| 867 | data.acdirmax = 60; | 875 | data.acdirmax = 60; |
| 868 | data.namlen = NAME_MAX; | 876 | data.namlen = NAME_MAX; |
| 869 | 877 | ||
| 870 | bg = 0; | ||
| 871 | soft = 0; | 878 | soft = 0; |
| 872 | intr = 0; | 879 | intr = 0; |
| 873 | posix = 0; | 880 | posix = 0; |
| @@ -1010,10 +1017,14 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) | |||
| 1010 | } | 1017 | } |
| 1011 | switch (index_in_strings(options, opt)) { | 1018 | switch (index_in_strings(options, opt)) { |
| 1012 | case 0: // "bg" | 1019 | case 0: // "bg" |
| 1020 | #if BB_MMU | ||
| 1013 | bg = val; | 1021 | bg = val; |
| 1022 | #endif | ||
| 1014 | break; | 1023 | break; |
| 1015 | case 1: // "fg" | 1024 | case 1: // "fg" |
| 1025 | #if BB_MMU | ||
| 1016 | bg = !val; | 1026 | bg = !val; |
| 1027 | #endif | ||
| 1017 | break; | 1028 | break; |
| 1018 | case 2: // "soft" | 1029 | case 2: // "soft" |
| 1019 | soft = val; | 1030 | soft = val; |
