Redesign sources.list handling. Get rid of /etc/grml/fai/apt/sources.list.
authorMichael Prokop <mika@grml.org>
Thu, 7 Jul 2011 23:34:11 +0000 (01:34 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 8 Jul 2011 11:19:27 +0000 (13:19 +0200)
commita242e27306035a23c96bf5b07b0840942ed245fb
tree6845b12e46a50cceb8f22f808aa58684c64a5c50
parent3c03961b59636e59a7b69a48ac79bcc67f300c16
Redesign sources.list handling. Get rid of /etc/grml/fai/apt/sources.list.

Main changes:

* no longer recursively deploy /etc/apt via fcopy
* /etc/grml/fai/apt/sources.list is gone
* /etc/apt/sources.list will no longer use entries from
  GRML_LIVE_SOURCES once the system has been initially installed

More details:

As we get rid of /etc/grml/fai/apt/sources.list we finally manage
to no longer magically touch grml-live's configuration files WRT
sources.list handling.

Instead the set up of sources.list happens as follows:

${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list/GRML_LIVE_SOURCES_LIST
is generated based on $GRML_LIVE_SOURCES (iff set by the user,
otherwise it falls back to sane defaults using grml repos and the
according Debian suite). This GRML_LIVE_SOURCES_LIST file then
gets deployed on *fresh* deployments. It won't be reused anymore
for the existing installation, so if you run grml-live with the
"-u" option the system will keep /etc/apt/sources.list as it is
as well as the files inside /etc/apt/sources.list.d/. This
provides more flexibility combined with a more transparent and
consistent behaviour for the user.

Then /etc/apt/sources.list.d/debian.list will be set up based on
the detected Debian suite and the files from
${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_*.

Finally /etc/apt/sources.list/grml-stable.list will be deployed
and depending on the build type also
/etc/apt/sources.list.d/grml-testing.list might be installed.
15 files changed:
etc/grml/fai/apt/sources.list [deleted file]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/grml-stable.list/GRMLBASE [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list.d/grml-testing.list/GRMLBASE [new file with mode: 0644]
etc/grml/fai/config/files/etc/apt/sources.list/GRMLBASE [new file with mode: 0644]
etc/grml/fai/config/hooks/instsoft.GRMLBASE
etc/grml/fai/config/hooks/updatebase.GRMLBASE
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
grml-live