git://git.onelab.eu
/
bootcd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc78772
)
support RC1 configs
author
Mark Huang
<mlhuang@cs.princeton.edu>
Mon, 4 Dec 2006 20:07:18 +0000
(20:07 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Mon, 4 Dec 2006 20:07:18 +0000
(20:07 +0000)
newbuild.sh
patch
|
blob
|
history
diff --git
a/newbuild.sh
b/newbuild.sh
index
033d56e
..
076ed5c
100755
(executable)
--- a/
newbuild.sh
+++ b/
newbuild.sh
@@
-6,7
+6,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
-# $Id:
build.sh,v 1.42 2006/11/22 20:40:48 mef
Exp $
+# $Id:
newbuild.sh,v 1.1 2006/12/02 04:55:53 mlhuang
Exp $
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@
-22,6
+22,15
@@
else
exit 1
fi
exit 1
fi
+# This support for backwards compatibility can be taken out in the
+# future. RC1 based MyPLCs set $PLC_BOOT_SSL_CRT in the plc_config
+# file, but >=RC2 based bootcd assumes that $PLC_BOOT_CA_SSL_CRT is
+# set.
+if [ -z "$PLC_BOOT_CA_SSL_CRT" -a ! -z "$PLC_BOOT_SSL_CRT" ] ; then
+ PLC_BOOT_CA_SSL_CRT=$PLC_BOOT_SSL_CRT
+ PLC_API_CA_SSL_CRT=$PLC_API_SSL_CRT
+fi
+
output="$PLC_NAME-BootCD-$BOOTCD_VERSION.iso"
usage()
output="$PLC_NAME-BootCD-$BOOTCD_VERSION.iso"
usage()