diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /util-linux/blkid.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/blkid.c')
| -rw-r--r-- | util-linux/blkid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/blkid.c b/util-linux/blkid.c index 0bd701aae..a56b69661 100644 --- a/util-linux/blkid.c +++ b/util-linux/blkid.c | |||
| @@ -16,12 +16,12 @@ | |||
| 16 | //config: | 16 | //config: |
| 17 | //config:config FEATURE_BLKID_TYPE | 17 | //config:config FEATURE_BLKID_TYPE |
| 18 | //config: bool "Print filesystem type" | 18 | //config: bool "Print filesystem type" |
| 19 | //config: default n | 19 | //config: default y |
| 20 | //config: depends on BLKID | 20 | //config: depends on BLKID |
| 21 | //config: help | 21 | //config: help |
| 22 | //config: Show TYPE="filesystem type" | 22 | //config: Show TYPE="filesystem type" |
| 23 | 23 | ||
| 24 | //applet:IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP)) | 24 | //applet:IF_BLKID(APPLET_NOEXEC(blkid, blkid, BB_DIR_SBIN, BB_SUID_DROP, blkid)) |
| 25 | 25 | ||
| 26 | //kbuild:lib-$(CONFIG_BLKID) += blkid.o | 26 | //kbuild:lib-$(CONFIG_BLKID) += blkid.o |
| 27 | 27 | ||