Update manpage, depends

diff --git a/config b/config
index 6bbc604..e43c55a 100644 (file)
--- a/config
+++ b/config
@@ -47,7 +47,7 @@ GROOT=''
 MIRROR='ftp://ftp.debian.de/debian'
 
 # specify entry which should be used for /etc/apt/sources.list,
 MIRROR='ftp://ftp.debian.de/debian'
 
 # specify entry which should be used for /etc/apt/sources.list,

-# if empty then any existing /etc/apt/sources.list will be taken
+# if empty then existing /etc/apt/sources.list will be taken

 CHROOTMIRROR='ftp://ftp.debian.de/debian'
 
 # add grml repository to /etc/apt/sources.list
 CHROOTMIRROR='ftp://ftp.debian.de/debian'
 
 # add grml repository to /etc/apt/sources.list

diff --git a/debian/changelog b/debian/changelog
index 74c32ec..777317e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 grml-debootstrap (0.6) unstable; urgency=low
 
 grml-debootstrap (0.6) unstable; urgency=low
 

+  * Support Debian release with codename 'lenny'. Depend on
+    debootstrap/cdebootstrap versions supporting lenny therefore.

   * Split all the code into separate functions.
   * Export LANG=C and LC_ALL=C as we don't have the locales inside
     the chroot when running grml-debootstrap. (Just a cosmetic
   * Split all the code into separate functions.
   * Export LANG=C and LC_ALL=C as we don't have the locales inside
     the chroot when running grml-debootstrap. (Just a cosmetic


@@ -7,6 +9,8 @@ grml-debootstrap (0.6) unstable; urgency=low
     dpkg.)
   * Always assume architecture of the running system (overwriting
     via $ARCH is still supported of course).
     dpkg.)
   * Always assume architecture of the running system (overwriting
     via $ARCH is still supported of course).

+  * Write variables from grml-debootstrap to /etc/debootstrap/variables
+    and provide it to chroot-script.

   * Support stages. [Closes: issue151]
 
  -- Michael Prokop <mika@grml.org>  Mon,  9 Apr 2007 14:35:21 +0200
   * Support stages. [Closes: issue151]
 
  -- Michael Prokop <mika@grml.org>  Mon,  9 Apr 2007 14:35:21 +0200

diff --git a/debian/control b/debian/control
index 71a96c1..863a97e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XS-Vcs-hg: http://hg.grml.org/grml-debootstrap
 
 Package: grml-debootstrap
 Architecture: all
 
 Package: grml-debootstrap
 Architecture: all

-Depends: ${shlibs:Depends}, ${misc:Depends}, debootstrap | cdebootstrap, grml-etc-core
+Depends: ${shlibs:Depends}, ${misc:Depends}, debootstrap (>= 0.3.3.3) | cdebootstrap (>= 0.3.16), grml-etc-core

 Description: wrapper around debootstrap for installing plain Debian via grml
  This package provides a wrapper suite around deboostrap and
  cdebootstrap for installing a plain Debian system via grml.
 Description: wrapper around debootstrap for installing plain Debian via grml
  This package provides a wrapper suite around deboostrap and
  cdebootstrap for installing a plain Debian system via grml.


@@ -16,9 +16,11 @@ Description: wrapper around debootstrap for installing plain Debian via grml
  All you have to do is adjust a few variables in configuration
  file /etc/debootstrap/config and invoke grml-debootstrap then.
  A plain and base Debian system will be installed on the given
  All you have to do is adjust a few variables in configuration
  file /etc/debootstrap/config and invoke grml-debootstrap then.
  A plain and base Debian system will be installed on the given

- device then. Customization of this process is possible as well.
+ device (or directory) then. Customization of this process is
+ possible as well.

  .
  Supported Debian GNU/Linux releases:
  .
  Supported Debian GNU/Linux releases:

-   * Sarge (3.1)
-   * Etch  (4.0)
-   * Sid   (4.0 unstable)
+   * Sarge (3.1) [old-stable]
+   * Etch  (4.0) [stable]
+   * Lenny (4.0) [testing]
+   * Sid   (4.0 unstable) [unstable]

diff --git a/debian/grml-debootstrap.8 b/debian/grml-debootstrap.8
index d5e0801..1782f14 100644 (file)
--- a/debian/grml-debootstrap.8
+++ b/debian/grml-debootstrap.8
@@ -18,7 +18,8 @@ file /etc/debootstrap/config and invoke grml-debootstrap without
 any further options then.
 
 A plain and base Debian system will be installed on the given
 any further options then.
 
 A plain and base Debian system will be installed on the given

-device then. Customization of this process is possible as well.
+device (or directory) then. Customization of this process is
+possible as well.

 .SH OPTIONS
 grml-debootstrap supports the following options:
 .TP
 .SH OPTIONS
 grml-debootstrap supports the following options:
 .TP


@@ -32,6 +33,27 @@ Show version of program.
 .B /etc/debootstrap/config
 Main configuration file. You have to adjust it according to your needs
 before you are able to run grml-debootstrap.
 .B /etc/debootstrap/config
 Main configuration file. You have to adjust it according to your needs
 before you are able to run grml-debootstrap.

+.TP
+.B /etc/debootstrap/chroot-script
+The script executed within the new Debian system as soon as the main system
+has been installed via [c]debootstrap.
+.TP
+.B /etc/debootstrap/locale.gen
+Defines the default locales used for generating locales via locale-gen.
+.TP
+.B /etc/debootstrap/packages
+Defines the software packages which should be installed in the new
+Debian system by default.
+.TP
+.B /etc/debootstrap/stages/
+The default directory for storing information about executed stages. Every
+single function of grml-debootstrap will write 'done' to the stages directory
+into a file named as the function itself if it has been executed sucessfully.
+You can adjust the location of the directory via configuration variable STAGES
+via /etc/debootstrap/config.  Please notice that you have to remove the stages
+directory on your own if you want to re-execute grml-deboostrap after running it
+successfully once. This should avoid recurrent execution by error of
+grml-debootstrap (which might delete present data).

 .SH CUSTOMIZATION
 
 You can control execution of grml-debootstrap via adjusting
 .SH CUSTOMIZATION
 
 You can control execution of grml-debootstrap via adjusting


@@ -49,12 +71,20 @@ Current status:
   +----------------+-------------+-----------------+
   | Release / Tool | debootstrap | cdebootstrap    |
   +----------------+-------------+-----------------+
   +----------------+-------------+-----------------+
   | Release / Tool | debootstrap | cdebootstrap    |
   +----------------+-------------+-----------------+

+  | Sarge          |  works [1]  |  works [1]      |
+  +----------------+-------------+-----------------+

   | Etch           |  works      |  works          |
   +----------------+-------------+-----------------+
   | Etch           |  works      |  works          |
   +----------------+-------------+-----------------+

-  | Lenny          |       not yet tested          |
+  | Lenny          |  works      |  works          |

   +----------------+-------------+-----------------+
   | Sid            |  works      |  works          |
   +----------------+-------------+-----------------+
   +----------------+-------------+-----------------+
   | Sid            |  works      |  works          |
   +----------------+-------------+-----------------+

+
+[1] Please notice that Sarge is the current old-stable within Debian.
+grml-debootstrap can handle the release but you really should not
+use Sarge anymore unless you really know what you are doing. Choose
+Etch instead.
+

 .SH BUGS
 Probably. Please send bugreports to Michael Prokop <mika@grml.org>.
 .SH SEE ALSO
 .SH BUGS
 Probably. Please send bugreports to Michael Prokop <mika@grml.org>.
 .SH SEE ALSO