From c2908064c49a86b17d6ffb41acd12772740989b2 Mon Sep 17 00:00:00 2001 From: binh <> Date: Tue, 23 Sep 2003 04:19:35 +0000 Subject: [PATCH] All sections wrapped to approximately 75 characters. --- .../Linux-Filesystem-Hierarchy/bin.xml | 84 ++++++++-------- .../Linux-Filesystem-Hierarchy/etc.xml | 97 ++++++++++--------- .../Linux-Filesystem-Hierarchy/lib.xml | 9 +- .../Linux-Filesystem-Hierarchy/var.xml | 23 +++-- 4 files changed, 113 insertions(+), 100 deletions(-) diff --git a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/bin.xml b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/bin.xml index 47f21411..1f879a01 100644 --- a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/bin.xml +++ b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/bin.xml @@ -10,39 +10,39 @@ Compliance to the FSSTND means that there are no subdirectories in /bin and that - cat Utility to concatenate files to standard output - chgrp Utility to change file group ownership - chmod Utility to change file access permissions - chown Utility to change file owner and group - cp Utility to copy files and directories - date Utility to print or set the system data and time - dd Utility to convert and copy a file - df Utility to report filesystem disk space usage - dmesg Utility to print or control the kernel message buffer - echo Utility to display a line of text - false Utility to do nothing, unsuccessfully - hostname Utility to show or set the system's host name - kill Utility to send signals to processes - ln Utility to make links between files - login Utility to begin a session on the system - ls Utility to list directory contents - mkdir Utility to make directories - mknod Utility to make block or character special files - more Utility to page through text - mount Utility to mount a filesystem - mv Utility to move/rename files - ps Utility to report process status - pwd Utility to print name of current working directory - rm Utility to remove files or directories - rmdir Utility to remove empty directories - sed The `sed' stream editor - sh The Bourne command shell - stty Utility to change and print terminal line settings - su Utility to change user ID - sync Utility to flush filesystem buffers - true Utility to do nothing, successfully - umount Utility to unmount file systems - uname Utility to print system information + cat Utility to concatenate files to standard output + chgrp Utility to change file group ownership + chmod Utility to change file access permissions + chown Utility to change file owner and group + cp Utility to copy files and directories + date Utility to print or set the system data and time + dd Utility to convert and copy a file + df Utility to report filesystem disk space usage + dmesg Utility to print or control the kernel message buffer + echo Utility to display a line of text + false Utility to do nothing, unsuccessfully + hostname Utility to show or set the system's host name + kill Utility to send signals to processes + ln Utility to make links between files + login Utility to begin a session on the system + ls Utility to list directory contents + mkdir Utility to make directories + mknod Utility to make block or character special files + more Utility to page through text + mount Utility to mount a filesystem + mv Utility to move/rename files + ps Utility to report process status + pwd Utility to print name of current working directory + rm Utility to remove files or directories + rmdir Utility to remove empty directories + sed The `sed' stream editor + sh The Bourne command shell + stty Utility to change and print terminal line settings + su Utility to change user ID + sync Utility to flush filesystem buffers + true Utility to do nothing, successfully + umount Utility to unmount file systems + uname Utility to print system information If /bin/sh is not a true Bourne shell, it must be a hard or symbolic link to the real shell command. The [ and test commands must be placed @@ -55,15 +55,15 @@ root partition. The following programs, or symbolic links to programs, must be in /bin if the corresponding subsystem is installed: - csh The C shell (optional) - ed The `ed' editor (optional) - tar The tar archiving utility (optional) - cpio The cpio archiving utility (optional) - gzip The GNU compression utility (optional) - gunzip The GNU uncompression utility (optional) - zcat The GNU uncompression utility (optional) - netstat The network statistics utility (optional) - ping The ICMP network test utility (optional) + csh The C shell (optional) + ed The `ed' editor (optional) + tar The tar archiving utility (optional) + cpio The cpio archiving utility (optional) + gzip The GNU compression utility (optional) + gunzip The GNU uncompression utility (optional) + zcat The GNU uncompression utility (optional) + netstat The network statistics utility (optional) + ping The ICMP network test utility (optional) If the gunzip and zcat programs exist, they must be symbolic or hard links to gzip. /bin/csh may be a symbolic link to /bin/tcsh or diff --git a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/etc.xml b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/etc.xml index fd893f9f..f0a1e412 100644 --- a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/etc.xml +++ b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/etc.xml @@ -859,16 +859,17 @@ language dictionary databases. #echo dgram udp wait root internal #chargen stream tcp nowait root internal #chargen dgram udp wait root internal - discard stream tcp nowait root internal - discard dgram udp wait root internal - daytime stream tcp nowait root internal + discard stream tcp nowait root internal + discard dgram udp wait root internal + daytime stream tcp nowait root internal #daytime dgram udp wait root internal time stream tcp nowait root internal #time dgram udp wait root internal #:STANDARD: These are standard services. ftp stream tcp nowait root /usr/sbin/tcpd /usr/sbin/in.ftpd - telnet stream tcp nowait telnetd.telnetd /usr/sbin/tcpd /usr/sbin/in.telnetd + telnet stream tcp nowait telnetd.telnetd /usr/sbin/tcpd + /usr/sbin/in.telnetd #:MAIL: Mail, news and uucp services. smtp stream tcp nowait mail /usr/sbin/exim exim -bs @@ -877,11 +878,13 @@ language dictionary databases. #:INFO: Info services ident stream tcp wait identd /usr/sbin/identd identd - finger stream tcp nowait nobody /usr/sbin/tcpd /usr/sbin/in.fingerd + finger stream tcp nowait nobody /usr/sbin/tcpd + /usr/sbin/in.fingerd - #:BOOT: Tftp service is provided primarily for booting. Most sites - # run this only on machines acting as "boot servers." - tftp dgram udp wait nobody /usr/sbin/tcpd /usr/sbin/in.tftpd -s /tftpboot + #:BOOT: Tftp service is provided primarily for booting. + #Most sites run this only on machines acting as "boot servers." + tftp dgram udp wait nobody /usr/sbin/tcpd + /usr/sbin/in.tftpd -s /tftpboot /etc/init.d @@ -1228,7 +1231,7 @@ Order of scripts run in /etc/rc?.d Prompt #Prompt user to select OS choice at boot timeout=300 # Amount of time to wait before default OS - # started + # started (in ms) default=Debian4 #Default OS to be loaded vga=normal #VGA mode boot=/dev/had #location of MBR @@ -1546,8 +1549,8 @@ Order of scripts run in /etc/rc?.d ### update-modules: start processing /etc/modutils/setserial # - # This is what I wanted to do, but logger is in /usr/bin, which isn't loaded - # when the module is first loaded into the kernel at boot time! + # This is what I wanted to do, but logger is in /usr/bin, which isn't + # loaded when the module is first loaded into the kernel at boot time! # #post-install serial /etc/init.d/setserial start | #logger -p daemon.info -t "setserial-module reload" @@ -2166,54 +2169,57 @@ dummy:x:1001:1001:,,,:/home/dummy:/bin/bash configuration files in /etc (/etc/shadow and others) and programs in /usr/sbin (useradd, usermod, and others). - csh.login Systemwide initialization file for C shell logins - (optional) - exports NFS filesystem access control list (optional) - fstab Static information about filesystems (optional) - ftpusers FTP daemon user access control list (optional) - gateways File which lists gateways for routed (optional) - gettydefs Speed and terminal settings used by getty (optional) - group User group file (optional) - host.conf Resolver configuration file (optional) - hosts Static information about host names (optional) - hosts.allow Host access file for TCP wrappers (optional) - hosts.deny Host access file for TCP wrappers (optional) - hosts.equiv List of trusted hosts for rlogin, rsh, rcp (optional) - hosts.lpd List of trusted hosts for lpd (optional) - inetd.conf Configuration file for inetd (optional) - inittab Configuration file for init (optional) - issue Pre-login message and identification file (optional) - ld.so.conf List of extra directories to search for shared libraries (optional) - motd Post-login message of the day file (optional) - mtab Dynamic information about filesystems (optional) + csh.login Systemwide initialization file for C shell logins + (optional) + exports NFS filesystem access control list (optional) + fstab Static information about filesystems (optional) + ftpusers FTP daemon user access control list (optional) + gateways File which lists gateways for routed (optional) + gettydefs Speed and terminal settings used by getty (optional) + group User group file (optional) + host.conf Resolver configuration file (optional) + hosts Static information about host names (optional) + hosts.allow Host access file for TCP wrappers (optional) + hosts.deny Host access file for TCP wrappers (optional) + hosts.equiv List of trusted hosts for rlogin, rsh, rcp (optional) + hosts.lpd List of trusted hosts for lpd (optional) + inetd.conf Configuration file for inetd (optional) + inittab Configuration file for init (optional) + issue Pre-login message and identification file (optional) + ld.so.conf List of extra directories to search for shared libraries + (optional) + motd Post-login message of the day file (optional) + mtab Dynamic information about filesystems (optional) mtab does not fit the static nature of /etc: it is excepted for historical reasons. On some Linux systems, this may be a symbolic link to /proc/mounts, in which case this exception is not required. - mtools.conf Configuration file for mtools (optional) - networks Static information about network names (optional) - passwd The password file (optional) - printcap The lpd printer capability database (optional) - profile Systemwide initialization file for sh shell logins (optional) - protocols IP protocol listing (optional) - resolv.conf Resolver configuration file (optional) - rpc RPC protocol listing (optional) - securetty TTY access control for root login (optional) - services Port names for network services (optional) - shells Pathnames of valid login shells (optional) - syslog.conf Configuration file for syslogd (optional) + mtools.conf Configuration file for mtools (optional) + networks Static information about network names (optional) + passwd The password file (optional) + printcap The lpd printer capability database (optional) + profile Systemwide initialization file for sh shell logins (optional) + protocols IP protocol listing (optional) + resolv.conf Resolver configuration file (optional) + rpc RPC protocol listing (optional) + securetty TTY access control for root login (optional) + services Port names for network services (optional) + shells Pathnames of valid login shells (optional) + syslog.conf Configuration file for syslogd (optional) /etc/opt : Configuration files for /opt Host-specific configuration files for add-on application software packages must be installed within the directory + /etc/opt/<package>, where <package> is the name of the subtree in /opt where the static data from that package is stored. No structure is imposed on the internal arrangement of /etc/opt/<package>. If a configuration file must reside in a different location in order for the package or system to function properly, it may be placed in a location other than /etc/opt/<package>. + /etc/X11 : Configuration for the X Window System (optional) /etc/X11 is the location for all X11 host-specific configuration. This directory is necessary to allow local control if /usr is mounted read only. The following @@ -2223,13 +2229,16 @@ dummy:x:1001:1001:,,,:/home/dummy:/bin/bash XFree86 versions 3 and 4 (optional) Xmodmap Global X11 keyboard modification file (optional) Subdirectories of /etc/X11 may include those for xdm and for any other programs (some window managers, for example) that need them. + /etc/X11/xdm holds the configuration files for xdm. These are most of the files previously found in /usr/lib/X11/xdm. Some local variable data for xdm is stored in /var/lib/xdm. We recommend that window managers with only one configuration file which is a default .*wmrc file must name it system.*wmrc (unless there is a widely-accepted alternative name) and not use a subdirectory. Any window manager subdirectories must be identically named to - the actual window manager binary. /etc/sgml : Configuration files for SGML + the actual window manager binary. + + /etc/sgml : Configuration files for SGML and XML (optional) Generic configuration files defining high-level parameters of the SGML or XML systems are installed here. Files with names *.conf indicate generic configuration files. File with names *.cat are the diff --git a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/lib.xml b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/lib.xml index b69248ba..11b93d01 100644 --- a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/lib.xml +++ b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/lib.xml @@ -107,8 +107,8 @@ also be placed in /usr/lib if it is not required by anything in At least one of each of the following filename patterns are required (they may be files, or symbolic links): -libc.so.* The dynamically-linked C library (optional) -ld* The execution time linker/loader (optional) +libc.so.* The dynamically-linked C library (optional) +ld* The execution time linker/loader (optional) If a C preprocessor is installed, /lib/cpp must be a reference to it, for historical reasons. The usual placement of this binary @@ -121,8 +121,9 @@ The following directories, or symbolic links to directories, must be in /lib, if the corresponding subsystem is installed: /lib -- essential shared libraries and kernel modules -/lib/modules Loadable kernel modules (optional) -/lib<qual> : Alternate format essential shared libraries (optional) +/lib/modules Loadable kernel modules (optional) +/lib<qual> : Alternate format essential shared libraries + (optional) There may be one or more variants of the /lib directory on systems which support more than one binary format requiring separate libraries. diff --git a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/var.xml b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/var.xml index 29cef6f5..4968c690 100644 --- a/LDP/guide/docbook/Linux-Filesystem-Hierarchy/var.xml +++ b/LDP/guide/docbook/Linux-Filesystem-Hierarchy/var.xml @@ -162,24 +162,27 @@ The following directories, or symbolic links to directories, are required in /var for FSSTND compliance: - /var/cache Application cache data -/var/lib Variable state information -/var/local Variable data for /usr/local -/var/lock Lock files -/var/log Log files and directories -/var/opt Variable data for /opt -/var/run Data relevant to running processes -/var/spool Application spool data -/var/tmp Temporary files preserved between system reboots + +/var/cache Application cache data +/var/lib Variable state information +/var/local Variable data for /usr/local +/var/lock Lock files +/var/log Log files and directories +/var/opt Variable data for /opt +/var/run Data relevant to running processes +/var/spool Application spool data +/var/tmp Temporary files preserved between system reboots Several directories are 'reserved' in the sense that they must not be used arbitrarily by some new application, since they would conflict with historical and/or local practice. They are: - /var/backups + +/var/backups /var/cron /var/msgs /var/preserve +