Skip to content

Commit

Permalink
Documentation: move nfsroot.txt to filesystems/
Browse files Browse the repository at this point in the history
Documentation/ is a little large, and filesystems/ seems an obvious
place for this file.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
J. Bruce Fields authored and Jonathan Corbet committed Apr 11, 2008
1 parent dc07e72 commit 6ded55d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 0 additions & 2 deletions Documentation/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ netlabel/
- directory with information on the NetLabel subsystem.
networking/
- directory with info on various aspects of networking with Linux.
nfsroot.txt
- short guide on setting up a diskless box with NFS root filesystem.
nmi_watchdog.txt
- info on NMI watchdog for SMP systems.
nommu-mmap.txt
Expand Down
2 changes: 2 additions & 0 deletions Documentation/filesystems/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ mandatory-locking.txt
- info on the Linux implementation of Sys V mandatory file locking.
ncpfs.txt
- info on Novell Netware(tm) filesystem using NCP protocol.
nfsroot.txt
- short guide on setting up a diskless box with NFS root filesystem.
ntfs.txt
- info and mount options for the NTFS filesystem (Windows NT).
ocfs2.txt
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ and is between 256 and 4096 characters. It is defined in the file
arch/alpha/kernel/core_marvel.c.

ip= [IP_PNP]
See Documentation/nfsroot.txt.
See Documentation/filesystems/nfsroot.txt.

ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
See comment before ip2_setup() in
Expand Down Expand Up @@ -1199,10 +1199,10 @@ and is between 256 and 4096 characters. It is defined in the file
file if at all.

nfsaddrs= [NFS]
See Documentation/nfsroot.txt.
See Documentation/filesystems/nfsroot.txt.

nfsroot= [NFS] nfs root filesystem for disk-less boxes.
See Documentation/nfsroot.txt.
See Documentation/filesystems/nfsroot.txt.

nfs.callback_tcpport=
[NFS] set the TCP port on which the NFSv4 callback
Expand Down
8 changes: 4 additions & 4 deletions fs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1744,10 +1744,10 @@ config ROOT_NFS
If you want your Linux box to mount its whole root file system (the
one containing the directory /) from some other computer over the
net via NFS (presumably because your box doesn't have a hard disk),
say Y. Read <file:Documentation/nfsroot.txt> for details. It is
likely that in this case, you also want to say Y to "Kernel level IP
autoconfiguration" so that your box can discover its network address
at boot time.
say Y. Read <file:Documentation/filesystems/nfsroot.txt> for
details. It is likely that in this case, you also want to say Y to
"Kernel level IP autoconfiguration" so that your box can discover
its network address at boot time.

Most people say N here.

Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ config IP_PNP_DHCP

If unsure, say Y. Note that if you want to use DHCP, a DHCP server
must be operating on your network. Read
<file:Documentation/nfsroot.txt> for details.
<file:Documentation/filesystems/nfsroot.txt> for details.

config IP_PNP_BOOTP
bool "IP: BOOTP support"
Expand All @@ -175,7 +175,7 @@ config IP_PNP_BOOTP
does BOOTP itself, providing all necessary information on the kernel
command line, you can say N here. If unsure, say Y. Note that if you
want to use BOOTP, a BOOTP server must be operating on your network.
Read <file:Documentation/nfsroot.txt> for details.
Read <file:Documentation/filesystems/nfsroot.txt> for details.

config IP_PNP_RARP
bool "IP: RARP support"
Expand All @@ -187,8 +187,8 @@ config IP_PNP_RARP
discovered automatically at boot time using the RARP protocol (an
older protocol which is being obsoleted by BOOTP and DHCP), say Y
here. Note that if you want to use RARP, a RARP server must be
operating on your network. Read <file:Documentation/nfsroot.txt> for
details.
operating on your network. Read
<file:Documentation/filesystems/nfsroot.txt> for details.

# not yet ready..
# bool ' IP: ARP support' CONFIG_IP_PNP_ARP
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/ipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ late_initcall(ip_auto_config);

/*
* Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
* command line parameter. See Documentation/nfsroot.txt.
* command line parameter. See Documentation/filesystems/nfsroot.txt.
*/
static int __init ic_proto_name(char *name)
{
Expand Down

0 comments on commit 6ded55d

Please sign in to comment.