- Revamped the README.html, removing the old manual apt setup
instructions, various references to woody, fixing the link to the LDP
home page, dropping reference to the basically dead non-us section,
removing confusing references to non-free being on the CD, dropping
references to dselect, etc.
- Fix layout of README.txt, adding missing <p>'s after headings.
- Drop README.mirrors and README.non-US from the CDs.
This commit is contained in:
Joey Hess
parent
0f20038840
commit
68ad503b3f
3
Makefile
3
Makefile
|
|
@ -635,7 +635,8 @@ $(SDIR)/CD1/README.html:
|
|||
cp -d $(MIRROR)/README* $$dir/; \
|
||||
rm -f $$dir/README $$dir/README.html \
|
||||
$$dir/README.CD-manufacture \
|
||||
$$dir/README.pgp ; \
|
||||
$$dir/README.pgp $$dir/README.mirrors.txt \
|
||||
$$dir/README.mirrors.html $$dir/README.non-US; \
|
||||
cpp -traditional -undef -P -C -Wall -nostdinc -I $$dir/ \
|
||||
-D OUTPUTtext $(BASEDIR)/data/$(CODENAME)/README.html.in \
|
||||
| sed -e 's/%%.//g' > $$dir/README.html ; \
|
||||
|
|
|
|||
|
|
@ -185,15 +185,6 @@ CONTENTS:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef UNOFFEXTRAS
|
||||
<A href="#nonfree">Non-Free/Non-US</A>
|
||||
<P>
|
||||
|
||||
#if OUTPUTtext
|
||||
</LI><LI>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef UNOFFEXTRAS
|
||||
<A href="#cdmanuf">CD Manufacturers</A>
|
||||
<P>
|
||||
|
|
@ -248,7 +239,7 @@ Intro
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
This is one of the CD-ROMs of the
|
||||
<a href="http://www.debian.org/">Debian GNU/Linux</a>
|
||||
distribution. Debian is a
|
||||
|
|
@ -306,7 +297,7 @@ About This CD
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
This CD-ROM is labeled
|
||||
<P>
|
||||
<tt>
|
||||
|
|
@ -314,7 +305,7 @@ This CD-ROM is labeled
|
|||
</tt>
|
||||
<P>
|
||||
#ifndef UNOFFEXTRAS
|
||||
which means that this CD is number DISKNUM of totally TOTALNUM CDs containing
|
||||
which means that this CD is number DISKNUM of TOTALNUM CDs containing
|
||||
#if TYPEbinary
|
||||
programs ("binaries") for `ARCH' computers.
|
||||
<P>
|
||||
|
|
@ -349,8 +340,8 @@ Installing
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
#if DISKNUM1 && TYPEbinary
|
||||
<p>
|
||||
#if TYPEbinary
|
||||
|
||||
Because Debian is a complete Operating System, the installation procedure
|
||||
may seem a bit unusual. You can install Debian GNU/Linux either
|
||||
|
|
@ -360,22 +351,17 @@ Installing
|
|||
Read the <i>Installation Manual</i>, on this CD at
|
||||
<P>
|
||||
<tt>
|
||||
<A href="install/doc/install.en.html">/install/doc/install.en.html</a> </tt>
|
||||
(English version).
|
||||
<P>
|
||||
Translations of the <i>Installation Manual</i>, and plain-text and PDF
|
||||
versions, are also available in the
|
||||
<P>
|
||||
<tt>
|
||||
<A href="install/doc/">/install/doc</a></tt>
|
||||
<P>
|
||||
directory, along with various other documents.
|
||||
<A href="install/doc/index.en.html">/install/doc/index.en.html</a> </tt>
|
||||
<P>
|
||||
Programs and other files that are needed for the installation can be found on
|
||||
this CD under
|
||||
<P>
|
||||
<tt>
|
||||
<A href=%%""dists/sarge/main/disks-ARCH/%%"">/dists/sarge/main/disks-ARCH</a>
|
||||
<A href=%%""tools/%%"">/tools/</a>
|
||||
</tt>
|
||||
and
|
||||
<tt>
|
||||
<A href=%%""install/floppy/%%"">/install/floppy/</a>
|
||||
</tt>
|
||||
|
||||
#if ARCHi386 || ARCHalpha || ARCHpowerpc || ARCHsparc
|
||||
|
|
@ -425,7 +411,7 @@ Installing
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
#if DISKNUM1 && TYPEbinary
|
||||
|
||||
If you are already running an older version of the Debian GNU/Linux
|
||||
|
|
@ -452,7 +438,7 @@ Last-Minute Notes
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
<UL>
|
||||
|
||||
<LI>
|
||||
|
|
@ -481,27 +467,22 @@ Last-minutes notes for this CD may be available on
|
|||
#if OUTPUThtml
|
||||
<P><HR><P><H2><A name="apt">
|
||||
#endif
|
||||
Using CDs with Dselect and Apt
|
||||
Using CDs Apt
|
||||
#if OUTPUTtext
|
||||
<br>
|
||||
==============================
|
||||
=============
|
||||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
After installing or upgrading, Debian's packaging system can use CD-ROMs,
|
||||
local collections, or networked servers (FTP, HTTP) to automatically
|
||||
install software from (<tt>.deb</tt> <i>packages</i>). This is done
|
||||
preferably with the `apt' and `dselect' programs. If you do not already
|
||||
know how to setup these, here is a brief explanation.
|
||||
<P>
|
||||
|
||||
#define CDROMreadme 1
|
||||
#include "apt-setup.html.in"
|
||||
preferably with the `apt' and `aptitude' programs.
|
||||
|
||||
<P>
|
||||
|
||||
Once this is done, you can install packages from the commandline using
|
||||
You can install packages from the commandline using
|
||||
<tt>apt-get</tt>. For example, if you want to install the packages
|
||||
`commprog' and `maxgame', you can give the command
|
||||
<P>
|
||||
|
|
@ -511,55 +492,13 @@ Last-minutes notes for this CD may be available on
|
|||
<P>
|
||||
Note that you don't have to enter the complete path, or the
|
||||
`<tt>.deb</tt>' extension. `Apt' will figure this out itself.
|
||||
|
||||
<P>
|
||||
|
||||
`<tt>Dselect</tt>' is also able to use `apt' to fetch the packages. To set
|
||||
up `<tt>dselect</tt>', choose [A]ccess in the main menu, and then select
|
||||
`apt'. The <tt>sources.list</tt> file should be okay already, so don't let
|
||||
the program make a new one. Then, after an [U]pdate, the configuration is
|
||||
ready. You can just keep using [S]elect and [I]nstall to install packages.
|
||||
<P>
|
||||
See <tt>dselect</tt>'s online help screens for more information (use the
|
||||
`<tt>?</tt>' key).
|
||||
|
||||
Or use aptitude for a full screen interactive selection of available
|
||||
Debian packages.
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef UNOFFEXTRAS
|
||||
#if OUTPUTtext
|
||||
<P> <P><H2><A name="nonfree">
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<P><HR><P><H2><A name="nonfree">
|
||||
#endif
|
||||
Non-free and Non-US
|
||||
#if OUTPUTtext
|
||||
<br>
|
||||
===================
|
||||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
The package sections `non-free' and `non-US' contain packages that either
|
||||
have a restrictive license, or can't be exported from the US (like `pgp'
|
||||
or `ssh'). It may well be that this CD does not contain (all of) these
|
||||
packages. You can get them from our FTP/HTTP mirror sites.
|
||||
|
||||
<P>
|
||||
`Non-free' packages are on our "regular" mirrors, listed in
|
||||
<a href="README.mirrors.html">README.mirrors.html</a> on this CD, or on
|
||||
<a href="http://www.debian.org/distrib/ftplist">http://www.debian.org/distrib/ftplist</a> ("Full list of mirrors").
|
||||
|
||||
<P>
|
||||
`Non-US' packages are on special mirrors outside the US, listed in
|
||||
<a href="README.non-US">README.non-US</a> on this CD, or on
|
||||
<a href="http://www.debian.org/misc/README.non-US">http://www.debian.org/misc/README.non-US</a>.
|
||||
|
||||
<P>
|
||||
Note that you <i>are</i> allowed to <i>import</i> non-US packages into the US.
|
||||
#endif
|
||||
|
||||
#ifndef UNOFFEXTRAS
|
||||
#if OUTPUTtext
|
||||
<P> <P><H2><A name="cdmanuf">
|
||||
|
|
@ -574,8 +513,8 @@ CD Manufacturers
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
You are completely free to manufacture and (re-)distribute CD-ROMs of the
|
||||
<p>
|
||||
You are completely free to manufacture and re-distribute CD-ROMs of the
|
||||
Debian GNU/Linux Operating System, like this one. There is no charge from
|
||||
us (but of course donations are always welcome).
|
||||
|
||||
|
|
@ -601,7 +540,7 @@ More Information
|
|||
#endif
|
||||
</H2>
|
||||
</a>
|
||||
|
||||
<p>
|
||||
#if DISKNUM1 && TYPEbinary
|
||||
|
||||
There is much more information present on this CD. Besides the already
|
||||
|
|
@ -699,10 +638,10 @@ http://www.debian.org/support
|
|||
<LI>
|
||||
|
||||
#if OUTPUTtext
|
||||
http://www.linuxdoc.org
|
||||
http://www.tldp.org
|
||||
|
||||
#endif
|
||||
<A href="http://www.linuxdoc.org/">The Linux Documentation Project</a>
|
||||
<A href="http://www.tldp.org/">The Linux Documentation Project</a>
|
||||
|
||||
</LI>
|
||||
<LI>
|
||||
|
|
@ -739,7 +678,7 @@ for information on contacting us.
|
|||
</SMALL><P>
|
||||
<SMALL>
|
||||
|
||||
Last Modified: Wed Apr 18 19:09:34 CEST 2001
|
||||
Last Modified: Sat Mar 20 12:30:45 EST 2004
|
||||
|
||||
<br></SMALL>
|
||||
</DIV>
|
||||
|
|
|
|||
|
|
@ -1,254 +0,0 @@
|
|||
|
||||
First of all, comment out every line of <tt>/etc/apt/sources.list</tt> by
|
||||
placing a hash sign (`<tt>#</tt>') in front of it (if it isn't already
|
||||
there).
|
||||
|
||||
<P>
|
||||
|
||||
Then you need to add new "<tt>deb</tt>" lines describing the location(s)
|
||||
where apt will get the new packages from. You can add "<tt>deb</tt>" lines
|
||||
for a packages mirror on a local harddisk, and/or FTP/HTTP mirrors, and/or
|
||||
(a set of) CD-ROMs. `Apt' will consider all packages that can be found
|
||||
via any "<tt>deb</tt>" line, and use the one with the highest version
|
||||
number, giving priority to the first mentioned lines. (So, in case of
|
||||
multiple mirror locations, you'd typically first name a local harddisk,
|
||||
then CD-ROMs, and finally FTP/HTTP mirrors.)
|
||||
|
||||
<P>
|
||||
<UL>
|
||||
<LI>
|
||||
For a local archive (or a single mounted CD-ROM), that for example has
|
||||
these directories,
|
||||
|
||||
#if OUTPUTtext
|
||||
<PRE>
|
||||
|
||||
/var/ftp/debian/dists/sarge/main/binary-ARCH/...
|
||||
/var/ftp/debian/dists/sarge/contrib/binary-ARCH/...
|
||||
--------------- ----- |\
|
||||
\________ \_ | \___
|
||||
add: \ \ | \
|
||||
--------------- ----- | \
|
||||
deb file:/var/ftp/debian sarge main contrib
|
||||
|
||||
</PRE>
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<PRE>
|
||||
/var/ftp/debian/dists/sarge/main/binary-ARCH/...
|
||||
/var/ftp/debian/dists/sarge/contrib/binary-ARCH/...
|
||||
--------------- ----- |\
|
||||
\________ \_ | \___
|
||||
add: \ \ | \
|
||||
--------------- ----- | \
|
||||
deb file:/var/ftp/debian sarge main contrib
|
||||
</PRE>
|
||||
#endif
|
||||
|
||||
As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd,...
|
||||
arguments are used to expand the path into multiple directories.
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
If you have a complete mirror that also has non-free and non-US, you
|
||||
typically have to add lines like these:
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
<tt>
|
||||
deb file:/var/ftp/debian sarge main contrib non-free <BR>
|
||||
|
||||
deb file:/var/ftp/debian-non-US sarge/non-US main contrib non-free
|
||||
</tt>
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
If you don't have such a structure, other description lines are
|
||||
possible, see the <tt>sources.list</tt>
|
||||
#if MANPAGEseebelow
|
||||
manpage (see below).
|
||||
#else
|
||||
manpage.
|
||||
#endif
|
||||
|
||||
</LI>
|
||||
<BR> <BR>
|
||||
<LI>
|
||||
|
||||
FTP or HTTP packages mirror addresses can be found on
|
||||
|
||||
#if CDROMreadme
|
||||
#if OUTPUTtext
|
||||
this CD in README.mirrors.txt, or on
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
this CD in <a href="README.mirrors.html">README.mirrors.html</a>, or on
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if OUTPUTtext
|
||||
http://www.debian.org/distrib/ftplist,
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<a href="http://www.debian.org/distrib/ftplist">http://www.debian.org/distrib/ftplist</a>,
|
||||
#endif
|
||||
look at the "Full list of mirrors".
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
If the mirror has these directories:
|
||||
|
||||
#if OUTPUTtext
|
||||
<PRE>
|
||||
|
||||
ftp://some-server/debian/dists/sarge/main/binary-ARCH/...
|
||||
ftp://some-server/debian/dists/sarge/contrib/binary-ARCH/...
|
||||
------------------------ ----- | |
|
||||
\___ / | |
|
||||
add: \ / | |
|
||||
------------------------ ----- | |
|
||||
deb ftp://some-server/debian sarge main contrib
|
||||
|
||||
</PRE>
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<PRE>
|
||||
ftp://some-server/debian/dists/sarge/main/binary-ARCH/...
|
||||
ftp://some-server/debian/dists/sarge/contrib/binary-ARCH/...
|
||||
------------------------ ----- | |
|
||||
\___ / | |
|
||||
add: \ / | |
|
||||
------------------------ ----- | |
|
||||
deb ftp://some-server/debian sarge main contrib
|
||||
</PRE>
|
||||
#endif
|
||||
|
||||
As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd,...
|
||||
arguments are used to expand the path into multiple directories.
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
If you use a complete mirror that also has non-free and non-US, you
|
||||
typically have to add lines like these:
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
<tt>
|
||||
deb ftp://some-server/debian sarge main contrib non-free <BR>
|
||||
|
||||
deb ftp://some-server/debian-non-US sarge/non-US main contrib non-free
|
||||
</tt>
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
If the mirror doesn't have such a structure, other description lines are
|
||||
possible, see the <tt>sources.list</tt>
|
||||
#if MANPAGEseebelow
|
||||
manpage (see below).
|
||||
#else
|
||||
manpage.
|
||||
#endif
|
||||
|
||||
#if UPGRADING
|
||||
<BR> <BR>
|
||||
|
||||
NOTE: if you're using the static versions of `apt' and `dpkg' from this
|
||||
directory, the hostname-lookup is "broken" (which is one reason to just
|
||||
use slink's `apt'). The solution is to simply put the mirrors' IP address
|
||||
in the "<tt>deb</tt>" line. (Hint: "<tt>nslookup some-server</tt>")
|
||||
#endif
|
||||
|
||||
</LI>
|
||||
<BR> <BR>
|
||||
<LI>
|
||||
|
||||
In case of upgrading from a set of CD-ROMs (also possible for a single,
|
||||
unmounted CD-ROM), do _not_ add any lines to sources.list manually.
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
Instead, first make sure there is a line in <tt>/etc/fstab</tt> that
|
||||
connects the <tt>/cdrom</tt> mount point with your CD-ROM drive (the
|
||||
exact `<tt>/cdrom</tt>' mount point is "required" for apt). For example,
|
||||
if
|
||||
#if ARCHi386
|
||||
<tt>/dev/hdc</tt>
|
||||
#else
|
||||
<tt>/dev/scd0</tt>
|
||||
#endif
|
||||
is your CD-ROM drive, <tt>/etc/fstab</tt> should
|
||||
contain a line
|
||||
|
||||
#if ARCHi386
|
||||
#if OUTPUTtext
|
||||
<PRE>
|
||||
|
||||
/dev/hdc /cdrom auto defaults,noauto,ro 0 0
|
||||
|
||||
</PRE>
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<PRE>
|
||||
/dev/hdc /cdrom auto defaults,noauto,ro 0 0
|
||||
</PRE>
|
||||
#endif
|
||||
#else
|
||||
#if OUTPUTtext
|
||||
<PRE>
|
||||
|
||||
/dev/scd0 /cdrom auto defaults,noauto,ro 0 0
|
||||
|
||||
</PRE>
|
||||
#endif
|
||||
#if OUTPUThtml
|
||||
<PRE>
|
||||
/dev/scd0 /cdrom auto defaults,noauto,ro 0 0
|
||||
</PRE>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
To test this, insert a CD-ROM and give commands
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
<tt> mount /cdrom</tt><BR>
|
||||
<tt> ls -alF /cdrom </tt>
|
||||
(this should show the CD-ROM's root directory)<BR>
|
||||
<tt> umount /cdrom</tt>
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
Then, use the command
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
<tt>
|
||||
apt-cdrom add
|
||||
</tt>
|
||||
|
||||
<BR> <BR>
|
||||
|
||||
to add the data of each individual CD-ROM to apt's internal database.
|
||||
This command will ask for one CD-ROM per run, and mount/unmount the
|
||||
CD-ROM automatically. You should repeat this command for all `Binary'
|
||||
CD-ROMs you have.
|
||||
|
||||
#if UPGRADING
|
||||
(`Source' CD-ROMs can be added as well, but only with the
|
||||
latest version of `apt' from this directory, and they are not needed for
|
||||
the upgrade anyway.)
|
||||
#endif
|
||||
|
||||
</LI>
|
||||
</UL>
|
||||
<P>
|
||||
|
||||
The final step of the preparation is to update apt's internal database
|
||||
with the command
|
||||
|
||||
<P>
|
||||
|
||||
<tt>
|
||||
apt-get update
|
||||
</tt>
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
|
|||
- Link the d-i INSTALLATION-HOWTO into doc/, if it exists.
|
||||
- Add my exclude_udebs lists, for general and i386, and modify
|
||||
generate_di_list to not include udebs from those lists onto the
|
||||
cdrom, to save space on the netinst cds.
|
||||
cdrom, to save space on the netinst cds. Closes: #215469
|
||||
- Use the d-i docs in sid instead of the woody boot floppies docs.
|
||||
- Add pcmcia-cs-udeb to sarge's i386_netinst_udeb_include, to support
|
||||
pcmcia installs.
|
||||
|
|
@ -55,6 +55,13 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
|
|||
could try to install on the CD.
|
||||
- Try to include some sparc kernels on the CD; it's probably better than
|
||||
including none..
|
||||
- Revamped the README.html, removing the old manual apt setup
|
||||
instructions, various references to woody, fixing the link to the LDP
|
||||
home page, dropping reference to the basically dead non-us section,
|
||||
removing confusing references to non-free being on the CD, dropping
|
||||
references to dselect, etc.
|
||||
- Fix layout of README.txt, adding missing <p>'s after headings.
|
||||
- Drop README.mirrors and README.non-US from the CDs.
|
||||
* Steve Langasek
|
||||
- Add fdisk-udeb to the list of needed debs for alpha
|
||||
- Use /dev/ram as the root device for aboot (alpha)
|
||||
|
|
|
|||
Loading…
Reference in New Issue