diff options
| -rwxr-xr-x | build/build.sh | 7 | ||||
| -rw-r--r-- | build/templates/docstruct.ent | 7 | ||||
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | en/appendix/chroot-install.xml | 17 | ||||
| -rw-r--r-- | en/appendix/example-preseed-sarge.xml | 366 | ||||
| -rw-r--r-- | en/appendix/example-preseed.xml | 34 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 122 | ||||
| -rw-r--r-- | en/appendix/random-bits.xml | 1 | ||||
| -rw-r--r-- | en/boot-new/boot-new.xml | 37 | ||||
| -rw-r--r-- | en/boot-new/modules/apt.xml | 114 | ||||
| -rw-r--r-- | en/boot-new/modules/install.xml | 39 | ||||
| -rw-r--r-- | en/boot-new/modules/mta.xml | 93 | ||||
| -rw-r--r-- | en/boot-new/modules/packages.xml | 162 | ||||
| -rw-r--r-- | en/boot-new/modules/ppp.xml | 142 | ||||
| -rw-r--r-- | en/boot-new/modules/shadow.xml | 69 | ||||
| -rw-r--r-- | en/boot-new/modules/timezone.xml | 30 | ||||
| -rw-r--r-- | en/howto/installation-howto.xml | 10 | ||||
| -rw-r--r-- | en/install-methods/automatic-install.xml | 65 | ||||
| -rw-r--r-- | en/preparing/install-overview.xml | 32 | ||||
| -rw-r--r-- | en/using-d-i/components.xml | 39 | ||||
| -rw-r--r-- | en/welcome/doc-organization.xml | 19 |
21 files changed, 117 insertions, 1302 deletions
diff --git a/build/build.sh b/build/build.sh index a877aaa7c..c14b852ae 100755 --- a/build/build.sh +++ b/build/build.sh @@ -68,16 +68,11 @@ for lang in $languages; do [ -n "$USES_PO" ] && rm -r ../$lang || true done -if [ "$manual_release" = "etch" ] ; then +if [ "$manual_release" != "sarge" ] ; then PRESEED="../en/appendix/preseed.xml" if [ -f $PRESEED ] && [ -f preseed.pl ] ; then ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt fi -else - PRESEED="../en/appendix/example-preseed-sarge.xml" - if [ -f $PRESEED ] && [ -f preseed.awk ] ; then - gawk -f preseed.awk $LCKEEP $PRESEED >$destination/example-preseed.txt - fi fi clear_po diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index b0202c3d1..915e362e5 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -121,6 +121,11 @@ <!ENTITY module-base-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/base-installer.xml"> <!ENTITY module-kernel-chooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/kernel-chooser.xml"> <!ENTITY module-os-prober.xml SYSTEM "##SRCPATH##/using-d-i/modules/os-prober.xml"> + <!ENTITY module-tzsetup.xml SYSTEM "##SRCPATH##/using-d-i/modules/tzsetup.xml"> + <!ENTITY module-clock-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/clock-setup.xml"> + <!ENTITY module-user-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/user-setup.xml"> + <!ENTITY module-apt-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/apt-setup.xml"> + <!ENTITY module-pkgsel.xml SYSTEM "##SRCPATH##/using-d-i/modules/pkgsel.xml"> <!ENTITY module-mips-arcboot-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/mips/arcboot-installer.xml"> <!ENTITY module-mipsel-colo-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/colo-installer.xml"> @@ -193,8 +198,6 @@ <!ENTITY installation-howto.xml SYSTEM "##SRCPATH##/howto/installation-howto.xml"> <!ENTITY preseed.xml SYSTEM "##SRCPATH##/appendix/preseed.xml"> <!ENTITY random-bits.xml SYSTEM "##SRCPATH##/appendix/random-bits.xml"> - <!ENTITY example-preseed.xml SYSTEM "##SRCPATH##/appendix/example-preseed.xml"> - <!ENTITY example-preseed-sarge.xml SYSTEM "##SRCPATH##/appendix/example-preseed-sarge.xml"> <!ENTITY files.xml SYSTEM "##SRCPATH##/appendix/files.xml"> <!ENTITY chroot-install.xml SYSTEM "##SRCPATH##/appendix/chroot-install.xml"> <!ENTITY plip.xml SYSTEM "##SRCPATH##/appendix/plip.xml"> diff --git a/debian/changelog b/debian/changelog index b65ef3c8c..3258cba2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,18 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low - * + [ Joey Hess ] + * Update preseeding docs for base-config removal. + * Add documentation of how to change apt-setup security source with + preseeding. + * Remove the sarge preseeding docs. + * Remove mentions of base-config and move base-config stuff to elsewhere. + * Add documentation of apt-setup, user-setup, clock-setup, tzsetup, and + pkgsel. + * Change some references to tty3 (messages) to instead refer to tty4 + (syslog). + * Change references to /var/log/debian-installer to just /var/log/installer. + * Remove docs for baseconfig-udeb; going away with base-config. + * Removed various bits of sarge cruft when it made things easier. -- Frans Pop <fjp@debian.org> Mon, 2 Jan 2006 23:06:51 +0100 diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index 31c70a65c..9cea04700 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -338,20 +338,6 @@ interface name (eth0, eth1, etc.) that you expect. </sect3> <sect3> - <title>Configure Timezone, Users, and APT</title> -<para> - -Set your timezone, add a normal user, and choose your <command>apt</command> -sources by running - -<informalexample><screen> -# /usr/sbin/base-config new -</screen></informalexample> - -</para> - </sect3> - - <sect3> <title>Configure Locales</title> <para> @@ -363,7 +349,8 @@ English, install the locales support package and configure it: # dpkg-reconfigure locales </screen></informalexample> -NOTE: Apt must be configured before, ie. during the base-config phase. +NOTE: Apt must be configured beforehand by creating a sources.list and +running apt-get update. Before using locales with character sets other than ASCII or latin1, please consult the appropriate localization HOWTO. diff --git a/en/appendix/example-preseed-sarge.xml b/en/appendix/example-preseed-sarge.xml deleted file mode 100644 index 76a8bb709..000000000 --- a/en/appendix/example-preseed-sarge.xml +++ /dev/null @@ -1,366 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - -<informalexample condition="sarge"><screen> -#### Startup. - -# To use a preseed file, you'll first need to boot the installer, -# and tell it what preseed file to use. This is done by passing the -# kernel a boot parameter, either manually at boot or by editing the -# syslinux.cfg (or similar) file and adding the parameter to the end -# of the append line(s) for the kernel. -# -# If you're netbooting, use this: -# preseed/url=http://host/path/to/preseed -# If you're remastering a CD, you could use this: -# preseed/file=/cdrom/preseed -# If you're installing from USB media, use this, and put the preseed file -# in the toplevel directory of the USB stick. -# preseed/file=/hd-media/preseed -# Be sure to copy this file to the location you specify. -# -# Some parts of the installation process cannot be automated using -# some forms of preseeding, because the questions are asked before -# the preseed file is loaded. For example, if the preseed file is -# downloaded over the network, the network setup must be done first. -# One reason to use initrd preseeding is that it allows preseeding -# of even these early steps of the installation process. -# -# If a preseed file cannot be used to preseed some steps, the install can -# still be fully automated, since you can pass preseed values to the kernel -# on the command line. Just pass path/to/var=value for any of the preseed -# variables listed below. -# -# While you're at it, you may want to throw a debconf/priority=critical in -# there, to avoid most questions even if the preseeding below misses some. -# And you might set the timeout to 1 in syslinux.cfg to avoid needing to hit -# enter to boot the installer. -# -# Note that the kernel accepts a maximum of 8 command line options and -# 8 environment options (including any options added by default for the -# installer). If these numbers are exceeded, 2.4 kernels will drop any -# excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer, -# you can use 32 command line options and 32 environment options. -# -# Some of the default options, like 'vga=normal' may be safely removed -# for most installations, which may allow you to add more options for -# preseeding. - -# It is not possible to use preseeding to set language, country, and -# keyboard. Instead you should use kernel parameters. Example: -# languagechooser/language-name=English -# countrychooser/shortlist=US -# console-keymaps-at/keymap=us - -#### Network configuration. - -# Of course, this won't work if you're loading your preseed file from the -# network! But it's great if you're booting from CD or USB stick. You can -# also pass network config parameters in on the kernel params if you are -# loading preseed files from the network. - -# netcfg will choose an interface that has link if possible. This makes it -# skip displaying a list if there is more than one interface. -d-i netcfg/choose_interface select auto - -# If you have a slow dhcp server and the installer times out waiting for -# it, this might be useful. -#d-i netcfg/dhcp_timeout string 60 - -# If you prefer to configure the network manually, here's how: -#d-i netcfg/disable_dhcp boolean true -#d-i netcfg/get_nameservers string 192.168.1.1 -#d-i netcfg/get_ipaddress string 192.168.1.42 -#d-i netcfg/get_netmask string 255.255.255.0 -#d-i netcfg/get_gateway string 192.168.1.1 -#d-i netcfg/confirm_static boolean true - -# Note that any hostname and domain names assigned from dhcp take -# precedence over values set here. However, setting the values still -# prevents the questions from being shown even if values come from dhcp. -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain - -# Disable that annoying WEP key dialog. -d-i netcfg/wireless_wep string -# The wacky dhcp hostname that some ISPs use as a password of sorts. -#d-i netcfg/dhcp_hostname string radish - -#### Mirror settings. - -d-i mirror/country string enter information manually -d-i mirror/http/hostname string http.us.debian.org -d-i mirror/http/directory string /debian -d-i mirror/suite string testing -d-i mirror/http/proxy string - -#### Partitioning. - -# If the system has free space you can choose to only partition that space. -#d-i partman-auto/init_automatically_partition \ -# select Use the largest continuous free space - -# Alternatively, you can specify a disk to partition. The device name can -# be given in either devfs or traditional non-devfs format. -# For example, to use the first disk devfs knows of: -d-i partman-auto/disk string /dev/discs/disc0/disc - -# You can choose from any of the predefined partitioning recipes: -d-i partman-auto/choose_recipe select \ - All files in one partition (recommended for new users) -#d-i partman-auto/choose_recipe select Desktop machine -#d-i partman-auto/choose_recipe select Multi-user workstation - -# Or provide a recipe of your own... -# The recipe format is documented in the file devel/partman-auto-recipe.txt. -# If you have a way to get a recipe file into the d-i environment, you can -# just point at it. -#d-i partman-auto/expert_recipe_file string /hd-media/recipe - -# If not, you can put an entire recipe in one line. This example creates -# a small /boot partition, suitable swap, and uses the rest of the space -# for the root partition: -#d-i partman-auto/expert_recipe string boot-root :: \ -# 20 50 100 ext3 $primary{ } $bootable{ } method{ format } format{ } \ -# use_filesystem{ } filesystem{ ext3 } mountpoint{ /boot } . \ -# 500 10000 1000000000 ext3 method{ format } format{ } \ -# use_filesystem{ } filesystem{ ext3 } mountpoint{ / } . \ -# 64 512 300% linux-swap method{ swap } format{ } . -# For reference, here is that same recipe in a more readable form: -# boot-root :: -# 40 50 100 ext3 -# $primary{ } $bootable{ } -# method{ format } format{ } -# use_filesystem{ } filesystem{ ext3 } -# mountpoint{ /boot } -# . -# 500 10000 1000000000 ext3 -# method{ format } format{ } -# use_filesystem{ } filesystem{ ext3 } -# mountpoint{ / } -# . -# 64 512 300% linux-swap -# method{ swap } format{ } -# . - -# This makes partman automatically partition without confirmation. -d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select \ - Finish partitioning and write changes to disk -d-i partman/confirm boolean true - -#### Boot loader installation. - -# Grub is the default boot loader (for x86). If you want lilo installed -# instead, uncomment this: -#d-i grub-installer/skip boolean true - -# This is fairly safe to set, it makes grub install automatically to the MBR -# if no other operating system is detected on the machine. -d-i grub-installer/only_debian boolean true - -# This one makes grub-installer install to the MBR if if finds some other OS -# too, which is less safe as it might not be able to boot that other OS. -d-i grub-installer/with_other_os boolean true - -# Alternatively, if you want to install to a location other than the mbr, -# uncomment and edit these lines: -#d-i grub-installer/bootdev string (hd0,0) -#d-i grub-installer/only_debian boolean false -#d-i grub-installer/with_other_os boolean false - -#### Finishing up the first stage install. - -# Avoid that last message about the install being complete. -d-i prebaseconfig/reboot_in_progress note - -#### Shell commands. - -# d-i preseeding is inherently not secure. Nothing in the installer checks -# for attempts at buffer overflows or other exploits of the values of a -# preseed file like this one. Only use preseed files from trusted -# locations! To drive that home, and because it's generally useful, here's -# a way to run any shell command you'd like inside the installer, -# automatically. - -# This first command is run as early as possible, just after -# preseeding is read. -#d-i preseed/early_command string anna-install some-udeb - -# This command is run just before the install finishes, but when there is -# still a usable /target directory. -#d-i preseed/late_command string echo foo > /target/etc/bar - -# This command is run just as base-config is starting up. -#base-config base-config/early_command string echo hi mom - -# This command is run after base-config is done, just before the login: -# prompt. This is a good way to install a set of packages you want, or to -# tweak the configuration of the system. -#base-config base-config/late_command string \ -# apt-get install zsh; chsh -s /bin/zsh - -###### Preseeding the 2nd stage of the installation. - -#### Preseeding base-config. - -# Avoid the introductory message. -base-config base-config/intro note - -# Avoid the final message. -base-config base-config/login note - -# If you installed a display manager, but don't want to start it immediately -# after base-config finishes. -#base-config base-config/start-display-manager boolean false - -# Some versions of the installer can report back on what you've installed. -# The default is not to report back, but sending reports helps the project -# determine what software is most popular and include it on CDs. -#popularity-contest popularity-contest/participate boolean false - -#### Clock and time zone setup. - -# Controls whether or not the hardware clock is set to UTC. -#base-config tzconfig/gmt boolean true -# If you told the installer that you're in the United States, then you -# can set the time zone using this variable. -# (Choices are: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, -# Aleutian, Arizona East-Indiana, Indiana-Starke, Michigan, Samoa, other) -#base-config tzconfig/choose_country_zone/US select Eastern -# If you told it you're in Canada. -# (Choices are: Newfoundland, Atlantic, Eastern, Central, -# East-Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon, other) -#base-config tzconfig/choose_country_zone/CA select Eastern -# If you told it you're in Brazil. (Choices are: East, West, Acre, -# DeNoronha, other) -#base-config tzconfig/choose_country_zone/BR select East -# Many countries have only one time zone. If you told the installer you're -# in one of those countries, you can choose its standard time zone via this -# question. -#base-config tzconfig/choose_country_zone_single boolean true -# This question is asked as a fallback for countries other than those -# listed above, which have more than one time zone. You can preseed one of -# the time zones, or "other". -#base-config tzconfig/choose_country_zone_multiple select - -#### Account setup. - -# To preseed the root password, you have to put it in the clear in this -# file. That is not a very good idea, use caution! -#passwd passwd/root-password password r00tme -#passwd passwd/root-password-again password r00tme - -# If you want to skip creation of a normal user account. -#passwd passwd/make-user boolean false - -# Alternatively, you can preseed the user's name and login. -#passwd passwd/user-fullname string Debian User -#passwd passwd/username string debian -# And their password, but use caution! -#passwd passwd/user-password password insecure -#passwd passwd/user-password-again password insecure - -#### Apt setup. - -# This question controls what source the second stage installation uses -# for packages. Choices are cdrom, http, ftp, filesystem, edit sources list -# by hand -base-config apt-setup/uri_type select http - -# If you choose ftp or http, you'll be asked for a country and a mirror. -base-config apt-setup/country select enter information manually -base-config apt-setup/hostname string http.us.debian.org -base-config apt-setup/directory string /debian -# Stop after choosing one mirror. -base-config apt-setup/another boolean false - -# You can choose to install non-free and contrib software. -#base-config apt-setup/non-free boolean true -#base-config apt-setup/contrib boolean true - -# Do enable security updates. -base-config apt-setup/security-updates boolean true - -#### Package selection. - -# You can choose to install any combination of tasks that are available. -# Available tasks as of this writing include: Desktop environment, -# Web server, Print server, DNS server, File server, Mail server, -# SQL database, Laptop, Standard system, manual package selection. The -# last of those will run aptitude. You can also choose to install no -# tasks, and force the installation of a set of packages in some other -# way. We recommend always including the Standard system task. -tasksel tasksel/first multiselect Desktop environment, Standard system -#tasksel tasksel/first multiselect Web server, Standard system - -#### Mailer configuration. - -# During a normal install, exim asks only a few questions. Here's how to -# avoid even those. More complicated preseeding is possible. -exim4-config exim4/dc_eximconfig_configtype \ - select no configuration at this time -exim4-config exim4/no_config boolean true -exim4-config exim4/no_config boolean true - -# It's a good idea to set this to whatever user account you choose to -# create. Leaving the value blank results in postmaster mail going to -# /var/mail/mail. -exim4-config exim4/dc_postmaster string - -#### X Configuration. - -# Preseeding Debian's X config is possible, but you probably need to know -# some details about the video hardware of the machine, since Debian's X -# configurator does not do fully automatic configuration of everything. - -# X can detect the right driver for some cards, but if you're preseeding, -# you override whatever it chooses. Still, vesa will work most places. -#xserver-xfree86 xserver-xfree86/config/device/driver select vesa - -# A caveat with mouse autodetection is that if it fails, X will retry it -# over and over. So if it's preseeded to be done, there is a possibility of -# an infinite loop if the mouse is not autodetected. -#xserver-xfree86 xserver-xfree86/autodetect_mouse boolean true - -# Monitor autodetection is recommended. -xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true -# Uncomment if you have an LCD display. -#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true -# X has three configuration paths for the monitor. Here's how to preseed -# the "medium" path, which is always available. The "simple" path may not -# be available, and the "advanced" path asks too many questions. -xserver-xfree86 xserver-xfree86/config/monitor/selection-method \ - select medium -xserver-xfree86 xserver-xfree86/config/monitor/mode-list \ - select 1024x768 @ 60 Hz - -#### Everything else. - -# Depending on what software you choose to install, or if things go wrong -# during the installation process, it's possible that other questions may -# be asked. You can preseed those too, of course. To get a list of every -# possible question that could be asked during an install, do an -# installation, and then run these commands: -# debconf-get-selections --installer > file -# debconf-get-selections >> file - -# If you like, you can include other preseed files into this one. -# Any settings in those files will override pre-existing settings from this -# file. More that one file can be listed, separated by spaces; all will be -# loaded. The included files can have preseed/include directives of their -# own as well. Note that if the filenames are relative, they are taken from -# the same directory as the preseed file that includes them. -#d-i preseed/include string x.cfg - -# More flexibly, this runs a shell command and if it outputs the names of -# preseed files, includes those files. For example, to switch configs based -# on a particular usb storage device (in this case, a built-in card reader): -#d-i preseed/include_command string \ -# if $(grep -q "GUID: 0aec3050aec305000001a003" /proc/scsi/usb-storage-*/*); \ -# then echo kraken.cfg; else echo otherusb.cfg; fi - -# To check the format of your preseed file before performing an install, -# you can use debconf-set-selections: -# debconf-set-selections -c preseed.cfg -</screen></informalexample> diff --git a/en/appendix/example-preseed.xml b/en/appendix/example-preseed.xml deleted file mode 100644 index 8fc4f722c..000000000 --- a/en/appendix/example-preseed.xml +++ /dev/null @@ -1,34 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - -<sect1 id="example-preseed" condition="sarge"> -<title>Preconfiguration File Example</title> - -<para> - -This is a complete working example of a preconfiguration file for an automated -install. Its use is explained in <xref linkend="automatic-install"/>. You -may want to uncomment some of the lines before using the file. - -</para> - -<note><para> - -In order to be able to properly present this example in the manual, we've had -to split some lines. This is indicated by the use of the line-continuation-character -<quote>\</quote> and extra indentation in the next line. In a real preconfiguration -file, these split lines have to be joined into <emphasis>one single line</emphasis>. -If you do not, preconfiguration will fail with unpredictable results. - -</para><para> - -A <quote>clean</quote> example file is available from &urlset-example-preseed;. - -</para></note> - -<para> - -&example-preseed-sarge.xml; - -</para> -</sect1> diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 971a5a3a6..496db7e83 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -31,16 +31,11 @@ example preseed file from &urlset-example-preseed;. <title>Introduction</title> <para> -Preseeding provides a way to set answers to questions without having to manually -enter the answers while the installation is running. This makes it possible to -fully automate most types of installation and even offers some features not -available during normal installations. - -</para><para> - -Using preseeding it is possible to fill in answers to questions asked during -both the first stage of the installation (before the reboot into the new -system) and the second stage. +Preseeding provides a way to set answers to questions asked during the +installation process, without having to manually enter the answers while +the installation is running. This makes it possible to fully automate most +types of installation and even offers some features not available during +normal installations. </para> @@ -225,16 +220,8 @@ See <xref linkend="preseed-shell"/> for details. </para></listitem> <listitem><para> <userinput>preseed/late_command</userinput>: is run just before the reboot - at the end of the first stage of the installation, but before the - <filename>/target</filename> filesystem has been unmounted -</para></listitem> -<listitem><para> - <userinput>base-config/early_command</userinput>: is run early in the second - stage of the installation when <command>base-config</command> is starting up -</para></listitem> -<listitem><para> - <userinput>base-config/late_command</userinput>: is run at the end of - <command>base-config</command>, just before the login prompt + at the end of the install, but before the <filename>/target</filename> + filesystem has been unmounted </para></listitem> </itemizedlist> @@ -423,8 +410,8 @@ install, you can use the command <command>debconf-set-selections -c </para> </sect1> - <sect1 id="preseed-stage1"> - <title>Preseeding the first stage of the installation</title> + <sect1 id="preseed-contents"> + <title>Contents of the preseed file</title> <para> The configuration fragments used in this appendix are also available as an @@ -670,7 +657,7 @@ d-i time/zone string US/Eastern Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration options is fully automated based on your installation method and answers to -earlier questions. Only the two variables below are relevant for preseeding. +earlier questions. Only the three variables below are relevant for preseeding. </para> @@ -678,6 +665,9 @@ earlier questions. Only the two variables below are relevant for preseeding. # You can choose to install non-free and contrib software. #d-i apt-setup/non-free boolean true #d-i apt-setup/contrib boolean true +# To avoid adding security sources, or to use a different server +# than security.debian.org. +#d-i apt-setup/security_host string </screen></informalexample> </sect2> @@ -767,47 +757,7 @@ d-i grub-installer/with_other_os boolean true </sect2> - <sect2 id="preseed-finish"> - <title>Finishing up the first stage install</title> - -<informalexample role="example"><screen> -# Avoid that last message about the install being complete. -d-i prebaseconfig/reboot_in_progress note - -# This will prevent the installer from ejecting the CD during the reboot, -# which is useful in some situations. -#d-i cdrom-detect/eject boolean false -</screen></informalexample> - - </sect2> - </sect1> - - <sect1 id="preseed-stage2"> - <title>Preseeding the second stage of the installation</title> - - <sect2 id="preseed-baseconfig"> - <title>Base config</title> - -<informalexample role="example"><screen> -# Avoid the introductory message. -base-config base-config/intro note - -# Avoid the final message. -base-config base-config/login note - -# If you installed a display manager, but don't want to start it immediately -# after base-config finishes. -#base-config base-config/start-display-manager boolean false - -# Some versions of the installer can report back on what you've installed. -# The default is not to report back, but sending reports helps the project -# determine what software is most popular and include it on CDs. -#popularity-contest popularity-contest/participate boolean false -</screen></informalexample> - - </sect2> - - <sect2 id="preseed-tasksel"> + <sect2 id="preseed-pkgsel"> <title>Package selection</title> <para> @@ -844,22 +794,39 @@ Available tasks as of this writing include: <listitem><para> <userinput>Laptop</userinput> </para></listitem> -<listitem><para> - <userinput>manual package selection</userinput> -</para></listitem> </itemizedlist> <para> -The last of these will run aptitude. You can also choose to install no tasks, -and force the installation of a set of packages in some other way. We recommend -always including the <userinput>Standard system</userinput> task. +You can also choose to install no tasks, and force the installation of a +set of packages in some other way. We recommend always including the +<userinput>Standard system</userinput> task. </para> <informalexample role="example"><screen> tasksel tasksel/first multiselect Standard system, Desktop environment #tasksel tasksel/first multiselect Standard system, Web server + +# Some versions of the installer can report back on what software you have +# installed, and what software you ue. The default is not to report back, +# but sending reports helps the project determine what software is most +# popular and include it on CDs. +#popularity-contest popularity-contest/participate boolean false +</screen></informalexample> + + </sect2> + + <sect2 id="preseed-finish"> + <title>Finishing up the first stage install</title> + +<informalexample role="example"><screen> +# Avoid that last message about the install being complete. +d-i prebaseconfig/reboot_in_progress note + +# This will prevent the installer from ejecting the CD during the reboot, +# which is useful in some situations. +#d-i cdrom-detect/eject boolean false </screen></informalexample> </sect2> @@ -953,17 +920,10 @@ xserver-xfree86 xserver-xfree86/config/monitor/mode-list \ #d-i preseed/early_command string anna-install some-udeb # This command is run just before the install finishes, but when there is -# still a usable /target directory. -#d-i preseed/late_command string echo foo > /target/etc/bar - -# This command is run just as base-config is starting up. -#base-config base-config/early_command string echo hi mom - -# This command is run after base-config is done, just before the login: -# prompt. This is a good way to install a set of packages you want, or to -# tweak the configuration of the system. -#base-config base-config/late_command \ -# string apt-get install zsh; chsh -s /bin/zsh +# still a usable /target directory. You can chroot to /target and use it +# directly, or use the apt-install and in-target commands to easily install +# packages and run commands in the target system. +#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh </screen></informalexample> </sect2> diff --git a/en/appendix/random-bits.xml b/en/appendix/random-bits.xml index a67594eb4..a3e3be487 100644 --- a/en/appendix/random-bits.xml +++ b/en/appendix/random-bits.xml @@ -3,7 +3,6 @@ <appendix id="random-bits"><title>Random Bits</title> -&example-preseed.xml; &files.xml; &chroot-install.xml; &plip.xml; diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml index f045e1f3c..c9b30b719 100644 --- a/en/boot-new/boot-new.xml +++ b/en/boot-new/boot-new.xml @@ -189,47 +189,14 @@ for more information. </sect2> </sect1> - <sect1 id="base-config"> - <title>Debian Post-Boot (Base) Configuration</title> - -<para> - -After booting, you will be prompted to complete the configuration of -your basic system, and then to select what additional packages you -wish to install. The application which guides you through this -process is called <classname>base-config</classname>. Its concept is -very similar to the &d-i; from the first stage. Indeed, -<classname>base-config</classname> consists of a number of specialized -components, where each component handles one configuration task, -contains <quote>hidden menu in the background</quote> and also uses -the same navigation system. - -</para><para> - -If you wish to re-run the <classname>base-config</classname> at any -point after installation is complete, as root run -<userinput>base-config</userinput>. - -</para> - -&module-bc-timezone.xml; -&module-bc-shadow.xml; -&module-bc-ppp.xml; -&module-bc-apt.xml; -&module-bc-packages.xml; -&module-bc-install.xml; -&module-bc-mta.xml; - - </sect1> - <sect1 id="login"> <title>Log In</title> <para> -After you've installed packages, you'll be presented with the login +Once your system boots, you'll be presented with the login prompt. Log in using the personal login and password you -selected. Your system is now ready to use. +selected during the installation process. Your system is now ready to use. </para><para> diff --git a/en/boot-new/modules/apt.xml b/en/boot-new/modules/apt.xml deleted file mode 100644 index 5419d284b..000000000 --- a/en/boot-new/modules/apt.xml +++ /dev/null @@ -1,114 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="configure-apt"> - <title>Configuring APT</title> - -<para> - -The main means that people use to install packages on their system is -via a program called <command>apt-get</command>, from the -<classname>apt</classname> package.<footnote> - -<para> - -Note that the actual program that installs packages is called -<command>dpkg</command>. However, this package is more of a low-level -tool. <command>apt-get</command> is a higher-level tool as it will -invoke <command>dpkg</command> as appropriate and also because it knows -to install other packages which are required for the package you're -trying to install, as well as how to retrieve the package from your -CD, the network, or wherever. - -</para> -</footnote> -Other front-ends for package management, like <command>aptitude</command>, -<command>synaptic</command> and the older <command>dselect</command> also -use and depend on <command>apt-get</command>. These front-ends are recommended -for new users, since they integrate some additional features (package -searching and status checks) in a nice user interface. - -</para><para> - -APT must be configured so that it knows where to retrieve packages from. -The helper application which assists in this task is called -<command>apt-setup</command>. - -</para><para> - -The next step in your configuration process is to tell APT where other -Debian packages can be found. Note that you can re-run this tool at -any point after installation by running <command>apt-setup</command>, -or by manually editing <filename>/etc/apt/sources.list</filename>. - -</para><para> - -If an official CD-ROM is in the drive at this point, then that CD-ROM -should automatically be configured as an apt source without prompting. -You will notice this because you will see the CD-ROM being scanned. - -</para><para> - -For users without an official CD-ROM, you will be offered an array of -choices for how Debian packages are accessed: FTP, HTTP, CD-ROM, or -a local file system. - -</para><para> - -You should know that it's perfectly acceptable to have a number of -different APT sources, even for the same Debian archive. -<command>apt-get</command> will automatically pick the package with -the highest version number given all the available versions. Or, for -instance, if you have both an HTTP and a CD-ROM APT source, -<command>apt-get</command> should automatically use the local CD-ROM -when possible, and only resort to HTTP if a newer version is available -there. However, it is not a good idea to add unnecessary APT sources, -since this will tend to slow down the process of checking the network -archives for new versions. - -</para> - - <sect3 id="configure-apt-net"> - <title>Configuring Network Package Sources</title> - -<para> - -If you plan on installing the rest of your system via the network, the -most common option is to select the <userinput>http</userinput> -source. The <userinput>ftp</userinput> source is also acceptable, but -tends to be somewhat slower making connections. - -</para><para> - -The next step during the configuration of network package sources is -to tell <command>apt-setup</command> which country you live in. This -configures which of the official Debian Internet mirrors you will -connect to. Depending on which country you select, you will be presented -with a list of possible servers. It's generally fine to pick the one at -the top of the list, but any of them should work. Note however that the -mirror list provided by the installation was generated when this version -of Debian was released and some mirrors may no longer be available. - -</para><para> - -After you have selected a mirror, you will be asked if a proxy server -should be used. A proxy server is a server that will forward all your -HTTP and/or FTP requests to the Internet and is most often used to regulate -and optimize access to the Internet on corporate networks. In some networks -only the proxy server is allowed access to the Internet, in which case you -will have to enter the name of the proxy server. You may also have to -include an user name and password. Most home users will not need to specify -a proxy server, although some ISPs may provide proxy servers for their -users. - -</para><para> - -After you select a mirror, your new network package source will be tested. -If all goes well, you will be prompted whether you want to add another -package source. If you have any problems using the package source you selected, -try using a different mirror (either from your country list or from the -global list), or try using a different network package source. - -</para> - </sect3> - </sect2> diff --git a/en/boot-new/modules/install.xml b/en/boot-new/modules/install.xml deleted file mode 100644 index 30f9a81d0..000000000 --- a/en/boot-new/modules/install.xml +++ /dev/null @@ -1,39 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="debconf"> - <title>Prompts During Software Installation</title> - -<para> - -Each package you selected with <command>tasksel</command> or -<command>aptitude</command> is -downloaded, unpacked and then installed in turn by the -<command>apt-get</command> and <command>dpkg</command> programs. If -a particular program needs more information from the user, it will -prompt you during this process. You might also want to keep an eye on -the output during the process, to watch for any installation errors -(although you will be asked to acknowledge errors which prevented -a package's installation). - -</para> - - <sect3 arch="powerpc" id="xserver"> - <title>Settings for the X Server</title> - -<para> - -On iMacs, and some older Macintoshes as well, the X Server software -doesn't calculate appropriate video settings. You will need to choose -the <guimenuitem>Advanced</guimenuitem> option during configuration of the -video settings. For the monitor's horizontal sync range, enter 59–63. -You can leave the default for vertical refresh range. - -</para><para> - -The mouse device should be set to -<userinput>/dev/input/mice</userinput>. - -</para> - </sect3> - </sect2> diff --git a/en/boot-new/modules/mta.xml b/en/boot-new/modules/mta.xml deleted file mode 100644 index 8c9ba2f28..000000000 --- a/en/boot-new/modules/mta.xml +++ /dev/null @@ -1,93 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="base-config-mta"> - <title>Configuring Your Mail Transport Agent</title> - -<para> - -Today, email is a very important part of many people's life, so it's -no surprise Debian lets you configure your mail system right as a part -of the installation process. The standard mail transport agent in -Debian is <command>exim4</command>, which is relatively small, -flexible, and easy to learn. - -</para><para> - -You may ask if this is needed even if your computer is not connected -to any network. The short answer is: Yes. The longer explanation: Some -system utilities (like <command>cron</command>, -<command>quota</command>, <command>aide</command>, …) may send -you important notices via email. - -</para><para> - -So on the first screen you will be presented with several common mail -scenarios. Choose the one that most closely resembles your needs: - -</para> - -<variablelist> -<varlistentry> -<term>internet site</term> -<listitem><para> - -Your system is connected to a network and your mail is sent and -received directly using SMTP. On the following screens you will be -asked a few basic questions, like your machine's mail name, or a list of -domains for which you accept or relay mail. - -</para></listitem> -</varlistentry> - -<varlistentry> -<term>mail sent by smarthost</term> -<listitem><para> - -In this scenario is your outgoing mail forwarded to another machine, -called a <quote>smarthost</quote>, which does the actual job for -you. Smarthost also usually stores incoming mail addressed to your -computer, so you don't need to be permanently online. That also means -you have to download your mail from the smarthost via programs like -fetchmail. This option is suitable for dial-up users. - -</para></listitem> -</varlistentry> - -<varlistentry> -<term>local delivery only</term> -<listitem><para> - -Your system is not on a network and mail is sent or received only -between local users. Even if you don't plan to send any messages, this -option is highly recommended, because some system utilities may send -you various alerts from time to time (e.g. beloved <quote>Disk quota -exceeded</quote>). This option is also convenient for new users, -because it doesn't ask any further questions. - -</para></listitem> -</varlistentry> - -<varlistentry> -<term>no configuration at this time</term> -<listitem><para> - -Choose this if you are absolutely convinced you know what you are -doing. This will leave you with an unconfigured mail system — -until you configure it, you won't be able to send or receive any mail -and you may miss some important messages from your system utilities. - -</para></listitem> -</varlistentry> -</variablelist> - -<para> - -If none of these scenarios suits your needs, or if you need a finer -setup, you will need to edit configuration files under the -<filename>/etc/exim4</filename> directory after the installation is -complete. More information about <command>exim4</command> may be found -under <filename>/usr/share/doc/exim4</filename>. - -</para> - </sect2> diff --git a/en/boot-new/modules/packages.xml b/en/boot-new/modules/packages.xml deleted file mode 100644 index b1a4ce454..000000000 --- a/en/boot-new/modules/packages.xml +++ /dev/null @@ -1,162 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="install-packages"> - <title>Package Installation</title> - -<para> - -Next you will be offered a number of pre-rolled software -configurations offered by Debian. You could always choose, package by -package, what you want to install on your new machine. This is the -purpose of the <command>aptitude</command> program, described below. -But this can be a long task with around &num-of-distrib-pkgs; packages -available in Debian! - -</para><para> - -So, you have the ability to choose <emphasis>tasks</emphasis> first, -and then add on more individual packages later. These tasks loosely -represent a number of different jobs or things you want to do with -your computer, such as <quote>desktop environment</quote>, -<quote>web server</quote>, or <quote>print server</quote><footnote> - -<para> - -You should know that to present this list, -<command>base-config</command> is merely invoking the -<command>tasksel</command> program. For manual package -selection, the -<command>aptitude</command> program is being run. Any of these can be -run at any time after installation to install (or remove) more -packages. If you are looking for a specific single package, after -installation is complete, simply run <userinput>aptitude install -<replaceable>package</replaceable></userinput>, where -<replaceable>package</replaceable> is the name of the package you are -looking for. - -</para> - -</footnote>. <xref linkend="tasksel-size-list"/> lists the space -requirements for the available tasks. - -</para><para> - -Once you've selected your tasks, select -<guibutton>Ok</guibutton>. At this point, -<command>aptitude</command> will install the packages you've -selected. - -<note><para> - -Even if you did not select any tasks at all, any standard, -important, or required priority packages that are not yet present on -your system will be installed. This functionality is the same as -running <userinput>tasksel -ris</userinput> at the command line, and -currently involves -a download of about 37M of archives. You will be shown the number of -packages to be installed, and how many kilobytes of packages, if any, -need to be downloaded. - -</para></note> - -</para><para> - -If you do want to choose what to install on a package by package basis, -select the <quote>manual package selection</quote> option in -<command>tasksel</command>. If you select one or more tasks alongside -this option, <command>aptitude</command> will be called with the -<command>--visual-preview</command> option. This means you will be able to review<footnote> - -<para> - -You can also change the default selections. If you would like to select any -additional package, use <menuchoice> <guimenu>View</guimenu> -<guimenuitem>New Package View</guimenuitem> </menuchoice>. - -</para> - -</footnote> the packages that are to be installed. If you do not select any -tasks, the normal <command>aptitude</command> screen will be displayed. After -making your selections you should press <quote><userinput>g</userinput></quote> -to start the download and installation of packages. - -<note><para> - -If you choose <quote>manual package selection</quote> -<emphasis>without</emphasis> selecting any tasks, no packages will be installed -by default. This means you can use this option if you want to install a minimal -system, but also that the responsibility for selecting any packages not -installed as part of the base system (before the reboot) that might be required -for your system lies with you. - -</para></note> - -</para><para> - -Of the &num-of-distrib-pkgs; packages available in Debian, only -a small minority are covered by tasks offered in the Task Installer. -To see information on more packages, either use <userinput>apt-cache -search <replaceable>search-string</replaceable></userinput> for some -given search string (see the <citerefentry> -<refentrytitle>apt-cache</refentrytitle> <manvolnum>8</manvolnum> -</citerefentry> man page), or run -<command>aptitude</command> as described below. - -</para> - - <sect3 id="aptitude"> - <title>Advanced Package Selection with <command>aptitude</command></title> - -<para> - -<command>Aptitude</command> is a modern program for managing -packages. <command>aptitude</command> allows you to -select individual packages, set of packages matching given criteria -(for advanced users), or whole tasks. - -</para><para> - -The most basic keybindings are: - -<informaltable> -<tgroup cols="2"> -<thead> -<row> - <entry>Key</entry><entry>Action</entry> -</row> -</thead> - -<tbody> -<row> - <entry><keycap>Up</keycap>, <keycap>Down</keycap></entry> - <entry>Move selection up or down.</entry> -</row><row> - <entry>&enterkey;</entry> - <entry>Open/collapse/activate item.</entry> -</row><row> - <entry><keycap>+</keycap></entry> - <entry>Mark package for installation.</entry> -</row><row> - <entry><keycap>-</keycap></entry> - <entry>Mark package for removal.</entry> -</row><row> - <entry><keycap>d</keycap></entry> - <entry>Show package dependencies.</entry> -</row><row> - <entry><keycap>g</keycap></entry> - <entry>Actually download/install/remove packages.</entry> -</row><row> - <entry><keycap>q</keycap></entry> - <entry>Quit current view.</entry> -</row><row> - <entry><keycap>F10</keycap></entry> - <entry>Activate menu.</entry> -</row> -</tbody></tgroup></informaltable> - -For more commands see the online help under the <keycap>?</keycap> key. - -</para> - </sect3> - </sect2> diff --git a/en/boot-new/modules/ppp.xml b/en/boot-new/modules/ppp.xml deleted file mode 100644 index bd805fa28..000000000 --- a/en/boot-new/modules/ppp.xml +++ /dev/null @@ -1,142 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 arch="not-s390" id="PPP"> - <title>Setting Up PPP</title> - -<para> - -If no network was configured during the first stage of the installation, -you will next be asked whether you wish to install the rest of the system -using PPP. PPP is a protocol used to establish dialup connections with modems. -If you configure the modem at this point, the installation system will be able -to download additional packages or security updates from the Internet during -the next steps of the installation. -If you don't have a modem in your computer or if you prefer to configure -your modem after the installation, you can skip this step. - -</para><para> - -In order to configure your PPP connection, you will need some information -from your Internet Service Provider (ISP), including phone number, username, -password and DNS servers (optional). Some ISPs provide installation guidelines -for Linux distributions. You can use that information even if they don't -specifically target Debian since most of the configuration parameters -(and software) is similar amongst Linux distributions. - -</para><para> - -If you do choose to configure PPP at this point, a program named -<command>pppconfig</command> will be run. This program helps you -configure your PPP connection. <emphasis>Make sure, when it asks you -for the name of your dialup connection, that you name it -<userinput>provider</userinput>.</emphasis> - -</para><para> - -Hopefully, the <command>pppconfig</command> program will walk you -through a trouble-free PPP connection setup. However, if it does not -work for you, see below for detailed instructions. - -</para><para> - -In order to setup PPP, you'll need to know the basics of file viewing -and editing in GNU/Linux. To view files, you should use -<command>more</command>, and <command>zmore</command> for compressed -files with a <userinput>.gz</userinput> extension. For example, to -view <filename>README.debian.gz</filename>, type <userinput>zmore -README.debian.gz</userinput>. The base system comes with an editor -named <command>nano</command>, which is very simple to use, but does -not have a lot of features. You will probably want to install more -full-featured editors and viewers later, such as -<command>jed</command>, <command>nvi</command>, -<command>less</command>, and <command>emacs</command>. - -</para><para> - -Edit <filename>/etc/ppp/peers/provider</filename> and replace -<userinput>/dev/modem</userinput> with -<userinput>/dev/ttyS<replaceable>#</replaceable></userinput> where -<replaceable>#</replaceable> stands for the number of your serial -port. In Linux, serial ports are counted from 0; your first serial -port <phrase arch="i386">(i.e., <userinput>COM1</userinput>)</phrase> -is <filename>/dev/ttyS0</filename> under Linux. - -<phrase arch="powerpc;m68k">On Macintoshes with serial ports, the -modem port is <filename>/dev/ttyS0</filename> and the printer port is -<filename>/dev/ttyS1</filename>.</phrase> - -The next step is to edit -<filename>/etc/chatscripts/provider</filename> and insert your -provider's phone number, your user-name and password. Please do not -delete the <quote>\q</quote> that precedes the password. It hides the -password from appearing in your log files. - -</para><para> - -Many providers use PAP or CHAP for login sequence instead of text mode -authentication. Others use both. If your provider requires PAP or -CHAP, you'll need to follow a different procedure. Comment out -everything below the dialing string (the one that starts with -<quote>ATDT</quote>) in -<filename>/etc/chatscripts/provider</filename>, modify -<filename>/etc/ppp/peers/provider</filename> as described above, and -add <userinput>user <replaceable>name</replaceable></userinput> where -<replaceable>name</replaceable> stands for your user-name for the -provider you are trying to connect to. Next, edit -<filename>/etc/ppp/pap-secrets</filename> or -<filename>/etc/ppp/chap-secrets</filename> and enter your password -there. - -</para><para> - -You will also need to edit <filename>/etc/resolv.conf</filename> and -add your provider's name server (DNS) IP addresses. The lines in -<filename>/etc/resolv.conf</filename> are in the following format: -<userinput>nameserver -<replaceable>xxx.xxx.xxx.xxx</replaceable></userinput> where the -<replaceable>x</replaceable>s stand for numbers in your IP -address. Optionally, you could add the -<userinput>usepeerdns</userinput> option to the -<filename>/etc/ppp/peers/provider</filename> file, which will enable -automatic choosing of appropriate DNS servers, using settings the -remote host usually provides. - -</para><para> - -Unless your provider has a login sequence different from the majority -of ISPs, you are done! Start the PPP connection by typing -<command>pon</command> as root, and monitor the process using -<command>plog</command> command. To disconnect, use -<command>poff</command>, again, as root. - -</para><para> - -Read <filename>/usr/share/doc/ppp/README.Debian.gz</filename> file for -more information on using PPP on Debian. - -</para><para> - -For static SLIP connections, you will need to add the -<userinput>slattach</userinput> command (from the -<classname>net-tools</classname> package) into -<filename>/etc/init.d/network</filename>. Dynamic SLIP will require -the <classname>gnudip</classname> package. - -</para> - - <sect3 id="PPPOE"> - <title>Setting Up PPP over Ethernet (PPPOE)</title> - -<para> - -PPPOE is a protocol related to PPP used for some broadband connections. -There is currently no support in base configuration to help you set -this up. However, the necessary software has been installed, which means -you can configure PPPOE manually at this stage of the installation by -switching to VT2 and running <command>pppoeconf</command>. - -</para> - - </sect3> - </sect2> diff --git a/en/boot-new/modules/shadow.xml b/en/boot-new/modules/shadow.xml deleted file mode 100644 index cfcc4daa1..000000000 --- a/en/boot-new/modules/shadow.xml +++ /dev/null @@ -1,69 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="base-config-users"> - <title>Setting Up Users And Passwords</title> - - <sect3 id="base-config-root"> - <title>Set the Root Password</title> - -<para> - -The <emphasis>root</emphasis> account is also called the -<emphasis>super-user</emphasis>; it is a login that bypasses all -security protection on your system. The root account should only be -used to perform system administration, and only used for as short -a time as possible. - -</para><para> - -Any password you create should contain at least 6 characters, and -should contain both upper- and lower-case characters, as well as -punctuation characters. Take extra care when setting your root -password, since it is such a powerful account. Avoid dictionary -words or use of any personal information which could be guessed. - -</para><para> - -If anyone ever tells you they need your root password, be extremely -wary. You should normally never give your root password out, unless you -are administering a machine with more than one system administrator. - -</para> - </sect3> - - <sect3 id="make-normal-user"> - <title>Create an Ordinary User</title> - -<para> - -The system will ask you whether you wish to create an ordinary user -account at this point. This account should be your main personal -log-in. You should <emphasis>not</emphasis> use the root account for -daily use or as your personal login. - -</para><para> - -Why not? Well, one reason to avoid using root's privileges is that it -is very easy to do irreparable damage as root. Another reason is that -you might be tricked into running a <emphasis>Trojan-horse</emphasis> -program — that is a program that takes advantage of your -super-user powers to compromise the security of your system behind -your back. Any good book on Unix system administration will cover this -topic in more detail — consider reading one if it is new to you. - -</para><para> - -You will first be prompted for the user's full name. Then you'll be asked -for a name for the user account; generally your first name or something -similar will suffice and indeed will be the default. Finally, you will be -prompted for a password for this account. - -</para><para> - -If at any point after installation you would like to create another -account, use the <command>adduser</command> command. - -</para> - </sect3> - </sect2> diff --git a/en/boot-new/modules/timezone.xml b/en/boot-new/modules/timezone.xml deleted file mode 100644 index 30d9dce0a..000000000 --- a/en/boot-new/modules/timezone.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!-- retain these comments for translator revision tracking --> -<!-- $Id$ --> - - <sect2 id="base-config-tz"> - <title>Configuring Your Time Zone</title> - -<para> - -After a welcome screen, you will be prompted to configure your time zone. -First select whether the hardware clock of your system is set to local -time or Greenwich Mean Time (GMT or UTC). The time displayed in the dialog -may help you decide on the correct option. -<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally -set to local time. If you want to dual-boot, select local time instead of -GMT.</phrase> -<phrase arch="i386">Systems that (also) run Dos or Windows are normally -set to local time. If you want to dual-boot, select local time instead of -GMT.</phrase> - -</para><para> - -Depending on the location selected at the beginning of the installation -process, you will next be shown either a single timezone or a list of -timezones relevant for that location. If a single timezone is shown, choose -<guibutton>Yes</guibutton> to confirm or choose <guibutton>No</guibutton> -to select from the full list of timezones. If a list is shown, select your -timezone from the list, or select Other for the full list. - -</para> - </sect2> diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index c2f48eaec..fa454bec8 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -337,11 +337,11 @@ The simplest way to do so is to install the reportbug package </para><para> -If you did not reach base-config or ran into other trouble, you -probably found a bug in debian-installer. To improve the installer it -is necessary that we know about them, so please take the time to -report them. You can use an installation report to report problems; -if the install completely fails, see <xref linkend="problem-report" />. +If you did not complete the install, you probably found a bug in +debian-installer. To improve the installer it is necessary that we know +about them, so please take the time to report them. You can use an +installation report to report problems; if the install completely fails, +see <xref linkend="problem-report" />. </para> </sect1> diff --git a/en/install-methods/automatic-install.xml b/en/install-methods/automatic-install.xml index f15c936b4..8cc630867 100644 --- a/en/install-methods/automatic-install.xml +++ b/en/install-methods/automatic-install.xml @@ -29,71 +29,6 @@ installation process. Full documentation on preseeding including a working example that you can edit is in <xref linkend="appendix-preseed"/>. -</para><para condition="sarge"> - -Although most dialogs used by &d-i; can be preseeded using this method, -there are some notable exceptions. You can (re)partition an entire disk -or use available free space on a disk; it is not possible to use existing -partitions. You currently cannot use preseeding to set up RAID and LVM. -Also, with the exception of network driver modules, it is not possible -to preconfigure kernel module parameters. - -</para><para condition="sarge"> - -The preconfiguration file is in the format used by the -debconf-set-selections command. A well documented and working example -that you can edit is in <xref linkend="example-preseed"/>. - -</para><para condition="sarge"> - -Alternatively, one way to get a complete file listing -all the values that can be preseeded is to do a manual install, -and then use <filename>debconf-get-selections</filename>, -from the <classname>debconf-utils</classname> package, -to dump both the debconf database and the cdebconf -database in /var/log/debian-installer/cdebconf to a single file: - -<informalexample><screen> -$ debconf-get-selections --installer > <replaceable>file</replaceable> -$ debconf-get-selections >> <replaceable>file</replaceable> -</screen></informalexample> - -However, a file generated in this manner will have some items that should -not be preseeded, and the file in <xref linkend="example-preseed"/> is a -better starting place for most users. - -</para><para condition="sarge"> - -Once you have a preconfiguration file, you can edit it if necessary, and -place it on a web server, or copy it onto the installer's boot media. Wherever -you place the file, you need to pass a parameter to the installer at boot -time to tell it to use the file. - -</para><para condition="sarge"> - -To make the installer use a preconfiguration file downloaded from the -network, add preseed/url=http://url/to/preseed.cfg to the kernel boot -parameters. Of course the preconfiguration will not take effect until the -installer manages to set up the network to download the file, so this is -most useful if the installer can set up the network via DHCP without asking -any questions. You may want to set the installation priority to critical to -avoid any questions while the network is being configured. See -<xref linkend="installer-args"/>. - -</para><para condition="sarge"> - -To place a preconfiguration file on a CD, you would need to remaster the -ISO image to include your preconfiguration file. See the manual page for -mkisofs for details. Alternatively, put the preseed file on a floppy, and -use preseed/file=/floppy/preseed.cfg - -</para><para arch="i386" condition="sarge"> - -If you'll be booting from a USB memory stick, then you can simply copy your -preconfiguration file onto the memory stick's filesystem, and edit the -syslinux.cfg file to add preseed/file=/hd-media/preseed.cfg to the kernel boot -parameters. - </para> </sect2> </sect1> diff --git a/en/preparing/install-overview.xml b/en/preparing/install-overview.xml index 7e2bab762..6416ebcbc 100644 --- a/en/preparing/install-overview.xml +++ b/en/preparing/install-overview.xml @@ -119,19 +119,7 @@ which can start up &debian; and/or your existing system. </para></listitem> <listitem><para> -Load the newly installed system for the first time, and make some -initial system settings. - -</para></listitem> -<listitem arch="s390"><para> - -Open a ssh connection to the new system. - -</para></listitem> -<listitem><para> - -Install additional software (<firstterm>tasks</firstterm> -and/or <firstterm>packages</firstterm>), at your discretion. +Load the newly installed system for the first time. </para></listitem> </orderedlist> @@ -154,24 +142,18 @@ you load the new system for the first time. </para><para> -Upon loading the new base system, <classname>base-config</classname> -supervises adding users, setting a time zone (via -<classname>tzsetup</classname>), and setting up the -package installation system (using <classname>apt-setup</classname>). It then -launches <classname>tasksel</classname> which can be used to select large -groups of related programs, and in turn can run <classname>aptitude</classname> -which allows you to choose individual software packages. +To tune the system to your needs, <classname>tasksel</classname> allows you +to choose to install various predefined bundles of software like a Web +server or a Desktop environment. </para><para> When <classname>debian-installer</classname> finishes, before the first system load, you have only a very basic command line driven system. The graphical interface which displays windows on your monitor -will not be installed unless you select it during the final steps, -with either <classname>tasksel</classname> or -<classname>aptitude</classname>. It's optional because many &debian; -systems are servers which don't really have any need for a graphical -user interface to do their job. +will not be installed unless you select it with <classname>tasksel</classname>. +It's optional because many &debian; systems are servers which don't really +have any need for a graphical user interface to do their job. </para><para arch="not-s390"> diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml index b53f88ef5..ff023a345 100644 --- a/en/using-d-i/components.xml +++ b/en/using-d-i/components.xml @@ -77,21 +77,50 @@ like LVM or RAID devices. &module-lvmcfg.xml; &module-mdcfg.xml; </sect2> + + <sect2 id="di-system-setup"> + <title>Setting up the System</title> +<para> + +After partitioning the installer asks a few more questions that will be +used to set up the system is is about the install. + +</para> + +&module-tzsetup.xml; +&module-clock-setup.xml; +&module-user-setup.xml; +</sect2> <sect2 id="di-install-base"> <title>Installing the Base System</title> <para> -Although this stage is the least problematic, it consumes most time of -the install because it downloads, verifies and unpacks the whole base -system. If you have a slow computer or network connection, this could +Although this stage is the least problematic, it consumes a significant +fraction of the install because it downloads, verifies and unpacks the whole +base system. If you have a slow computer or network connection, this could take some time. </para> &module-base-installer.xml; </sect2> + + <sect2 id="di-install-software"> + <title>Installing Additional Software</title> +<para> + +After the base system is installed, you have a usable but limited system. +Most users will want to add additional software to the system to tune it to +their needs, and the installer lets you do so. This step can take even +longer than installing the base system if you have a slow computer or +network. +</para> +&module-apt-setup.xml; +&module-pkgsel.xml; + </sect2> + <sect2 id="di-make-bootable"> <title>Making Your System Bootable</title> @@ -130,10 +159,10 @@ documentation for more information. </sect2> <sect2 id="di-finish"> - <title>Finishing the First Stage</title> + <title>Finishing the Installation</title> <para> -These are the last bits to do before rebooting to your new Debian. It +These are the last bits to do before rebooting to your new system. It mostly consists of tidying up after the &d-i;. </para> diff --git a/en/welcome/doc-organization.xml b/en/welcome/doc-organization.xml index 1fcbc8d0b..4e01c5bb9 100644 --- a/en/welcome/doc-organization.xml +++ b/en/welcome/doc-organization.xml @@ -60,26 +60,21 @@ Perform the actual installation according to configuring peripheral driver modules, configuring your network connection, so that remaining installation files can be obtained directly from a Debian server (if you are not installing from a CD), -partitioning your hard drives and installation of minimal working -system. +partitioning your hard drives and installation of a base system, then +selection and installation of tasks. (Some background about setting up the partitions for your Debian system is explained in <xref linkend="partitioning"/>.) </para></listitem> <listitem><para> -Boot into your newly installed base system and run through some -additional configuration tasks, from <xref linkend="boot-new"/>. +Boot into your newly installed base system, from <xref linkend="boot-new"/>. -</para></listitem> -<listitem><para> - -Install additional software in <xref linkend="install-packages"/>. - -</para></listitem> +</para> +</listitem> </orderedlist> - -</para><para> +</para> +<para> Once you've got your system installed, you can read <xref linkend="post-install"/>. That chapter explains where to |