[Git-commits] grml-live: branch, master, updated. v0.14.1-63-g00fd941
git repository hosting
gitosis at grml.org
Fri Jul 8 14:02:54 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grml-live - build system for creating a Grml (based) live system".
The branch, master has been updated
via 00fd941eccd2032da97f112e448c06cd5c1c62e5 (commit)
via 2d7aecf154d04fe411e1bdcb0173fe9f2093deb4 (commit)
via dd814754c67b9089428e17756d40fd848c58647f (commit)
via a242e27306035a23c96bf5b07b0840942ed245fb (commit)
via 3c03961b59636e59a7b69a48ac79bcc67f300c16 (commit)
from e13f6a8e039735faf767a7fec63474d54b7c79b2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 00fd941eccd2032da97f112e448c06cd5c1c62e5
Author: Michael Prokop <mika at grml.org>
Date: Fri Jul 8 13:43:29 2011 +0200
Drop patches/ directory, patch fai_chroot_update.patch is not relevant anymore.
commit 2d7aecf154d04fe411e1bdcb0173fe9f2093deb4
Author: Michael Prokop <mika at grml.org>
Date: Fri Jul 8 13:24:40 2011 +0200
Add security.debian.org to sources.list of lenny, squeezy, wheezy, stable and testing.
Thanks: Christian Hofstaedtler <ch at grml.org>
commit dd814754c67b9089428e17756d40fd848c58647f
Author: Michael Prokop <mika at grml.org>
Date: Fri Jul 8 02:40:11 2011 +0200
GRMLBASE scripts: run all fcopy commands in verbose mode.
We want to be able to catch in the logs as much information as
possible, therefore be as verbose as possible.
commit a242e27306035a23c96bf5b07b0840942ed245fb
Author: Michael Prokop <mika at grml.org>
Date: Fri Jul 8 01:34:11 2011 +0200
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.
commit 3c03961b59636e59a7b69a48ac79bcc67f300c16
Author: Michael Prokop <mika at grml.org>
Date: Fri Jul 8 01:33:55 2011 +0200
Update apt preferences: always use live-boot* packages from Grml.
If the grml-testing repository is NOT enabled then live-boot
might be installed from Debian/unstable during updates.
That's something we don't want, so make sure apt pinning
always prefers our own version.
-----------------------------------------------------------------------
Summary of changes:
etc/grml/fai/apt/sources.list | 9 --
.../fai/config/files/etc/apt/preferences/GRMLBASE | 13 ++-
.../etc/apt/sources.list.d/debian.list/DEBIAN_ETCH | 15 +++
.../apt/sources.list.d/debian.list/DEBIAN_LENNY | 19 ++++
.../etc/apt/sources.list.d/debian.list/DEBIAN_SID | 15 +++
.../apt/sources.list.d/debian.list/DEBIAN_SQUEEZE | 19 ++++
.../apt/sources.list.d/debian.list/DEBIAN_STABLE | 19 ++++
.../apt/sources.list.d/debian.list/DEBIAN_TESTING | 19 ++++
.../apt/sources.list.d/debian.list/DEBIAN_WHEEZY | 19 ++++
.../apt/sources.list.d/grml-stable.list/GRMLBASE | 3 +
.../apt/sources.list.d/grml-testing.list/GRMLBASE | 3 +
.../fai/config/files/etc/apt/sources.list/GRMLBASE | 9 ++
etc/grml/fai/config/hooks/instsoft.GRMLBASE | 19 ----
etc/grml/fai/config/hooks/updatebase.GRMLBASE | 9 ++-
.../config/scripts/GRMLBASE/10-configure-initramfs | 6 +-
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup | 4 +-
etc/grml/fai/config/scripts/GRMLBASE/20-sudo | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/25-locales | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/30-fstab | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/31-motd | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup | 104 +++++---------------
etc/grml/fai/config/scripts/GRMLBASE/34-hosts | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/35-network | 2 +-
etc/grml/fai/config/scripts/GRMLBASE/39-modprobe | 4 +-
etc/grml/fai/config/scripts/GRMLBASE/41-modules | 2 +-
grml-live | 43 ++++----
patches/fai_chroot_update.patch | 63 ------------
27 files changed, 217 insertions(+), 211 deletions(-)
delete mode 100644 etc/grml/fai/apt/sources.list
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/grml-stable.list/GRMLBASE
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list.d/grml-testing.list/GRMLBASE
create mode 100644 etc/grml/fai/config/files/etc/apt/sources.list/GRMLBASE
delete mode 100644 patches/fai_chroot_update.patch
hooks/post-receive
--
build system for creating a Grml (based) live system
More information about the Git-commits
mailing list