"secure" build now works; moved /usr/lib/cryptobox-cd to /usr/share/cryptonas-live; removed some obsolete files; added gettext to
development build
This commit is contained in:
parent
3ccc72f535
commit
91a0cfb6de
60 changed files with 147 additions and 2581 deletions
|
@ -40,14 +40,15 @@ _CNAS_STAGE=".stage/chroot_cnas-scoreboard"
|
|||
#the settings scoreboard file, update it.
|
||||
_CNAS_FIND="find config -regextype posix-extended -maxdepth 1 -type f -newer ${_CNAS_STAGE} -true "
|
||||
|
||||
#FIXME: refine regexp, try remembering during a rebuild...?
|
||||
# -regex '[^~]+' "
|
||||
# \( -name 'common -o -name 'bootstrap' -o -name 'chroot' -o -name 'binary' -o -name 'source' -o -name 'cnas-default-settings' -o -name 'cnas-custom-settings' -o -name 'cnas-active-settings' \) "
|
||||
#echo ${_CNAS_FIND}
|
||||
#_CNAS_FOUND=`${_CNAS_FIND}`
|
||||
|
||||
_CNAS_SCOREBOARD="config/chroot_local-includes/usr/share/cryptonas-live/etc-scoreboard"
|
||||
|
||||
#supporting unnecessary synonyms complicates change control
|
||||
if [ "$CNAS_HARDNESS" == "hard" ] || [ "$CNAS_HARDNESS" == "normal" ]
|
||||
then
|
||||
echo "warning: \$CNAS_HARDNESS settings `hard' and `normal' deprecated; use `secure' or `devel' instead"
|
||||
fi
|
||||
|
||||
_CNAS_SCOREBOARD="config/chroot_local-includes/usr/lib/cryptobox-cd/etc-scoreboard"
|
||||
|
||||
#Only run the scoreboard hack if the ".stage" directory exists
|
||||
if [ -d ${_CNAS_STAGE_DIR} ]
|
||||
|
@ -57,9 +58,19 @@ then
|
|||
#If the stage file does not exist or the "find" found something
|
||||
if [ ! -f "${_CNAS_STAGE}" ] || [ -n "`${_CNAS_FIND}`" ]
|
||||
then
|
||||
#Add explanatory banner to scoreboard file
|
||||
cat > ${_CNAS_SCOREBOARD} <<EOF
|
||||
#/usr/share/cryptonas-live/etc-scoreboard
|
||||
# This file is used by the CryptoNAS Live system to pass
|
||||
# configuration settings within the build system and to
|
||||
# the Debian Live runtime. It should NOT be checked in to
|
||||
# the CryptoNAS project's SVN repository.
|
||||
|
||||
EOF
|
||||
|
||||
#Update the scoreboard file from the current shell vars
|
||||
echo "CryptoNAS: updating scoreboard file..."
|
||||
set | grep -e "^CNAS_" > ${_CNAS_SCOREBOARD}
|
||||
set | grep -e "^CNAS_" >> ${_CNAS_SCOREBOARD}
|
||||
|
||||
#If we updated the scoreboard, touch the .stage/...
|
||||
#file we use for time stamping.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue