summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2008-03-18 01:44:52 +0000
committerDenis Vlasenko2008-03-18 01:44:52 +0000
commit6aa7696e280181cd87f7569ce65696b760dca891 (patch)
tree4f52aa69b250f0d1b704dc10085a060795229c39
parent2a7a4513918fef3bbf3d665ea0871dfc555d6692 (diff)
downloadbusybox-6aa7696e280181cd87f7569ce65696b760dca891.zip
busybox-6aa7696e280181cd87f7569ce65696b760dca891.tar.gz
mount: #ifdef out MOUNT_LABEL code parts if it is not selected
-rw-r--r--util-linux/mount.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index d4a3207..bd5f27b 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -22,8 +22,10 @@
#include <syslog.h>
#include "libbb.h"
+#if ENABLE_FEATURE_MOUNT_LABEL
/* For FEATURE_MOUNT_LABEL only */
#include "volume_id.h"
+#endif
/* Needed for nfs support only */
#include <sys/utsname.h>
@@ -252,10 +254,12 @@ static int resolve_mount_spec(char **fsname)
{
char *tmp = NULL;
+#if ENABLE_FEATURE_MOUNT_LABEL
if (!strncmp(*fsname, "UUID=", 5))
tmp = get_devname_from_uuid(*fsname + 5);
else if (!strncmp(*fsname, "LABEL=", 6))
tmp = get_devname_from_label(*fsname + 6);
+#endif
if (tmp) {
*fsname = tmp;