From 26c2731d37ef50f3de93374ac33aede276b2d0c1 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Mon, 6 Dec 2010 19:10:43 +0100 Subject: [PATCH] tag all files installed by grml-live --- .../fai/config/files/etc/apt/apt.conf.d/20pdiffs/GRMLBASE | 1 + etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE | 2 ++ etc/grml/fai/config/files/etc/fstab/GRMLBASE | 5 +++++ etc/grml/fai/config/files/etc/hosts/GRMLBASE | 4 ++++ .../config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE | 13 +++++++++++++ etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE | 5 ++++- etc/grml/fai/config/files/etc/sudoers/GRMLBASE | 4 ++++ .../share/initramfs-tools/scripts/init-top/grml/GRMLBASE | 12 ++++++++++++ 8 files changed, 45 insertions(+), 1 deletion(-) diff --git a/etc/grml/fai/config/files/etc/apt/apt.conf.d/20pdiffs/GRMLBASE b/etc/grml/fai/config/files/etc/apt/apt.conf.d/20pdiffs/GRMLBASE index 64628ae..169b99d 100644 --- a/etc/grml/fai/config/files/etc/apt/apt.conf.d/20pdiffs/GRMLBASE +++ b/etc/grml/fai/config/files/etc/apt/apt.conf.d/20pdiffs/GRMLBASE @@ -1 +1,2 @@ +// This file is installed by grml-live. Acquire::PDiffs "false"; diff --git a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE index e985f13..bf61976 100644 --- a/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE +++ b/etc/grml/fai/config/files/etc/apt/preferences/GRMLBASE @@ -1,3 +1,5 @@ +// This file is installed by grml-live. +// // allow overwriting via grml-live: Package: * Pin: release o=The grml project,a=grml-live,l=grml,c=main diff --git a/etc/grml/fai/config/files/etc/fstab/GRMLBASE b/etc/grml/fai/config/files/etc/fstab/GRMLBASE index 48a4110..89da7df 100644 --- a/etc/grml/fai/config/files/etc/fstab/GRMLBASE +++ b/etc/grml/fai/config/files/etc/fstab/GRMLBASE @@ -1,4 +1,9 @@ # /etc/fstab - static file system information +# +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/30-fstab script, using +# /etc/grml/fai/config/files/etc/fstab/GRMLBASE +# # proc /proc proc rw,nosuid,nodev,noexec 0 0 none /proc/bus/usb usbfs defaults,noauto 0 0 diff --git a/etc/grml/fai/config/files/etc/hosts/GRMLBASE b/etc/grml/fai/config/files/etc/hosts/GRMLBASE index 03ddf41..5912c03 100644 --- a/etc/grml/fai/config/files/etc/hosts/GRMLBASE +++ b/etc/grml/fai/config/files/etc/hosts/GRMLBASE @@ -1,3 +1,7 @@ +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/34-hosts script, using +# /etc/grml/fai/config/files/etc/hosts/GRMLBASE + 127.0.0.1 $HOSTNAME localhost # The following lines are desirable for IPv6 capable hosts diff --git a/etc/grml/fai/config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE b/etc/grml/fai/config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE index 8c90ac9..debe819 100644 --- a/etc/grml/fai/config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE +++ b/etc/grml/fai/config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE @@ -1 +1,14 @@ +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/39-modprobe script, using +# /etc/grml/fai/config/files/etc/modprobe.d/radeon-kms.conf/GRMLBASE +# +# Filename: /etc/modprobe.d/radeon-kms.conf +# Purpose: Disable KMS for radeon, due to bugs on ES1000 radeons +# making the screen unusable. +# Authors: grml-team (grml.org), +# (c) Ulrich Dangel +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2 or any later version. +################################################################################ + options radeon modeset=0 diff --git a/etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE b/etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE index 35948f9..192aec3 100644 --- a/etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE +++ b/etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE @@ -1,4 +1,7 @@ +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/35-network script, using +# /etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE + # The loopback interface -# automatically added when upgrading auto lo iface lo inet loopback diff --git a/etc/grml/fai/config/files/etc/sudoers/GRMLBASE b/etc/grml/fai/config/files/etc/sudoers/GRMLBASE index fa78cc0..c3f2643 100644 --- a/etc/grml/fai/config/files/etc/sudoers/GRMLBASE +++ b/etc/grml/fai/config/files/etc/sudoers/GRMLBASE @@ -2,6 +2,10 @@ # This file MUST be edited with the "visudo" command as root. # See the man page for details on how to write a sudoers file. +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/20-sudo script, using +# /etc/grml/fai/config/files/etc/sudoers/GRMLBASE + # Host alias specification # User alias specification diff --git a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE index 5afaca4..1f6b278 100755 --- a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE +++ b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE @@ -1,4 +1,16 @@ #!/bin/sh +# +# This file was deployed via grml-live's +# /etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs script, using +# /etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE +# +# Filename: /usr/share/initramfs-tools/scripts/init-top/grml +# Purpose: Early boot progress handler +# Authors: grml-team (grml.org), +# (c) Michael Prokop +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2 or any later version. +################################################################################ # prereq header {{{ # without this header booting will fail with: -- 2.1.4