diff options
| author | Matt Kraai <kraai@debian.org> | 2001-04-17 04:26:05 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-04-17 04:26:05 +0000 |
| commit | 24ed3bee0c4ca631855a0f43f75e30ba0c134b9f (patch) | |
| tree | 46b93cb7ab0d0a68ae27d1c2f7d12571001e5ce8 | |
| parent | 3d406da0c90e319d0e05f75e2dcd485d5954fc1d (diff) | |
Fix -a support (broken by previous patch).
| -rw-r--r-- | mount.c | 6 | ||||
| -rw-r--r-- | util-linux/mount.c | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -405,14 +405,14 @@ extern int mount_main(int argc, char **argv) argv++; } - if (device == NULL && directory == NULL) - goto goodbye; - if (all == TRUE || directory == NULL) { struct mntent *m; FILE *f = setmntent("/etc/fstab", "r"); fstabmount = TRUE; + if (all == FALSE && device == NULL) + goto goodbye; + if (f == NULL) perror_msg_and_die( "\nCannot read /etc/fstab"); diff --git a/util-linux/mount.c b/util-linux/mount.c index d1568d803..311d518aa 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -405,14 +405,14 @@ extern int mount_main(int argc, char **argv) argv++; } - if (device == NULL && directory == NULL) - goto goodbye; - if (all == TRUE || directory == NULL) { struct mntent *m; FILE *f = setmntent("/etc/fstab", "r"); fstabmount = TRUE; + if (all == FALSE && device == NULL) + goto goodbye; + if (f == NULL) perror_msg_and_die( "\nCannot read /etc/fstab"); |