diff options
| author | Rob Landley | 2005-12-13 08:21:33 +0000 |
|---|---|---|
| committer | Rob Landley | 2005-12-13 08:21:33 +0000 |
| commit | 70f7ef7be385f782e57106df523f1c5e16fbdc47 (patch) | |
| tree | e560de3934ac70ae03dd77695450cff91bdfce0b /include | |
| parent | 3858bf18d5d3b6a858ca46acb6c8628715520d1c (diff) | |
| download | busybox-70f7ef7be385f782e57106df523f1c5e16fbdc47.zip busybox-70f7ef7be385f782e57106df523f1c5e16fbdc47.tar.gz | |
Nothing to see here. Move along.
Not buying it, eh?
I know I said new features before 1.1, but, well... (I was weak!)
The config file and hotplug modes aren't implemented yet. Might take a stab at
those tomorrow. (I _should_ go back to focusing on the bug triage list.)
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 3 | ||||
| -rw-r--r-- | include/usage.h | 26 |
2 files changed, 27 insertions, 2 deletions
diff --git a/include/applets.h b/include/applets.h index 79d1820..47376c6 100644 --- a/include/applets.h +++ b/include/applets.h @@ -414,6 +414,9 @@ #ifdef CONFIG_MD5SUM APPLET(md5sum, md5sum_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif +#ifdef CONFIG_MDEV + APPLET(mdev, mdev_main, _BB_DIR_SBIN, _BB_SUID_NEVER) +#endif #ifdef CONFIG_MESG APPLET(mesg, mesg_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) #endif diff --git a/include/usage.h b/include/usage.h index e595bd9..12c45b4 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1841,6 +1841,26 @@ "busybox: OK\n" \ "^D\n" +#define mdev_trivial_usage \ + "[-s]" +#define mdev_full_usage \ + "\ts\tScan /sys and populate /dev during system boot\n\n" \ + "Called with no options (via hotplug) it uses environment variables\n" \ + "to determine which device to add/remove." +#ifdef CONFIG_FEATURE_MDEV_CONFIG +#define mdev_notes_usage \ + "The mdev config file contains lines that look like:\n" \ + " hd[a-z][0-9]* 0:3 660\n\n" \ + "That's device name (with regex match), uid:gid, and permissions.\n\n" \ + "Optionally, that can be followed (on the same line) by an asterisk\n" \ + "and a command line to run after creating the corresponding device(s),\n"\ + "ala:\n\n" \ + " hdc root:cdrom 660 *ln -s hdc cdrom\n\n" \ + "Config file parsing stops on the first matching line. If no config\n"\ + "entry is matched, devices are created with default 0:0 660. (Make\n"\ + "the last line match .* to override this.)\n\n" +#endif + #define mesg_trivial_usage \ "[y|n]" #define mesg_full_usage \ @@ -2822,10 +2842,12 @@ "\t-a\tStart swapping on all swap devices" #define switch_root_trivial_usage \ - "NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]" + "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]" #define switch_root_full_usage \ "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \ - "and exec NEW_INIT.\n" + "and exec NEW_INIT.\n\n" \ + "Options:\n" \ + "\t-c\tRedirect console to device on new root" #define sync_trivial_usage \ "" |