Apply Frank's os id patch

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6549 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/DartConfiguration.tcl.in b/regress/DartConfiguration.tcl.in
index 7e208760b1a4cb2837ecb038a06c26e6c08753db..7f58820b14fc60ec3e12fc6c1e2596691b389139 100644 (file)
--- a/regress/DartConfiguration.tcl.in
+++ b/regress/DartConfiguration.tcl.in
@@ -1,7 +1,7 @@
 SourceDirectory: @srcdir@
 BuildDirectory: @regressdir@
 Site: @sitename@
-BuildName: bacula-@bversion@-@bdate@-@os@-@dbengine@
+BuildName: bacula-@bversion@-@bdate@-@dbengine@-@os@
 DropMethod: xmlrpc
 DropSite: http://regress.bacula.org:8081
 DropLocation: Bacula

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
index e66070c3c85febd5c4d8e3bf2fb21bfb28c178f9..f672ecc4fd69c372efc156077c538195bd2200b5 100755 (executable)
--- a/regress/scripts/create_sed
+++ b/regress/scripts/create_sed
@@ -14,7 +14,7 @@ srcdir=${BACULA_SOURCE}
 dirport=${BASEPORT}
 fdport=`expr ${BASEPORT} '+' 1`
 sdport=`expr ${BASEPORT} '+' 2`
-os=`uname -s`
+os=`uname -s`-`./scripts/get-os`
 dbengine=`echo ${WHICHDB} | sed -e 's/--with-//' -e 's/=.*//'`
 bversion=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 bdate=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`