[Glibc-bsd-commits] r1328 - trunk/web/cdscripts

[Robert Millan]

Author: rmh
Date: 2006-03-15 14:44:25 +0000 (Wed, 15 Mar 2006)
New Revision: 1328

Added:
   trunk/web/cdscripts/config
Modified:
   trunk/web/cdscripts/netinst.sh
   trunk/web/cdscripts/tarball.sh
Log:
Split tunable parameters in a separate config file.

Added: trunk/web/cdscripts/config
===================================================================
--- trunk/web/cdscripts/config	2006-03-15 14:38:15 UTC (rev 1327)
+++ trunk/web/cdscripts/config	2006-03-15 14:44:25 UTC (rev 1328)
@@ -0,0 +1,10 @@
+# stuff you might want to override
+cpu=`dpkg-architecture -qDEB_HOST_GNU_CPU`
+distribution=Debian
+
+# common stuff
+pwd=`pwd`
+export GZIP=--best
+distribution_lowcase=`echo ${distribution} | tr [A-Z] [a-z] | tr " " "_"`
+version=`date +%Y%m%d`
+cdname=${distribution_lowcase}-${version}-kfreebsd-${cpu}-install.iso

Modified: trunk/web/cdscripts/netinst.sh
===================================================================
--- trunk/web/cdscripts/netinst.sh	2006-03-15 14:38:15 UTC (rev 1327)
+++ trunk/web/cdscripts/netinst.sh	2006-03-15 14:44:25 UTC (rev 1328)
@@ -7,17 +7,8 @@
 
 set -ex
 
-if [ "$1" = "" ] ; then
-  distribution=Debian
-else
-  distribution="$1"
-fi
-distribution_lowcase=`echo ${distribution} | tr [A-Z] [a-z] | tr " " "_"`
+. config
 
-version=`date +%Y%m%d`
-cpu=`dpkg-architecture -qDEB_HOST_ARCH_CPU`
-cdname=${distribution_lowcase}-${version}-kfreebsd-${cpu}-install.iso
-
 if [ "$UID" != "0" ] ; then
   sudo $0 $@
   exit 0

Modified: trunk/web/cdscripts/tarball.sh
===================================================================
--- trunk/web/cdscripts/tarball.sh	2006-03-15 14:38:15 UTC (rev 1327)
+++ trunk/web/cdscripts/tarball.sh	2006-03-15 14:44:25 UTC (rev 1328)
@@ -18,9 +18,9 @@
   exit 1
 fi
 
+. config
+
 tmp=`mktemp -d`
-pwd=`pwd`
-export GZIP=--best
 
 for i in dhcp3-client popularity-contest ; do
   if ! grep -qx $i /etc/crosshurd/packages/{common,kfreebsd-gnu} ; then
@@ -32,7 +32,7 @@
 if test -e base.tgz ; then
   tar --same-owner -xzpf base.tgz -C ${tmp}
 else
-  /usr/share/crosshurd/makehurddir.sh ${tmp} `dpkg-architecture -qDEB_HOST_GNU_CPU` kfreebsd-gnu
+  /usr/share/crosshurd/makehurddir.sh ${tmp} ${cpu} kfreebsd-gnu
 fi
 
 if test -e native-install ; then