summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-16 22:39:51 +0000
committerDenis Vlasenko2006-10-16 22:39:51 +0000
commit13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb (patch)
tree7fc88766e8b5a39f88d7d54f41a62c219b791c94 /include
parentf46be091060ad48b124a99d4a996405e85c63a33 (diff)
downloadbusybox-13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb.zip
busybox-13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb.tar.gz
mount: support user mounts if CONFIG_DESKTOP
Diffstat (limited to 'include')
-rw-r--r--include/applets.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/applets.h b/include/applets.h
index 3b759de..0c02096 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -46,6 +46,10 @@
# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
#endif
+// _BB_SUID_ALWAYS: will complain if busybox isn't suid
+// and is run by non-root (applet_main() will not be called at all)
+// _BB_SUID_NEVER: will drop suid prior to applet_main()
+// _BB_SUID_MAYBE: neither of the above
USE_TEST(APPLET_NOUSAGE([, test, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TEST(APPLET_NOUSAGE([[, test, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@@ -198,7 +202,7 @@ USE_MKSWAP(APPLET(mkswap, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MKTEMP(APPLET(mktemp, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MORE(APPLET(more, _BB_DIR_BIN, _BB_SUID_NEVER))
-USE_MOUNT(APPLET(mount, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_MOUNT(APPLET(mount, _BB_DIR_BIN, USE_DESKTOP(_BB_SUID_MAYBE) SKIP_DESKTOP(_BB_SUID_NEVER)))
USE_MOUNTPOINT(APPLET(mountpoint, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_MSH(APPLET_NOUSAGE(msh, msh, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_NEVER))