Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500

[debian6500.git] / simple-cdd / simple-cdd.conf

diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf
index ac0a14274d92f224bdbf8855ebfddf4f0e1e3378..5432ae9c4c7277425d7ce14f76b32cf0df27affb 100644 (file)
--- a/simple-cdd/simple-cdd.conf
+++ b/simple-cdd/simple-cdd.conf
@@ -3,13 +3,15 @@
 # normally we should use the built-in simple_cdd_dir but I have doubts.. Let's use this.
 # you'll probably want to change that
 working_dir="/home/trc6500/cdd-attempt"
+working_dir=$(pwd)
 
 # Profiles to include on the CD
 profiles="trc6500"
 build_profiles="trc6500"
 auto_profiles="trc6500"
 
-do_mirror="false"
+do_mirror="true"
+debian_mirror="ftp://integration2/debian"
 profiles_udeb_dist="wheezy"
 mirror_component="main"
 mirror_tools="wget"
@@ -20,9 +22,10 @@ mirror_tools="wget"
 local_packages="${working_dir}/local_packages"
 
 # we'll unpack that during install
-# for now, this includes : master.tar, myrc.local, TRC6500.pub, local_packages/firmware-bnx2
+# for now, this includes : myrc.local, TRC6500.pub, local_packages/firmware-bnx2, and the deb package with all the master files
 # additionally, the bnx2 firmware is there because it resists being added to local_packages for some odd reason. So we'll install it by hand.
-all_extras="${working_dir}/master.tar,${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb"
+#all_extras="${working_dir}/master.tar.gz,${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb"
+all_extras="${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb, $(find ${working_dir}/.. -maxdepth 1 -name trc6500-master-file\*.deb|sort|tail -1)"
 
 # added value
 export SPLASHPNG="${working_dir}/splash-thales.png"