summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremie Koenig <jk@jk.fr.eu.org>2010-07-29 02:29:53 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-07-29 23:16:00 (GMT)
commite7a0632b7b38f635853a08c276dad2fbd395ba92 (patch)
treea8acee261ce62d068e0b07b6ebdcb7e1a4d6055e
parent5a71fb82025d8bbb87a2d0a0851cb4c9cc31e888 (diff)
downloadbusybox-e7a0632b7b38f635853a08c276dad2fbd395ba92.tar.gz
busybox-e7a0632b7b38f635853a08c276dad2fbd395ba92.tar.bz2
bootchartd: mounting tmpfs is Linux-specific
Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--init/bootchartd.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/init/bootchartd.c b/init/bootchartd.c
index a1c0164..465a349 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -6,7 +6,6 @@
//config:config BOOTCHARTD
//config: bool "bootchartd"
//config: default y
-//config: depends on PLATFORM_LINUX
//config: help
//config: bootchartd is commonly used to profile the boot process
//config: for the purpose of speeding it up. In this case, it is started
@@ -46,12 +45,15 @@
#include "libbb.h"
/* After libbb.h, since it needs sys/types.h on some systems */
#include <sys/utsname.h>
-#include <sys/mount.h>
-#ifndef MS_SILENT
-# define MS_SILENT (1 << 15)
-#endif
-#ifndef MNT_DETACH
-# define MNT_DETACH 0x00000002
+
+#ifdef __linux__
+# include <sys/mount.h>
+# ifndef MS_SILENT
+# define MS_SILENT (1 << 15)
+# endif
+# ifndef MNT_DETACH
+# define MNT_DETACH 0x00000002
+# endif
#endif
#define BC_VERSION_STR "0.8"
@@ -175,6 +177,7 @@ static char *make_tempdir(void)
char template[] = "/tmp/bootchart.XXXXXX";
char *tempdir = xstrdup(mkdtemp(template));
if (!tempdir) {
+#ifdef __linux__
/* /tmp is not writable (happens when we are used as init).
* Try to mount a tmpfs, them cd and lazily unmount it.
* Since we unmount it at once, we can mount it anywhere.
@@ -192,6 +195,9 @@ static char *make_tempdir(void)
if (umount2(try_dir, MNT_DETACH) != 0) {
bb_perror_msg_and_die("can't %smount tmpfs", "un");
}
+#else
+ bb_perror_msg_and_die("can't create temporary directory");
+#endif
} else {
xchdir(tempdir);
}