diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-09-04 19:43:26 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-09-04 19:43:26 +0000 |
commit | 1b0bf8531aaef416e6ef5f38d5160ff43e3ff8c9 (patch) | |
tree | 6640eb4bdee8045f911588b5e91aa0c410032100 /util-linux | |
parent | f25bf6627bc21ed2d574c9c9e6dbd1c16f85cbb1 (diff) | |
download | busybox-w32-1b0bf8531aaef416e6ef5f38d5160ff43e3ff8c9.tar.gz busybox-w32-1b0bf8531aaef416e6ef5f38d5160ff43e3ff8c9.tar.bz2 busybox-w32-1b0bf8531aaef416e6ef5f38d5160ff43e3ff8c9.zip |
Thinko.
git-svn-id: svn://busybox.net/trunk/busybox@16048 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/mount.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index fef5f3f28..3e2f78192 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -482,7 +482,7 @@ int mount_main(int argc, char **argv) | |||
482 | if (ENABLE_FEATURE_CLEAN_UP) endmntent(mountTable); | 482 | if (ENABLE_FEATURE_CLEAN_UP) endmntent(mountTable); |
483 | return EXIT_SUCCESS; | 483 | return EXIT_SUCCESS; |
484 | } | 484 | } |
485 | } | 485 | } else storage_path = bb_simplify_path(argv[optind]); |
486 | 486 | ||
487 | // When we have two arguments, the second is the directory and we can | 487 | // When we have two arguments, the second is the directory and we can |
488 | // skip looking at fstab entirely. We can always abspath() the directory | 488 | // skip looking at fstab entirely. We can always abspath() the directory |
@@ -513,8 +513,6 @@ int mount_main(int argc, char **argv) | |||
513 | fstabname = bb_path_mtab_file; | 513 | fstabname = bb_path_mtab_file; |
514 | else fstabname="/etc/fstab"; | 514 | else fstabname="/etc/fstab"; |
515 | 515 | ||
516 | storage_path = bb_simplify_path(argv[optind]); | ||
517 | |||
518 | if (!(fstab=setmntent(fstabname,"r"))) | 516 | if (!(fstab=setmntent(fstabname,"r"))) |
519 | bb_perror_msg_and_die("Cannot read %s",fstabname); | 517 | bb_perror_msg_and_die("Cannot read %s",fstabname); |
520 | 518 | ||