Drop Latest change lines, add initial support for Debian/squeeze

diff --git a/buildd/files/HEADER.html b/buildd/files/HEADER.html
index 86ddc47..addb60d 100644 (file)
--- a/buildd/files/HEADER.html
+++ b/buildd/files/HEADER.html
@@ -15,35 +15,47 @@
 
 <h2>About</h2>
 
 
 <h2>About</h2>
 

-<p>This directory contains automatically generated snapshots of the <a
-href="http://grml.org/">grml Linux Live-CD</a> which were build using <a
+<p>This webpage provides <strong>automatically generated snapshots</strong> of
+the <a href="http://grml.org/">grml Linux Live-CD</a> which were build using <a

 href="http://grml.org/grml-live/">grml-live</a>.</p>
 
 href="http://grml.org/grml-live/">grml-live</a>.</p>
 

-<p>Feel free to use the ISOs but please notice that they are neither official <a
-href="http://grml.org/beta-tester/">devel releases</a> nor <a
-href="http://grml.org/download/">stable releases</a> - so: <strong>PLEASE
-USE THEM WITH CAUTION!</strong></p>
+<p>WARNING: Feel free to use the ISOs but please notice that they are neither
+official <a href="http://grml.org/beta-tester/">devel releases</a> nor <a
+href="http://grml.org/download/">stable releases</a>. They provide the latest
+changes, but they also might have known issues. In fact, they may not work at
+all. So: <strong>PLEASE USE THEM WITH CAUTION!</strong></p>

 
 <p>Please <a href="http://grml.org/bugs/">report any bugs you notice</a>!
 Thanks for helping us improve grml!</p>
 
 
 <p>Please <a href="http://grml.org/bugs/">report any bugs you notice</a>!
 Thanks for helping us improve grml!</p>
 

+<!--

 <p><em>Notice: if the md5sum (.md5) of a file is missing please do not download
 the ISO yet as there might be problems with the ISO.</em></p>
 <p><em>Notice: if the md5sum (.md5) of a file is missing please do not download
 the ISO yet as there might be problems with the ISO.</em></p>

+-->
+
+<h2>Download</h2>
+
+<!--
+<p>Notice: the first link on each line points to the most recent available
+snapshot of the according grml flavour. The 'md5'-link points to the according
+md5 checksum file. The link named 'older versions' points to the directory of
+the according grml flavour providing all available snapshots.</p>
+-->

 
 <h2>Explanation of directory-/filenames</h2>
 
 <ul>
 
 <h2>Explanation of directory-/filenames</h2>
 
 <ul>

-  <li>grml_etch:          normal, 32bit version based on Debian/etch (stable)
+  <li>grml_lenny:          normal, 32bit version based on Debian/lenny (stable)

   <li>grml_sid:           normal, 32bit version based on Debian/sid  (unstable)
   <li>grml_sid:           normal, 32bit version based on Debian/sid  (unstable)

-  <li>grml-medium_etch:   medium, 32bit version based on Debian/etch (stable)
+  <li>grml-medium_lenny:   medium, 32bit version based on Debian/lenny (stable)

   <li>grml-medium_sid:    medium, 32bit version based on Debian/sid  (unstable)
   <li>grml-medium_sid:    medium, 32bit version based on Debian/sid  (unstable)

-  <li>grml-small_etch:    small,  32bit version based on Debian/etch (stable)
+  <li>grml-small_lenny:    small,  32bit version based on Debian/lenny (stable)

   <li>grml-small_sid:     small,  32bit version based on Debian/sid  (unstable)
   <li>grml-small_sid:     small,  32bit version based on Debian/sid  (unstable)

-  <li>grml64_etch:        normal, 64bit version based on Debian/etch (stable)
+  <li>grml64_lenny:        normal, 64bit version based on Debian/lenny (stable)

   <li>grml64_sid:         normal, 64bit version based on Debian/sid  (unstable)
   <li>grml64_sid:         normal, 64bit version based on Debian/sid  (unstable)

-  <li>grml64-medium-etch: medium, 64bit version based on Debian/etch (stable)
+  <li>grml64-medium-lenny: medium, 64bit version based on Debian/lenny (stable)

   <li>grml64-medium-sid:  medium, 64bit version based on Debian/sid  (unstable)
   <li>grml64-medium-sid:  medium, 64bit version based on Debian/sid  (unstable)

-  <li>grml64-small-etch:  small,  64bit version based on Debian/etch (stable)
+  <li>grml64-small-lenny:  small,  64bit version based on Debian/lenny (stable)

   <li>grml64-small-sid:   small,  64bit version based on Debian/sid  (unstable)
 </ul>
 
   <li>grml64-small-sid:   small,  64bit version based on Debian/sid  (unstable)
 </ul>
 


@@ -53,10 +65,11 @@ base64.tgz as /etc/grml/fai/config/basefiles/AMD64.tar.gz</p>
 
 <h2>Contact</h2>
 
 
 <h2>Contact</h2>
 

-<p>Problems? Questions? <a href="http://grml.org/contact/">Contact us</a>.</p>
+<p>Problems? Questions? <a href="http://grml.org/contact/">Contact us</a>.  But
+please do not forget to provide all the relevant information (especially which
+grml flavour and version you are refering to).</p>

 
 <!--
 <h2>Important information by Sun Dec  9 13:13:59 UTC 2007</h2>
 
 <!--
 <h2>Important information by Sun Dec  9 13:13:59 UTC 2007</h2>

-

 <p><strong>Current ISOs are known to be broken, we are investigating on that.</strong></p>
 -->
 <p><strong>Current ISOs are known to be broken, we are investigating on that.</strong></p>
 -->

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 094d303..4efd123 100755 (executable)
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 09 18:38:26 CET 2007 [mika]

 ################################################################################
 
 die() {
 ################################################################################
 
 die() {

diff --git a/buildd/grml-buildd.conf b/buildd/grml-buildd.conf
index 1657f0d..9c16ab9 100644 (file)
--- a/buildd/grml-buildd.conf
+++ b/buildd/grml-buildd.conf
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Fri Oct 26 01:28:27 CEST 2007 [mika]

 ################################################################################
 
 # where do you want to store chroot/ISOs/...? Must be set!
 ################################################################################
 
 # where do you want to store chroot/ISOs/...? Must be set!

diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh
index 883f27a..fc4e654 100755 (executable)
--- a/buildd/link_latest.sh
+++ b/buildd/link_latest.sh
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 09 18:02:45 CET 2007 [mika]

 ################################################################################
 
 set -e
 ################################################################################
 
 set -e

diff --git a/buildd/remove_isos.sh b/buildd/remove_isos.sh
index abb3efb..5832e00 100755 (executable)
--- a/buildd/remove_isos.sh
+++ b/buildd/remove_isos.sh
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Nov 11 11:45:45 CET 2007 [mika]

 ################################################################################
 
 . /etc/grml/grml-buildd.conf || exit 1
 ################################################################################
 
 . /etc/grml/grml-buildd.conf || exit 1

diff --git a/debian/changelog b/debian/changelog
index aaf308f..71395a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,13 @@ grml-live (0.9.9) unstable; urgency=low
       [to avoid that "etch" is used as build name but lenny is used]
     - use "$NAME-daily-$SUITE" in functions.sh as build name so
       identifying ISOs while running them is easier
       [to avoid that "etch" is used as build name but lenny is used]
     - use "$NAME-daily-$SUITE" in functions.sh as build name so
       identifying ISOs while running them is easier

+  * Support squeeze as valid suite name.
+  * Comment Debian/unstable in /etc/grml/fai/apt/preferences by default.
+    This should avoid issues with something like
+    'apt-get -t experimental ...'
+  * Consequently drop 'Latest change' lines from all files.

 
 

- -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 00:26:21 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 20 Feb 2009 16:03:42 +0100

 
 grml-live (0.9.8) unstable; urgency=low
 
 
 grml-live (0.9.8) unstable; urgency=low
 

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 82cec39..b0aa869 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -141,7 +141,8 @@ Specify name of the release.
   -s **SUITE**::
 
 Specify the Debian suite you want to use for your live-system.  Defaults to
   -s **SUITE**::
 
 Specify the Debian suite you want to use for your live-system.  Defaults to

-"etch" (being current Debian/stable). Supported values are: etch, lenny, sid.
+"lenny" (being current Debian/stable). Supported values are: etch, lenny, squeeze,
+sid.

 
   -t **TEMPLATE_DIRECTORY**::
 
 
   -t **TEMPLATE_DIRECTORY**::
 


@@ -598,7 +599,7 @@ How do I create a base.tgz for use as NFSROOT?
 First of all build the chroot system:
 
   mkdir /tmp/nfsroot && cd /tmp/nfsroot
 First of all build the chroot system:
 
   mkdir /tmp/nfsroot && cd /tmp/nfsroot

-  debootstrap etch /tmp/nfsroot/ http://ftp.de.debian.org/debian
+  debootstrap lenny /tmp/nfsroot/ http://ftp.de.debian.org/debian

   tar zcf base.tgz ./
 
 Then check out where your NFSROOT is located:
   tar zcf base.tgz ./
 
 Then check out where your NFSROOT is located:


@@ -643,10 +644,10 @@ FAI_DEBOOTSTRAP:
   GRML_LIVE_SOURCES="
   deb http://localhost:3142/deb.grml.org grml-stable  main
   deb http://localhost:3142/deb.grml.org grml-testing main
   GRML_LIVE_SOURCES="
   deb http://localhost:3142/deb.grml.org grml-stable  main
   deb http://localhost:3142/deb.grml.org grml-testing main

-  deb http://localhost:3142/ftp.de.debian.org/debian etch main contrib non-free
+  deb http://localhost:3142/ftp.de.debian.org/debian lenny main contrib non-free

   "
   [...]
   "
   [...]

-  FAI_DEBOOTSTRAP="etch http://localhost:3142/ftp.de.debian.org/debian etch main contrib non-free"
+  FAI_DEBOOTSTRAP="lenny http://localhost:3142/ftp.de.debian.org/debian lenny main contrib non-free"

 
 Make sure apt-cacher is running (/etc/init.d/apt-cacher restart). That's it.
 All downloaded files will be cached in /var/cache/apt-cacher/ now.
 
 Make sure apt-cacher is running (/etc/init.d/apt-cacher restart). That's it.
 All downloaded files will be cached in /var/cache/apt-cacher/ now.


@@ -662,9 +663,9 @@ FAI_DEBOOTSTRAP:
   GRML_LIVE_SOURCES="
   deb http://localhost:9999/grml            grml-stable  main
   deb http://localhost:9999/grml            grml-testing main
   GRML_LIVE_SOURCES="
   deb http://localhost:9999/grml            grml-stable  main
   deb http://localhost:9999/grml            grml-testing main

-  deb http://localhost:9999/debian etch     main contrib non-free
+  deb http://localhost:9999/debian lenny    main contrib non-free

   "
   "

-  FAI_DEBOOTSTRAP="etch http://localhost:9999/debian"
+  FAI_DEBOOTSTRAP="lenny http://localhost:9999/debian"

 
 Configure approx:
 
 
 Configure approx:
 

diff --git a/etc/grml/fai/apt/preferences b/etc/grml/fai/apt/preferences
index 2004ece..e985f13 100644 (file)
--- a/etc/grml/fai/apt/preferences
+++ b/etc/grml/fai/apt/preferences
@@ -15,9 +15,7 @@ Pin-Priority: 995
 Package: *
 Pin: origin deb.grml.org
 Pin-Priority: 994
 Package: *
 Pin: origin deb.grml.org
 Pin-Priority: 994

-

 // debian unstable pool (default):
 // debian unstable pool (default):

-Package: *
-Pin: release a=unstable,o=Debian
-Pin-Priority: 991
-
+//Package: *
+//Pin: release a=unstable,o=Debian
+//Pin-Priority: 991

diff --git a/etc/grml/fai/apt/sources.list b/etc/grml/fai/apt/sources.list
index 4bf5efd..ff9fae6 100644 (file)
--- a/etc/grml/fai/apt/sources.list
+++ b/etc/grml/fai/apt/sources.list
@@ -1,3 +1,3 @@
 deb http://deb.grml.org/            grml-stable  main
 deb http://deb.grml.org/            grml-testing main
 deb http://deb.grml.org/            grml-stable  main
 deb http://deb.grml.org/            grml-testing main

-deb http://ftp.de.debian.org/debian etch         main contrib non-free
+deb http://ftp.de.debian.org/debian lenny        main contrib non-free

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
index 05afd85..0b0fe17 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
+++ b/etc/grml/fai/config/scripts/GRMLBASE/05-hostname
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 16 21:52:23 CET 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
index 98ea666..16283a4 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/10-build-initramfs
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 16 19:11:33 CET 2007 [mika]

 ################################################################################
 
 set -e
 ################################################################################
 
 set -e

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index bef142c..8ee397f 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Sep 28 20:08:14 CEST 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index eb70e40..4199f70 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Mon Sep 17 14:14:36 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index 47d1525..66c5680 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Thu May 08 15:30:20 CEST 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
index 80f58d9..6638878 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
+++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Sep 16 23:09:08 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/31-motd b/etc/grml/fai/config/scripts/GRMLBASE/31-motd
index 679c95f..e24123c 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/31-motd
+++ b/etc/grml/fai/config/scripts/GRMLBASE/31-motd
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Wed Sep 19 20:13:01 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
index d98b582..6f52a12 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
+++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 16 21:56:07 CET 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 5e5cad7..efb6cbd 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Sep 28 20:08:30 CEST 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
index 5ee9c76..8038cc0 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
+++ b/etc/grml/fai/config/scripts/GRMLBASE/34-hosts
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sat Oct 06 12:35:30 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/35-network b/etc/grml/fai/config/scripts/GRMLBASE/35-network
index 93a1289..0d39adc 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/35-network
+++ b/etc/grml/fai/config/scripts/GRMLBASE/35-network
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Sep 16 23:02:18 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
index 6e68b6e..7f4e26a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
+++ b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Jan 20 19:35:25 CET 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
index 5a1a8d5..0d5783a 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
+++ b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Dec 16 21:54:29 CET 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index e64a7c9..d8487b3 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Mon Sep 29 14:16:38 CEST 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
index 25c88ab..1cd03ed 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
+++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Fri Dec 21 23:22:17 CET 2007 [mika]

 ################################################################################
 
 HOSTNAME=''
 ################################################################################
 
 HOSTNAME=''

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index 4d2051b..06518e9 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Fri Dec 21 21:40:25 CET 2007 [mika]

 ################################################################################
 
 set -e
 ################################################################################
 
 set -e

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
index 1a2f187..cf2be94 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
+++ b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Jan 20 00:25:52 CET 2008 [mika]

 ################################################################################
 
 set -e
 ################################################################################
 
 set -e

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
index b4078be..73d99d6 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sat Apr 12 21:35:01 CEST 2008 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 57756d2..6b21674 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -4,7 +4,6 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Sun Nov 04 12:12:57 CET 2007 [mika]

 ################################################################################
 
 # misc stuff
 ################################################################################
 
 # misc stuff

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot.deborphan b/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
index fd7e4a1..13e2291 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
+++ b/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
@@ -4,7 +4,6 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Sat Sep 06 20:03:58 CEST 2008 [mika]

 ################################################################################
 
 # remove all packages not necessary anymore:
 ################################################################################
 
 # remove all packages not necessary anymore:

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup b/etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup
index abea847..2a46dd5 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup
+++ b/etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup
@@ -4,7 +4,6 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Wed Sep 19 13:38:49 CEST 2007 [mika]

 ################################################################################
 
 # misc stuff
 ################################################################################
 
 # misc stuff

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot.online b/etc/grml/fai/grml/grml_cleanup_chroot.online
index 7d277eb..d80c882 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot.online
+++ b/etc/grml/fai/grml/grml_cleanup_chroot.online
@@ -4,7 +4,6 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Wed Sep 19 20:07:43 CEST 2007 [mika]

 ################################################################################
 
 # misc stuff
 ################################################################################
 
 # misc stuff

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot.remove_docs b/etc/grml/fai/grml/grml_cleanup_chroot.remove_docs
index f5ce327..a68b1b4 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot.remove_docs
+++ b/etc/grml/fai/grml/grml_cleanup_chroot.remove_docs
@@ -3,7 +3,6 @@
 # Purpose:       remove docs in grml chroot
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # License:       This file is licensed under the GPL v2.
 # Purpose:       remove docs in grml chroot
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # License:       This file is licensed under the GPL v2.

-# Latest change: Wed Sep 19 13:38:58 CEST 2007 [mika]

 ################################################################################
 
 . /etc/grml/lsb-functions || exit 6
 ################################################################################
 
 . /etc/grml/lsb-functions || exit 6

diff --git a/etc/grml/fai/make-fai-nfsroot.conf b/etc/grml/fai/make-fai-nfsroot.conf
index 3aeb383..20e41b6 100644 (file)
--- a/etc/grml/fai/make-fai-nfsroot.conf
+++ b/etc/grml/fai/make-fai-nfsroot.conf
@@ -13,7 +13,7 @@ TFTPROOT=/srv/tftp/fai
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
 
 # debootstrap commandline
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
 
 # debootstrap commandline

-FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian"
+FAI_DEBOOTSTRAP="lenny http://ftp.de.debian.org/debian"

 
 # which options do you want to use for debootstrap?
 FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
 
 # which options do you want to use for debootstrap?
 FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 16b02ed..a6b18b4 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Fri Jan 11 01:55:54 CET 2008 [mika]

 ################################################################################
 
 # Main output directory
 ################################################################################
 
 # Main output directory


@@ -31,8 +30,8 @@ ISO_OUTPUT="$OUTPUT/grml_isos"
 # Default: unset (so do not remove the logfile(s))
 #ZERO_FAI_LOGFILE='1'
 
 # Default: unset (so do not remove the logfile(s))
 #ZERO_FAI_LOGFILE='1'
 

-# Which Debian suite to you want to use? Unless it is set it defaults to "etch"
-# Supported values are: etch, lenny, sid
+# Which Debian suite to you want to use? Unless it is set it defaults to "lenny"
+# Supported values are: etch, lenny, squeeze, sid

 # SUITE="sid"
 
 # Which FAI classes do you want to use by default?#
 # SUITE="sid"
 
 # Which FAI classes do you want to use by default?#


@@ -53,7 +52,7 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386"
 # /etc/grml/fai/apt/sources.list provides by default.
 # Use the variable like your /etc/apt/sources.list looks like.
 #GRML_LIVE_SOURCES="
 # /etc/grml/fai/apt/sources.list provides by default.
 # Use the variable like your /etc/apt/sources.list looks like.
 #GRML_LIVE_SOURCES="

-#deb http://192.168.1.112/debian     etch         main contrib non-free
+#deb http://192.168.1.112/debian     lenny        main contrib non-free

 #deb http://deb.grml.org/            grml-stable  main
 #deb http://deb.grml.org/            grml-testing main
 #deb http://ftp.de.debian.org/debian etch         main contrib non-free
 #deb http://deb.grml.org/            grml-stable  main
 #deb http://deb.grml.org/            grml-testing main
 #deb http://ftp.de.debian.org/debian etch         main contrib non-free


@@ -64,7 +63,7 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386"
 # taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf
 # will be updated by grml-live on-the-fly.
 # Usage: "<suite> <mirror>"
 # taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf
 # will be updated by grml-live on-the-fly.
 # Usage: "<suite> <mirror>"

-# FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian"
+# FAI_DEBOOTSTRAP="lenny http://ftp.de.debian.org/debian"

 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:
 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:

diff --git a/etc/zsh/completion.d/_grml-live b/etc/zsh/completion.d/_grml-live
index 1ef09a1..ebdf81f 100644 (file)
--- a/etc/zsh/completion.d/_grml-live
+++ b/etc/zsh/completion.d/_grml-live
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Thu, 01 Nov 2007 14:00:40 +0100 [ft]

 ################################################################################
 
 _grmllive_flavours() { #{{{
 ################################################################################
 
 _grmllive_flavours() { #{{{


@@ -48,7 +47,7 @@ _grmllive_suites() { #{{{
   local -a suites
 
   suites=(
   local -a suites
 
   suites=(

-    etch    lenny   sid
+    etch lenny squeeze sid

   )
   _wanted list expl 'Debian suite' compadd ${expl} -- ${suites}
 }
   )
   _wanted list expl 'Debian suite' compadd ${expl} -- ${suites}
 }

diff --git a/grml-live b/grml-live
index 58dc908..ba87869 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -39,7 +39,7 @@ Usage: $PN [options, see as follows]
    -o <output_directory>   main output directory of the build process
    -q                      skip mksquashfs
    -r <release_name<       release name
    -o <output_directory>   main output directory of the build process
    -q                      skip mksquashfs
    -r <release_name<       release name

-   -s <suite>              Debian suite; values: etch, lenny, sid
+   -s <suite>              Debian suite; values: etch, lenny, squeeze, sid

    -t <template_directory> place of the templates
    -u                      update existing chroot instead of rebuilding it from scratch
    -v <version_number>     specify version number of the release
    -t <template_directory> place of the templates
    -u                      update existing chroot instead of rebuilding it from scratch
    -v <version_number>     specify version number of the release


@@ -356,7 +356,7 @@ if [ -n "$SUITE" ] ; then
    for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
        if [ -n "$file" ] ; then
           sed -i "s/SUITE=.*/SUITE=\"$SUITE\"/" $LIVE_CONF
    for file in "$LIVE_CONF" "$CONFIG" "$LOCAL_CONFIG" ; do
        if [ -n "$file" ] ; then
           sed -i "s/SUITE=.*/SUITE=\"$SUITE\"/" $LIVE_CONF

-          DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\ testing\ \|\ sid\ \|\ unstable\ "
+          DIST="\|\ etch\ \|\ stable\ \|\ lenny\ \|\ squeeze \|\ testing\ \|\ sid\ \|\ unstable\ "

           sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $file
        fi
    done
           sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" $file
        fi
    done

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index a42a18e..ba5f749 100755 (executable)
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Schierl <schierlm@gmx.de>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Schierl <schierlm@gmx.de>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Feb 24 14:23:27 CET 2008 [mika]

 ################################################################################
 # DISCLAIMER:
 # this script currently lacks LOTS of error checking code... any help welcome...
 ################################################################################
 # DISCLAIMER:
 # this script currently lacks LOTS of error checking code... any help welcome...

diff --git a/scripts/repodiff.pl b/scripts/repodiff.pl
index 0752cfa..3c62787 100755 (executable)
--- a/scripts/repodiff.pl
+++ b/scripts/repodiff.pl
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Alexander Wirt <formorer@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Alexander Wirt <formorer@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Sun Oct 28 18:00:49 CET 2007 [mika]

 ################################################################################
 # Notice: adjust $c_file[12] according to your needs, by default the script
 # compares the i386 pool with the amd64 pool of grml.
 ################################################################################
 # Notice: adjust $c_file[12] according to your needs, by default the script
 # compares the i386 pool with the amd64 pool of grml.