On Thu, Oct 22, 2009 at 12:55:55AM +0200, Denys Vlasenko wrote: > >commit: >http://git.busybox.net/busybox/commit/?id=3945bc15340dc9cfa8aae0164f3baf94db6d40c3 >branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master > >--- a/include/applets.h >+++ b/include/applets.h >@@ -396,7 +396,7 @@ IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, >_BB_SUID_DROP, true)) > IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) > IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) > IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) >-//IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) >+IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
huh? what are you guys up to? > IF_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) > IF_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) > IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, > udpsvd)) >diff --git a/include/usage.h b/include/usage.h >index 80111e5..9c0d29d 100644 >--- a/include/usage.h >+++ b/include/usage.h >@@ -4666,22 +4666,24 @@ > "\n -f name tun device (/dev/net/tun)" \ > "\n -t name Create iface 'name'" \ > "\n -d name Delete iface 'name'" \ >-IF_FEATURE_TUNCTL_UG( \ >+ IF_FEATURE_TUNCTL_UG( \ unrelated! > "\n -u owner Set iface owner" \ > "\n -g group Set iface group" \ > "\n -b Brief output" \ >-) >+ ) > #define tunctl_example_usage \ > "# tunctl\n" \ > "# tunctl -d tun0\n" > >diff --git a/util-linux/Kbuild b/util-linux/Kbuild >index 7befe06..dc1d1f2 100644 >--- a/util-linux/Kbuild >+++ b/util-linux/Kbuild Huh? util-linux? e2fsprogs!! HUh? no Config.in entry!!! >@@ -38,4 +38,5 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o > lib-$(CONFIG_SETARCH) += setarch.o > lib-$(CONFIG_SWAPONOFF) += swaponoff.o > lib-$(CONFIG_SWITCH_ROOT) += switch_root.o >+lib-$(CONFIG_MKFS_EXT2) += tune2fs.o HUH? > lib-$(CONFIG_UMOUNT) += umount.o >diff --git a/util-linux/tune2fs.c b/util-linux/tune2fs.c >new file mode 100644 >index 0000000..3b8f3d8 >--- /dev/null >+++ b/util-linux/tune2fs.c >@@ -0,0 +1,71 @@ >+/* vi: set sw=4 ts=4: */ >+/* >+ * tune2fs: utility to modify EXT2 filesystem >+ * >+ * Busybox'ed (2009) by Vladimir Dronnikov <[email protected]> >+ * >+ * Licensed under GPLv2, see file LICENSE in this tarball for details. will have to be reimplemented for anything that wants "or later". Bad. Can anyone explain, _in detail_ what's going on there? What's the theory behind that? PS: doesn't ext4 behaves the same WRT labels pos? If so, helptext should be fixed, too. PPS: attached. PPPS: uncool yours,
diff --git a/include/applets.h b/include/applets.h index 6d7af52..36b2485 100644 --- a/include/applets.h +++ b/include/applets.h @@ -405,7 +405,7 @@ IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true)) IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) +IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd)) diff --git a/util-linux/Config.in b/util-linux/Config.in index a59cc1d..24f1f1b 100644 --- a/util-linux/Config.in +++ b/util-linux/Config.in @@ -865,6 +865,13 @@ config SWITCH_ROOT and ending point for searching through the kernel's doubly linked list of active mount points. That's why. +config TUNE2FS + bool "tune2fs" + default n + help + adjust tunable filesystem parameters on ext2/ext3/ext4 + filesystems + config UMOUNT bool "umount" default n diff --git a/util-linux/Kbuild b/util-linux/Kbuild index 99e3efe..0d19a7f 100644 --- a/util-linux/Kbuild +++ b/util-linux/Kbuild @@ -42,5 +42,5 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o lib-$(CONFIG_SETARCH) += setarch.o lib-$(CONFIG_SWAPONOFF) += swaponoff.o lib-$(CONFIG_SWITCH_ROOT) += switch_root.o -lib-$(CONFIG_MKFS_EXT2) += tune2fs.o +lib-$(CONFIG_TUNE2FS) += tune2fs.o lib-$(CONFIG_UMOUNT) += umount.o
_______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
