From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 24 Nov 2010 05:59:05 +0000 (-0500)
Subject: apparently there is no substitution for chroot_sources but there is one for config... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dcc7368ad6daf8839d52b090ba62a567958a2b1b;p=neurodebian.git

apparently there is no substitution for chroot_sources but there is one for config/repositories
---

diff --git a/live/auto/config b/live/auto/config
index 4cc6b4b..58ad281 100755
--- a/live/auto/config
+++ b/live/auto/config
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 # the Debian release to use as a basis for the live-cd
 nd_basedist="squeeze"
@@ -23,9 +23,10 @@ lb config noauto \
   --iso-application "NeuroDebian Live" \
   --iso-preparer "NeuroDebian v.{nd_version}; http://neuro.debian.net" \
   --iso-publisher "NeuroDebian project; http://neuro.debian.net" \
-  --mirror-bootstrap "$mirror/debian/" \
+  --mirror-bootstrap "${deb_mirror}/debian/" \
   --mirror-chroot "${deb_mirror}/debian/" \
   --mirror-chroot-security "${deb_mirror}/security/" \
+  --repositories neuro.debian.net \
   --security true \
   --username brain \
   --win32-loader enabled \
diff --git a/live/config/chroot_sources/neurodebian.binary b/live/config/chroot_sources/neurodebian.binary
deleted file mode 120000
index 36f927c..0000000
--- a/live/config/chroot_sources/neurodebian.binary
+++ /dev/null
@@ -1 +0,0 @@
-neurodebian.chroot
\ No newline at end of file
diff --git a/live/config/chroot_sources/neurodebian.binary.gpg b/live/config/chroot_sources/neurodebian.binary.gpg
deleted file mode 120000
index fddc155..0000000
--- a/live/config/chroot_sources/neurodebian.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../keys/neurodebian-archive-keyring.gpg
\ No newline at end of file
diff --git a/live/config/chroot_sources/neurodebian.chroot b/live/config/chroot_sources/neurodebian.chroot
deleted file mode 100644
index f7ddad1..0000000
--- a/live/config/chroot_sources/neurodebian.chroot
+++ /dev/null
@@ -1,9 +0,0 @@
-# NeuroDebian Software
-deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
-#deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
-
-# NeuroDebian Data
-deb http://neuro.debian.net/debian data @ARCHIVE_AREAS@
-#deb-src http://neuro.debian.net/debian data @ARCHIVE_AREAS@
-
-
diff --git a/live/config/chroot_sources/neurodebian.chroot.gpg b/live/config/chroot_sources/neurodebian.chroot.gpg
deleted file mode 120000
index fddc155..0000000
--- a/live/config/chroot_sources/neurodebian.chroot.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../keys/neurodebian-archive-keyring.gpg
\ No newline at end of file
diff --git a/live/config/repositories/neuro.debian.net.gpg b/live/config/repositories/neuro.debian.net.gpg
new file mode 120000
index 0000000..fddc155
--- /dev/null
+++ b/live/config/repositories/neuro.debian.net.gpg
@@ -0,0 +1 @@
+../../../keys/neurodebian-archive-keyring.gpg
\ No newline at end of file
diff --git a/live/config/repositories/neuro.debian.net.list b/live/config/repositories/neuro.debian.net.list
new file mode 100644
index 0000000..f7ddad1
--- /dev/null
+++ b/live/config/repositories/neuro.debian.net.list
@@ -0,0 +1,9 @@
+# NeuroDebian Software
+deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
+#deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
+
+# NeuroDebian Data
+deb http://neuro.debian.net/debian data @ARCHIVE_AREAS@
+#deb-src http://neuro.debian.net/debian data @ARCHIVE_AREAS@
+
+