diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-02-02 23:14:57 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-02 23:14:57 +0000 |
commit | 5509228a7b40018ae3e0439a0871f09b44a6e1c7 (patch) | |
tree | 9bd1a07a760298c6dbc201d9934a6fb1b8b63169 | |
parent | 35cf19d741c981858e88e425c46943bd96e51c22 (diff) | |
download | busybox-w32-5509228a7b40018ae3e0439a0871f09b44a6e1c7.tar.gz busybox-w32-5509228a7b40018ae3e0439a0871f09b44a6e1c7.tar.bz2 busybox-w32-5509228a7b40018ae3e0439a0871f09b44a6e1c7.zip |
alphabetical order and fix mdev comments about echo>/sys vs echo>/proc/sys
-rw-r--r-- | util-linux/Config.in | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/util-linux/Config.in b/util-linux/Config.in index 27410bf10..76e9ff97f 100644 --- a/util-linux/Config.in +++ b/util-linux/Config.in | |||
@@ -250,7 +250,7 @@ config CONFIG_MDEV | |||
250 | default n | 250 | default n |
251 | help | 251 | help |
252 | mdev is a mini-udev implementation: call it with -s to populate | 252 | mdev is a mini-udev implementation: call it with -s to populate |
253 | /dev from /sys, then "echo /sbin/mdev > /sys/kernel/hotplug" to | 253 | /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to |
254 | have it handle hotplug events afterwards. Device names are taken | 254 | have it handle hotplug events afterwards. Device names are taken |
255 | from sysfs. | 255 | from sysfs. |
256 | 256 | ||
@@ -309,6 +309,24 @@ config CONFIG_FEATURE_USE_TERMIOS | |||
309 | will be unable to determine the current screen size, and will be | 309 | will be unable to determine the current screen size, and will be |
310 | unable to move the cursor. | 310 | unable to move the cursor. |
311 | 311 | ||
312 | config CONFIG_MOUNT | ||
313 | bool "mount" | ||
314 | default n | ||
315 | help | ||
316 | All files and filesystems in Unix are arranged into one big directory | ||
317 | tree. The 'mount' utility is used to graft a filesystem onto a | ||
318 | particular part of the tree. A filesystem can either live on a block | ||
319 | device, or it can be accessible over the network, as is the case with | ||
320 | NFS filesystems. Most people using BusyBox will also want to enable | ||
321 | the 'mount' utility. | ||
322 | |||
323 | config CONFIG_FEATURE_MOUNT_NFS | ||
324 | bool " Support mounting NFS file systems" | ||
325 | default n | ||
326 | depends on CONFIG_MOUNT | ||
327 | help | ||
328 | Enable mounting of NFS file systems. | ||
329 | |||
312 | config CONFIG_PIVOT_ROOT | 330 | config CONFIG_PIVOT_ROOT |
313 | bool "pivot_root" | 331 | bool "pivot_root" |
314 | default n | 332 | default n |
@@ -321,25 +339,6 @@ config CONFIG_PIVOT_ROOT | |||
321 | Note: This is for initrd in linux 2.4. Under initramfs (introduced | 339 | Note: This is for initrd in linux 2.4. Under initramfs (introduced |
322 | in linux 2.6) use switch_root instead. | 340 | in linux 2.6) use switch_root instead. |
323 | 341 | ||
324 | config CONFIG_SWITCH_ROOT | ||
325 | bool "switch_root" | ||
326 | default n | ||
327 | help | ||
328 | The switch_root utility is used from initramfs to select a new | ||
329 | root device. Under initramfs, you have to use this instead of | ||
330 | pivot_root. (Stop reading here if you don't care why.) | ||
331 | |||
332 | Booting with initramfs extracts a gzipped cpio archive into rootfs | ||
333 | (which is a variant of ramfs/tmpfs). Because rootfs can't be moved | ||
334 | or unmounted*, pivot_root will not work from initramfs. Instead, | ||
335 | switch_root deletes everything out of rootfs (including itself), | ||
336 | does a mount --move that overmounts rootfs with the new root, and | ||
337 | then execs the specified init program. | ||
338 | |||
339 | * Because the Linux kernel uses rootfs internally as the starting | ||
340 | and ending point for searching through the kernel's doubly linked | ||
341 | list of active mount points. That's why. | ||
342 | |||
343 | config CONFIG_RDATE | 342 | config CONFIG_RDATE |
344 | bool "rdate" | 343 | bool "rdate" |
345 | default n | 344 | default n |
@@ -366,23 +365,24 @@ config CONFIG_SWAPONOFF | |||
366 | space. If you are not using any swap space, you can leave this | 365 | space. If you are not using any swap space, you can leave this |
367 | option disabled. | 366 | option disabled. |
368 | 367 | ||
369 | config CONFIG_MOUNT | 368 | config CONFIG_SWITCH_ROOT |
370 | bool "mount" | 369 | bool "switch_root" |
371 | default n | 370 | default n |
372 | help | 371 | help |
373 | All files and filesystems in Unix are arranged into one big directory | 372 | The switch_root utility is used from initramfs to select a new |
374 | tree. The 'mount' utility is used to graft a filesystem onto a | 373 | root device. Under initramfs, you have to use this instead of |
375 | particular part of the tree. A filesystem can either live on a block | 374 | pivot_root. (Stop reading here if you don't care why.) |
376 | device, or it can be accessible over the network, as is the case with | ||
377 | NFS filesystems. Most people using BusyBox will also want to enable | ||
378 | the 'mount' utility. | ||
379 | 375 | ||
380 | config CONFIG_FEATURE_MOUNT_NFS | 376 | Booting with initramfs extracts a gzipped cpio archive into rootfs |
381 | bool " Support mounting NFS file systems" | 377 | (which is a variant of ramfs/tmpfs). Because rootfs can't be moved |
382 | default n | 378 | or unmounted*, pivot_root will not work from initramfs. Instead, |
383 | depends on CONFIG_MOUNT | 379 | switch_root deletes everything out of rootfs (including itself), |
384 | help | 380 | does a mount --move that overmounts rootfs with the new root, and |
385 | Enable mounting of NFS file systems. | 381 | then execs the specified init program. |
382 | |||
383 | * Because the Linux kernel uses rootfs internally as the starting | ||
384 | and ending point for searching through the kernel's doubly linked | ||
385 | list of active mount points. That's why. | ||
386 | 386 | ||
387 | config CONFIG_UMOUNT | 387 | config CONFIG_UMOUNT |
388 | bool "umount" | 388 | bool "umount" |