Parcourir la source

Documentation: move nfsroot.txt to filesystems/

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>
J. Bruce Fields il y a 17 ans
Parent
commit
6ded55da6b

+ 0 - 2
Documentation/00-INDEX

@@ -271,8 +271,6 @@ netlabel/
 	- directory with information on the NetLabel subsystem.
 	- directory with information on the NetLabel subsystem.
 networking/
 networking/
 	- directory with info on various aspects of networking with Linux.
 	- 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
 nmi_watchdog.txt
 	- info on NMI watchdog for SMP systems.
 	- info on NMI watchdog for SMP systems.
 nommu-mmap.txt
 nommu-mmap.txt

+ 2 - 0
Documentation/filesystems/00-INDEX

@@ -66,6 +66,8 @@ mandatory-locking.txt
 	- info on the Linux implementation of Sys V mandatory file locking.
 	- info on the Linux implementation of Sys V mandatory file locking.
 ncpfs.txt
 ncpfs.txt
 	- info on Novell Netware(tm) filesystem using NCP protocol.
 	- 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
 ntfs.txt
 	- info and mount options for the NTFS filesystem (Windows NT).
 	- info and mount options for the NTFS filesystem (Windows NT).
 ocfs2.txt
 ocfs2.txt

+ 0 - 0
Documentation/nfsroot.txt → Documentation/filesystems/nfsroot.txt


+ 3 - 3
Documentation/kernel-parameters.txt

@@ -845,7 +845,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			arch/alpha/kernel/core_marvel.c.
 			arch/alpha/kernel/core_marvel.c.
 
 
 	ip=		[IP_PNP]
 	ip=		[IP_PNP]
-			See Documentation/nfsroot.txt.
+			See Documentation/filesystems/nfsroot.txt.
 
 
 	ip2=		[HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
 	ip2=		[HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
 			See comment before ip2_setup() in
 			See comment before ip2_setup() in
@@ -1199,10 +1199,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			file if at all.
 			file if at all.
 
 
 	nfsaddrs=	[NFS]
 	nfsaddrs=	[NFS]
-			See Documentation/nfsroot.txt.
+			See Documentation/filesystems/nfsroot.txt.
 
 
 	nfsroot=	[NFS] nfs root filesystem for disk-less boxes.
 	nfsroot=	[NFS] nfs root filesystem for disk-less boxes.
-			See Documentation/nfsroot.txt.
+			See Documentation/filesystems/nfsroot.txt.
 
 
 	nfs.callback_tcpport=
 	nfs.callback_tcpport=
 			[NFS] set the TCP port on which the NFSv4 callback
 			[NFS] set the TCP port on which the NFSv4 callback

+ 4 - 4
fs/Kconfig

@@ -1744,10 +1744,10 @@ config ROOT_NFS
 	  If you want your Linux box to mount its whole root file system (the
 	  If you want your Linux box to mount its whole root file system (the
 	  one containing the directory /) from some other computer over the
 	  one containing the directory /) from some other computer over the
 	  net via NFS (presumably because your box doesn't have a hard disk),
 	  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.
 	  Most people say N here.
 
 

+ 4 - 4
net/ipv4/Kconfig

@@ -160,7 +160,7 @@ config IP_PNP_DHCP
 
 
 	  If unsure, say Y. Note that if you want to use DHCP, a DHCP server
 	  If unsure, say Y. Note that if you want to use DHCP, a DHCP server
 	  must be operating on your network.  Read
 	  must be operating on your network.  Read
-	  <file:Documentation/nfsroot.txt> for details.
+	  <file:Documentation/filesystems/nfsroot.txt> for details.
 
 
 config IP_PNP_BOOTP
 config IP_PNP_BOOTP
 	bool "IP: BOOTP support"
 	bool "IP: BOOTP support"
@@ -175,7 +175,7 @@ config IP_PNP_BOOTP
 	  does BOOTP itself, providing all necessary information on the kernel
 	  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
 	  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.
 	  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
 config IP_PNP_RARP
 	bool "IP: RARP support"
 	bool "IP: RARP support"
@@ -187,8 +187,8 @@ config IP_PNP_RARP
 	  discovered automatically at boot time using the RARP protocol (an
 	  discovered automatically at boot time using the RARP protocol (an
 	  older protocol which is being obsoleted by BOOTP and DHCP), say Y
 	  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
 	  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..
 # not yet ready..
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP		
 #   bool '    IP: ARP support' CONFIG_IP_PNP_ARP		

+ 1 - 1
net/ipv4/ipconfig.c

@@ -1411,7 +1411,7 @@ late_initcall(ip_auto_config);
 
 
 /*
 /*
  *  Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
  *  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)
 static int __init ic_proto_name(char *name)
 {
 {