svn commit: trunk/busybox: include scripts util-linux
aldot at busybox.net
aldot at busybox.net
Tue Aug 19 11:28:52 UTC 2008
Author: aldot
Date: 2008-08-19 04:28:52 -0700 (Tue, 19 Aug 2008)
New Revision: 23106
Log:
- add new applet rdev (Grant Erickson)
- fixes and shrink (me)
Added:
trunk/busybox/util-linux/rdev.c
Modified:
trunk/busybox/include/applets.h
trunk/busybox/include/usage.h
trunk/busybox/scripts/defconfig
trunk/busybox/util-linux/Config.in
trunk/busybox/util-linux/Kbuild
Changeset:
Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h 2008-08-19 09:40:23 UTC (rev 23105)
+++ trunk/busybox/include/applets.h 2008-08-19 11:28:52 UTC (rev 23106)
@@ -286,6 +286,7 @@
USE_PWD(APPLET_NOFORK(pwd, pwd, _BB_DIR_BIN, _BB_SUID_NEVER, pwd))
USE_RAIDAUTORUN(APPLET(raidautorun, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_RDATE(APPLET(rdate, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
+USE_RDEV(APPLET(rdev, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_READAHEAD(APPLET(readahead, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_READLINK(APPLET(readlink, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_READPROFILE(APPLET(readprofile, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h 2008-08-19 09:40:23 UTC (rev 23105)
+++ trunk/busybox/include/usage.h 2008-08-19 11:28:52 UTC (rev 23106)
@@ -3168,6 +3168,14 @@
"\n -s Set the system date and time (default)" \
"\n -p Print the date and time" \
+#define rdev_trivial_usage \
+ ""
+#define rdev_full_usage "\n\n" \
+ "Print the device node associated with the filesystem mounted at '/'"
+#define rdev_example_usage \
+ "$ rdev\n" \
+ "/dev/mtdblock9 /\n"
+
#define readahead_trivial_usage \
"[FILE]..."
#define readahead_full_usage "\n\n" \
Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig 2008-08-19 09:40:23 UTC (rev 23105)
+++ trunk/busybox/scripts/defconfig 2008-08-19 11:28:52 UTC (rev 23106)
@@ -520,6 +520,7 @@
CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y
+CONFIG_RDEV=y
CONFIG_READPROFILE=y
CONFIG_RTCWAKE=y
CONFIG_SCRIPT=y
Modified: trunk/busybox/util-linux/Config.in
===================================================================
--- trunk/busybox/util-linux/Config.in 2008-08-19 09:40:23 UTC (rev 23105)
+++ trunk/busybox/util-linux/Config.in 2008-08-19 11:28:52 UTC (rev 23106)
@@ -707,6 +707,12 @@
the RFC868 protocol, which is built into the inetd daemon on most
systems.
+config RDEV
+ bool "rdev"
+ default n
+ help
+ Print the device node associated with the filesystem mounted at '/'.
+
config READPROFILE
bool "readprofile"
default n
Modified: trunk/busybox/util-linux/Kbuild
===================================================================
--- trunk/busybox/util-linux/Kbuild 2008-08-19 09:40:23 UTC (rev 23105)
+++ trunk/busybox/util-linux/Kbuild 2008-08-19 11:28:52 UTC (rev 23106)
@@ -26,6 +26,7 @@
lib-$(CONFIG_MOUNT) += mount.o
lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o
lib-$(CONFIG_RDATE) += rdate.o
+lib-$(CONFIG_RDEV) += rdev.o
lib-$(CONFIG_READPROFILE) += readprofile.o
lib-$(CONFIG_RTCWAKE) += rtcwake.o
lib-$(CONFIG_SCRIPT) += script.o
Added: trunk/busybox/util-linux/rdev.c
===================================================================
--- trunk/busybox/util-linux/rdev.c (rev 0)
+++ trunk/busybox/util-linux/rdev.c 2008-08-19 11:28:52 UTC (rev 23106)
@@ -0,0 +1,24 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * rdev - print device node associated with a filesystem
+ *
+ * Copyright (c) 2008 Nuovation System Designs, LLC
+ * Grant Erickson <gerickson at nuovations.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ *
+ */
+
+#include "libbb.h"
+
+int rdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rdev_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+ char const * const root_device = find_block_device("/");
+
+ if (root_device != NULL) {
+ printf("%s /\n", root_device);
+ return EXIT_SUCCESS;
+ }
+ return EXIT_FAILURE;
+}
More information about the busybox-cvs
mailing list