diff options
author | Ceri Davies <ceri@FreeBSD.org> | 2007-02-18 22:41:41 +0000 |
---|---|---|
committer | Ceri Davies <ceri@FreeBSD.org> | 2007-02-18 22:41:41 +0000 |
commit | aaf6f0feaafc5ddf58da1b37ae11b0aae2652e39 (patch) | |
tree | 17caa675727cf6a94517e3683fda82563eea02e4 /usr.sbin/sysinstall | |
parent | c12e775489957891bad0494d79130da639f348b2 (diff) | |
download | src-aaf6f0feaafc5ddf58da1b37ae11b0aae2652e39.tar.gz src-aaf6f0feaafc5ddf58da1b37ae11b0aae2652e39.zip |
Bring these files up-to-date.
PR: docs/108536
Notes
Notes:
svn path=/head/; revision=166815
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r-- | usr.sbin/sysinstall/install.cfg | 32 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 24 |
2 files changed, 29 insertions, 27 deletions
diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg index fb7ad8859795..d894f0619aed 100644 --- a/usr.sbin/sysinstall/install.cfg +++ b/usr.sbin/sysinstall/install.cfg @@ -1,4 +1,4 @@ -# This is the installation configuration file for my test machine, +# This is a sample installation configuration file for my test machine, # crate.cdrom.com. # It is included here merely as a sort-of-documented example. # @@ -27,7 +27,7 @@ mediaSetFTP ################################ # Select which distributions we want. -dists=bin doc manpages info compat21 des src sbase ssys +dists=base doc manpages info src sbase ssys kernels GENERIC distSetCustom ################################ @@ -47,15 +47,13 @@ diskPartitionEditor ################################ -# This assumes that slice 1 is a DOS partition and mounts it as /dos, -# which is the case on my laptop. -# +# Disk partitioning. # All sizes are expressed in 512 byte blocks! -# A 20MB root partition -ad0s1-1=ufs 40960 / -# And a 20MB swap partition -ad0s1-2=swap 40960 none +# A 512MB root partition +ad0s1-1=ufs 1048576 / +# And a 512MB swap partition +ad0s1-2=swap 1048576 none # Followed by a /usr partition using all remaining space (size 0 = free space) # and with softupdates enabled (non-zero arg following mountpoint). ad0s1-3=ufs 0 /usr 1 @@ -65,23 +63,25 @@ diskLabelEditor ################################ ################################ -# Now partition the 2nd disk. +# Now partition the 2nd disk with a 1GB /var and /usr/src using the +# remainder of the disk. disk=ad1 partition=exclusive diskPartitionEditor -ad1s1-1=ufs 40960 /var +ad1s1-1=ufs 2097152 /var ad1s1-2=ufs 0 /usr/src diskLabelEditor ################################ ################################ -# And the 3rd. +# And the 3rd, adding a second 512MB of swap and the rest of the disk +# for /tmp. disk=da0 partition=exclusive diskPartitionEditor -da0s1-1=swap 40960 none +da0s1-1=swap 1048576 none da0s1-2=ufs 0 /tmp diskLabelEditor ################################ @@ -91,9 +91,7 @@ diskLabelEditor installCommit # Install some packages at the end. -package=bash-1.14.7 -packageAdd -package=ncftp-2.4.2 +package=bash-3.1.17 packageAdd -package=tcsh-6.07.02 +package=ncftp-3.2.0 packageAdd diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index d8b5515d3276..833d6cd69e7a 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -326,7 +326,7 @@ partition .Ar ( da0s1 being your DOS primary partition). -Now let's further assume that you have 500MB in this +Now let's further assume that you have 4GB in this partition and you want to sub-partition that space into root, swap, var and usr file systems for .Fx . @@ -334,14 +334,14 @@ Your invocation of the .Ar diskLabelEditor function might involve setting the following variables: .Bl -tag -width findx -.It Li "da0s2-1=ufs 40960 /" -A 20MB root file system (all sizes are in 512 byte blocks). -.It Li "da0s2-2=swap 131072 /" -A 64MB swap partition. -.It Li "da0s2-3=ufs 204800 /var" -A 100MB /var file system. +.It Li "da0s2-1=ufs 2097152 /" +A 1GB root file system (all sizes are in 512 byte blocks). +.It Li "da0s2-2=swap 1048576 /" +A 512MB swap partition. +.It Li "da0s2-3=ufs 524288 /var" +A 256MB /var file system. .It Li "da0s2-4=ufs 0 /usr 1" -With the balance of free space (around 316MB) going to the /usr +With the balance of free space (around 2.25GB) going to the /usr file system and with soft-updates enabled (the argument following the mount point, if non-zero, means to set the soft updates flag). .El @@ -405,6 +405,10 @@ Possible distribution values are: .Bl -tag -width indentxx .It Li base The base binary distribution. +.It Li generic +The GENERIC kernel. +.It Li smp +A kernel suitable for multiple processor systems. .It Li doc Miscellaneous documentation .It Li games @@ -448,6 +452,8 @@ The ports collection. /usr/src/release .It Li srescue /usr/src/rescue +.It Li stools +/usr/src/tools .It Li sbin /usr/src/bin .It Li ssbin @@ -460,8 +466,6 @@ The ports collection. /usr/src/usr.bin .It Li susbin /usr/src/usr.sbin -.It Li ssmailcf -/usr/src/usr.sbin/sendmail/cf .It Li Xbin X.Org client applications. .It Li Xlib |