diff options
author | Eric Andersen <andersen@codepoet.org> | 1999-11-05 00:31:46 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 1999-11-05 00:31:46 +0000 |
commit | cf8c9cf7b9792e9cef3d790c46763712c390c7ed (patch) | |
tree | 980d8b0e71170aeb61c1e7ea871c7233ca31cbb6 /util-linux | |
parent | d0246fb72b40320a74376af1bb944fef2c9b734f (diff) | |
download | busybox-w32-0_32.tar.gz busybox-w32-0_32.tar.bz2 busybox-w32-0_32.zip |
More stuff -- ready for release.0_32
-Erik
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/umount.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/util-linux/umount.c b/util-linux/umount.c index e749c5f0f..89c59f9ee 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c | |||
@@ -76,6 +76,10 @@ umount_all(int useMtab) | |||
76 | if (strcmp (blockDevice, "/dev/root") == 0) | 76 | if (strcmp (blockDevice, "/dev/root") == 0) |
77 | blockDevice = (getfsfile ("/"))->fs_spec; | 77 | blockDevice = (getfsfile ("/"))->fs_spec; |
78 | #endif | 78 | #endif |
79 | /* Don't umount /proc when doing umount -a */ | ||
80 | if (strcmp (blockDevice, "proc") == 0) | ||
81 | continue; | ||
82 | |||
79 | status=do_umount (m->mnt_dir, useMtab); | 83 | status=do_umount (m->mnt_dir, useMtab); |
80 | if (status!=0) { | 84 | if (status!=0) { |
81 | /* Don't bother retrying the umount on busy devices */ | 85 | /* Don't bother retrying the umount on busy devices */ |
@@ -83,9 +87,6 @@ umount_all(int useMtab) | |||
83 | perror(m->mnt_dir); | 87 | perror(m->mnt_dir); |
84 | continue; | 88 | continue; |
85 | } | 89 | } |
86 | printf ("Trying to umount %s failed: %s\n", | ||
87 | m->mnt_dir, strerror(errno)); | ||
88 | printf ("Instead trying to umount %s\n", blockDevice); | ||
89 | status=do_umount (blockDevice, useMtab); | 90 | status=do_umount (blockDevice, useMtab); |
90 | if (status!=0) { | 91 | if (status!=0) { |
91 | printf ("Couldn't umount %s on %s (type %s): %s\n", | 92 | printf ("Couldn't umount %s on %s (type %s): %s\n", |
@@ -107,7 +108,7 @@ umount_main(int argc, char** argv) | |||
107 | } | 108 | } |
108 | 109 | ||
109 | /* Parse any options */ | 110 | /* Parse any options */ |
110 | while (argc-- > 0 && **(++argv) == '-') { | 111 | while (argc-- > 0 && **(argv++) == '-') { |
111 | while (*++(*argv)) switch (**argv) { | 112 | while (*++(*argv)) switch (**argv) { |
112 | case 'a': | 113 | case 'a': |
113 | umountAll = TRUE; | 114 | umountAll = TRUE; |