From a94e562e8866f8e6986c6351de96a50bcd0f5ad2 Mon Sep 17 00:00:00 2001 From: codehelp Date: Fri, 26 Jul 2013 08:51:06 +0000 Subject: [PATCH] freshen up some of the examples git-svn-id: http://emdebian.org/svn/current@8459 563faec7-e20c-0410-992a-a66f704d0ccd --- examples/chroot.conf | 6 +++--- examples/chroot.sh | 2 +- examples/full.conf | 6 +++--- examples/jessie.conf | 27 +++++++++++++++++++++++++++ examples/multiarch.conf | 6 +++--- examples/multistrap-example.conf | 8 ++++---- examples/setup.sh | 2 +- examples/sid.conf | 6 +++--- examples/squeeze.conf | 6 +++--- examples/wheezy.conf | 6 +++--- 10 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 examples/jessie.conf diff --git a/examples/chroot.conf b/examples/chroot.conf index a96759d..2956d3a 100644 --- a/examples/chroot.conf +++ b/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] diff --git a/examples/chroot.sh b/examples/chroot.sh index e7b694d..e8f84c7 100755 --- a/examples/chroot.sh +++ b/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. diff --git a/examples/full.conf b/examples/full.conf index 8660609..1f8cb72 100644 --- a/examples/full.conf +++ b/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] diff --git a/examples/jessie.conf b/examples/jessie.conf new file mode 100644 index 0000000..3cdcca8 --- /dev/null +++ b/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 diff --git a/examples/multiarch.conf b/examples/multiarch.conf index 8d802f1..dfa7fd5 100644 --- a/examples/multiarch.conf +++ b/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] diff --git a/examples/multistrap-example.conf b/examples/multistrap-example.conf index ac0d0a7..4127627 100644 --- a/examples/multistrap-example.conf +++ b/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] diff --git a/examples/setup.sh b/examples/setup.sh index 2b45838..3fe918f 100755 --- a/examples/setup.sh +++ b/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. diff --git a/examples/sid.conf b/examples/sid.conf index 5d31830..28880ba 100644 --- a/examples/sid.conf +++ b/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] diff --git a/examples/squeeze.conf b/examples/squeeze.conf index c11dd62..6d3d3dc 100644 --- a/examples/squeeze.conf +++ b/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] diff --git a/examples/wheezy.conf b/examples/wheezy.conf index d04f590..935ea4e 100644 --- a/examples/wheezy.conf +++ b/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]