From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Mon, 14 Sep 2015 18:09:05 +0000 (+0200)
Subject: correct trc6500 master file
X-Git-Tag: debian_7.8.4~16
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=d4232c5c0cf4ec4c706722cb7379654185bf6248;hp=afe068d961881b470f923337a0c5c4626b9afce4;p=debian6500.git

correct trc6500 master file
---

diff --git a/master/etc/default/rproxy b/master/etc/default/rproxy
deleted file mode 100644
index 7b0dcda..0000000
--- a/master/etc/default/rproxy
+++ /dev/null
@@ -1,7 +0,0 @@
-# rproxy configure options
-
-# Should webconfig be enabled?
-SERVICE=yes
-
-# SITES: filename containing site declarations
-SITES=/etc/rproxy/sites.csv
diff --git a/master/etc/rproxy/sites.csv b/master/etc/rproxy/sites.csv
deleted file mode 100644
index 6589008..0000000
--- a/master/etc/rproxy/sites.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-# Host;portExt;portInt
-fe306-1;8110;80
-fe306-2;8120;80
-fe306-3;8130;80
-fe306-4;8140;80
-fe306-5;8150;80
-swg1;8231;80
-swg2;8232;80
diff --git a/simple-cdd/local_packages/webconfig_1.16.0-1_all.deb b/simple-cdd/local_packages/webconfig_1.16.0-1_all.deb
index 6b0e417..d335c7a 100644
Binary files a/simple-cdd/local_packages/webconfig_1.16.0-1_all.deb and b/simple-cdd/local_packages/webconfig_1.16.0-1_all.deb differ
diff --git a/simple-cdd/profiles/trc6500.postinst b/simple-cdd/profiles/trc6500.postinst
index 4a808e8..5670732 100755
--- a/simple-cdd/profiles/trc6500.postinst
+++ b/simple-cdd/profiles/trc6500.postinst
@@ -18,7 +18,7 @@ echo 'force-confnew' > /etc/dpkg/dpkg.cfg.d/trc6500
 
 # now we unpack our master archive and replace all those conf files and scripts and things
 echo 'Unpacking master config files..'
-dpkg -i /media/cdrom/simple-cdd/trc6500-master-files* # version-proof
+dpkg -i /media/cdrom/simple-cdd/trc6500-master-file* # version-proof
 chown root /etc/cron.d/getswitchtemp
 chown root /root/bin/get_switch_temperature
 echo 'Files unpacked.'
diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf
index ae6faff..5432ae9 100644
--- 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"
@@ -23,7 +25,7 @@ local_packages="${working_dir}/local_packages"
 # 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.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, ${working_dir}/deb_build/trc6500-master-files*.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"