Merge remote branch 'origin/master'

Conflicts:
	mount/Makefile.am
	sys-utils/ipcs.c
	tests/ts/blkid/images-fs/befs.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2

1 files changed, 45 insertions, 0 deletions

diff --git a/shlibs/mount/src/init.c b/shlibs/mount/src/init.c
new file mode 100644
index 00000000..68c13f94
--- /dev/null
+++ b/shlibs/mount/src/init.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: init
+ * @title: Library initialization
+ * @short_description: initialize debuging
+ */
+
+#include <stdlib.h>
+
+#include "mountP.h"
+
+int libmount_debug_mask;
+
+/**
+ * mnt_init_debug:
+ * @mask: debug mask (0xffff to enable full debuging)
+ *
+ * If the @mask is not specified then this function reads
+ * LIBMOUNT_DEBUG environment variable to get the mask.
+ *
+ * Already initialized debugging stuff cannot be changed. It does not
+ * have effect to call this function twice.
+ */
+void mnt_init_debug(int mask)
+{
+	if (libmount_debug_mask & DEBUG_INIT)
+		return;
+	if (!mask) {
+		char *str = mnt_getenv_safe("LIBMOUNT_DEBUG");
+		if (str)
+			libmount_debug_mask = strtoul(str, 0, 0);
+	} else
+		libmount_debug_mask = mask;
+
+	if (libmount_debug_mask)
+		printf("libmount: debug mask set to 0x%04x.\n",
+				libmount_debug_mask);
+	libmount_debug_mask |= DEBUG_INIT;
+}