[PATCH 5/7] Clean up chroot.conf and buildchroot(|-testing|-stable).conf

Jon Severinsson <[email protected]>
Newsgroups gmane.linux.debian.devel.embedded
Message-ID <[email protected]>
---
 examples/buildchroot-stable.conf  |   10 ++++++----
 examples/buildchroot-testing.conf |    4 +++-
 examples/buildchroot.conf         |    5 ++++-
 examples/chroot.conf              |    4 ++--
 4 filer ändrade, 15 tillägg(+), 8 borttagningar(-)

diff --git a/examples/buildchroot-stable.conf b/examples/buildchroot-stable.conf
index f8abaa02..4268b797 100644
--- a/examples/buildchroot-stable.conf
+++ b/examples/buildchroot-stable.conf
@@ -1,5 +1,4 @@
 # Example multistrap configuration file for a build chroot
-# Need to use cascading to select the toolchain for a cross arch.
 
 [General]
 arch=
@@ -15,13 +14,16 @@ noauth=false
 explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
+# this setupscript is just for native chroots
+# to stop daemons from starting during configuration.
+setupscript=/usr/share/multistrap/chroot.sh
 # the order of sections is not important.
 # the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-bootstrap=Base
-aptsources=Base
+bootstrap=Debian
+aptsources=Debian
 
-[Base]
+[Debian]
 packages=apt build-essential fakeroot
 source=http://cdn.debian.net/debian
 keyring=debian-archive-keyring
diff --git a/examples/buildchroot-testing.conf b/examples/buildchroot-testing.conf
index 62894495..f5773a3f 100644
--- a/examples/buildchroot-testing.conf
+++ b/examples/buildchroot-testing.conf
@@ -1,5 +1,4 @@
 # Example multistrap configuration file for a build chroot
-# Need to use cascading to select the toolchain for a cross arch.
 
 [General]
 arch=
@@ -15,6 +14,9 @@ noauth=false
 explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
+# this setupscript is just for native chroots
+# to stop daemons from starting during configuration.
+setupscript=/usr/share/multistrap/chroot.sh
 # the order of sections is not important.
 # the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
diff --git a/examples/buildchroot.conf b/examples/buildchroot.conf
index f8248573..96663c7d 100644
--- a/examples/buildchroot.conf
+++ b/examples/buildchroot.conf
@@ -1,4 +1,4 @@
-# Example multistrap configuration file for a sid build chroot
+# Example multistrap configuration file for a build chroot
 
 [General]
 arch=
@@ -14,6 +14,9 @@ noauth=false
 explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
+# this setupscript is just for native chroots
+# to stop daemons from starting during configuration.
+setupscript=/usr/share/multistrap/chroot.sh
 # the order of sections is not important.
 # the bootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
diff --git a/examples/chroot.conf b/examples/chroot.conf
index 2956d3ad..682a1f01 100644
--- a/examples/chroot.conf
+++ b/examples/chroot.conf
@@ -1,4 +1,4 @@
-# Example multistrap configuration file for native chroots.
+# Example multistrap configuration file for a native chroot.
 
 [General]
 arch=
@@ -27,4 +27,4 @@ aptsources=Debian
 packages=apt
 source=http://cdn.debian.net/debian
 keyring=debian-archive-keyring
-suite=squeeze
+suite=unstable
-- 
1.7.10.4


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.