diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-18 21:08:49 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-18 21:08:49 +0000 |
commit | de7684a309ad20c1b889d048d741cb1dd52245f7 (patch) | |
tree | efae3387e1978cdd128ff2a922b734d0e9d0180f /e2fsprogs | |
parent | 27dd495b98a6135554b1d839fefe436ba3c6ca71 (diff) | |
download | busybox-w32-de7684a309ad20c1b889d048d741cb1dd52245f7.tar.gz busybox-w32-de7684a309ad20c1b889d048d741cb1dd52245f7.tar.bz2 busybox-w32-de7684a309ad20c1b889d048d741cb1dd52245f7.zip |
support for mount by label (not yet tested)
Also adds findfs applet. Closes bug 1143.
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/tune2fs.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c index c5c84d68e..b7a1b21eb 100644 --- a/e2fsprogs/old_e2fsprogs/tune2fs.c +++ b/e2fsprogs/old_e2fsprogs/tune2fs.c | |||
@@ -557,20 +557,6 @@ static void parse_tune2fs_options(int argc, char **argv) | |||
557 | device_name = x_blkid_get_devname(argv[optind]); | 557 | device_name = x_blkid_get_devname(argv[optind]); |
558 | } | 558 | } |
559 | 559 | ||
560 | #ifdef CONFIG_FINDFS | ||
561 | static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv) | ||
562 | { | ||
563 | if ((argc != 2) || | ||
564 | (strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5))) | ||
565 | bb_show_usage(); | ||
566 | device_name = x_blkid_get_devname(argv[1]); | ||
567 | puts(device_name); | ||
568 | exit(0); | ||
569 | } | ||
570 | #else | ||
571 | #define do_findfs(x, y) | ||
572 | #endif | ||
573 | |||
574 | static void tune2fs_clean_up(void) | 560 | static void tune2fs_clean_up(void) |
575 | { | 561 | { |
576 | if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name); | 562 | if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name); |
@@ -588,9 +574,7 @@ int tune2fs_main(int argc, char **argv) | |||
588 | if (ENABLE_FEATURE_CLEAN_UP) | 574 | if (ENABLE_FEATURE_CLEAN_UP) |
589 | atexit(tune2fs_clean_up); | 575 | atexit(tune2fs_clean_up); |
590 | 576 | ||
591 | if (ENABLE_FINDFS && (applet_name[0] == 'f')) /* findfs */ | 577 | if (ENABLE_E2LABEL && (applet_name[0] == 'e')) /* e2label */ |
592 | do_findfs(argc, argv); /* no return */ | ||
593 | else if (ENABLE_E2LABEL && (applet_name[0] == 'e')) /* e2label */ | ||
594 | parse_e2label_options(argc, argv); | 578 | parse_e2label_options(argc, argv); |
595 | else | 579 | else |
596 | parse_tune2fs_options(argc, argv); /* tune2fs */ | 580 | parse_tune2fs_options(argc, argv); /* tune2fs */ |