freshen up some of the examples

git-svn-id: http://emdebian.org/svn/current@8459 563faec7-e20c-0410-992a-a66f704d0ccd

examples/chroot.conf

@@ -6,7 +6,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -18,9 +18,9 @@ unpack=true
 # to stop daemons from starting during configuration.
 setupscript=/usr/share/multistrap/chroot.sh
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian
+bootstrap=Debian
 aptsources=Debian
 
 [Debian]

examples/chroot.sh

@@ -3,7 +3,7 @@
 set -e
 
 # The script is called with the following arguments:
-# $1 = $DIR  - the top directory of the debootstrapped system
+# $1 = $DIR  - the top directory of the bootstrapped system
 # $2 = $ARCH - the specified architecture, already checked with dpkg-architecture.
 # setup.sh needs to be executable.
 

examples/full.conf

@@ -9,7 +9,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -55,9 +55,9 @@ tarballname=
 # extract all downloaded archives (default is true)
 unpack=true
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian Foreign
+bootstrap=Debian Foreign
 aptsources=Debian
 
 [Debian]

examples/jessie.conf

@@ -0,0 +1,27 @@
+# Example multistrap configuration file for the squeeze shortcut.
+
+[General]
+arch=
+directory=
+# same as --tidy-up option if set to true
+cleanup=true
+# same as --no-auth option if set to true
+# keyring packages listed in each bootstrap will
+# still be installed.
+noauth=false
+# whether to add the /suite to be explicit about where apt
+# needs to look for packages. Default is false.
+explicitsuite=false
+# extract all downloaded archives (default is true)
+unpack=true
+# the order of sections is not important.
+# the bootstrap option determines which repository
+# is used to calculate the list of Priority: required packages.
+bootstrap=Debian
+aptsources=Debian
+
+[Debian]
+packages=apt
+source=http://cdn.debian.net/debian
+keyring=debian-archive-keyring
+suite=jessie

examples/multiarch.conf

@@ -6,7 +6,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=true
 # whether to add the /suite to be explicit about where apt
@@ -17,9 +17,9 @@ unpack=true
 # enable MultiArch for the specified architectures
 multiarch=armel mipsel
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian Foreign Test
+bootstrap=Debian Foreign Test
 aptsources=Debian
 
 [Debian]

examples/multistrap-example.conf

@@ -1,5 +1,5 @@
 # Example multistrap configuration file
-# to create a plain lenny debootstrap for amd64
+# to create a plain Debian lenny bootstrap for amd64
 
 [General]
 arch=amd64
@@ -7,7 +7,7 @@ directory=/tmp/multistrap/
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -16,9 +16,9 @@ explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian
+bootstrap=Debian
 aptsources=Debian
 
 [Debian]

examples/setup.sh

@@ -10,7 +10,7 @@ set -e
 
 # The script is called with the following arguments:
 
-# $1 = $DIR  - the top directory of the debootstrapped system
+# $1 = $DIR  - the top directory of the bootstrapped system
 # $2 = $ARCH - the specified architecture, already checked with dpkg-architecture.
 
 # setup.sh needs to be executable.

examples/sid.conf

@@ -6,7 +6,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -15,9 +15,9 @@ explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian
+bootstrap=Debian
 aptsources=Debian
 
 [Debian]

examples/squeeze.conf

@@ -6,7 +6,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -15,9 +15,9 @@ explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian
+bootstrap=Debian
 aptsources=Debian
 
 [Debian]

examples/wheezy.conf

@@ -6,7 +6,7 @@ directory=
 # same as --tidy-up option if set to true
 cleanup=true
 # same as --no-auth option if set to true
-# keyring packages listed in each debootstrap will
+# keyring packages listed in each bootstrap will
 # still be installed.
 noauth=false
 # whether to add the /suite to be explicit about where apt
@@ -15,9 +15,9 @@ explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
 # the order of sections is not important.
-# the debootstrap option determines which repository
+# the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian
+bootstrap=Debian
 aptsources=Debian
 
 [Debian]