locations of scripts fixed

master
lars 18 years ago
parent da7ae38887
commit 20a2c95692

@ -52,10 +52,10 @@ TMPDIR="/tmp/`basename $0`-$$"
HD_IMAGE="/tmp/`basename $0`-testplatte.img"
# mkisofs options (the option "-U" is not clean, but it prevents long filenames from getting mapped)
MKISOFS_OPTIONS="-allow-multidot -U -D -iso-level 3 -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 1 -boot-info-table -pad -R"
CHROOTSTART="/scripts/chroot-start.sh"
CHROOTSTART="/usr/lib/cryptobox/chroot-start.sh"
CDWRITER="0,0,0"
# for development diffs and merges from a running cryptobox
REMOTE_COMMAND="ssh -l root `cat \"$TEMPLATEDIR/usr/share/cryptobox/defaults/ip\"` /scripts/devel-features.sh"
REMOTE_COMMAND="ssh -l root `cat \"$TEMPLATEDIR/usr/share/cryptobox/defaults/ip\"` /usr/lib/cryptobox/devel-features.sh"
REMOTE_COPY_DEST="root@`cat \"$TEMPLATEDIR/usr/share/cryptobox/defaults/ip\"`:/tmp/mirror/"
@ -114,7 +114,7 @@ function configure_cb()
echo "Configuring the cryptobox ..."
sed -i "s/^Version:.*/Revision: $(fetch_revision)/" "$IMAGEDIR/etc/issue"
fetch_revision >"$IMAGEDIR/etc/cryptobox/revision"
chroot "$IMAGEDIR" "/scripts/configure-cryptobox.sh"
chroot "$IMAGEDIR" "/usr/lib/cryptobox/configure-cryptobox.sh"
}
function fetch_revision()
@ -131,7 +131,7 @@ function upload2devel()
# of course, only the directories that are mapped to tmpfs can
# be updated this way
{
local DIRS="scripts var/www usr/share/cryptobox usr/lib/cryptobox"
local DIRS="var/www usr/share/cryptobox usr/lib/cryptobox"
[ -e "$TMPDIR" ] || mkdir -p "$TMPDIR"
for a in $DIRS
do mkdir -p "$TMPDIR/$a"

@ -5,7 +5,7 @@
# it should really NEVER be executed on a production system
#
# called by:
# - /etc/rc2.d/S99cb-devel-features.sh (only if $DEVELPMENT_MARKER exists)
# - /etc/rc2.d/S99cb-devel-features (only if $DEVELPMENT_MARKER exists)
#
set -eu
@ -15,7 +15,7 @@ set -eu
MIRROR_DIR=/tmp/mirror
MIRROR_ORIG_DIR=/tmp/mirror.orig
WRITE_DIRS="/usr/share/cryptobox /var/www /scripts /usr/lib/cryptobox"
WRITE_DIRS="/usr/share/cryptobox /var/www /usr/lib/cryptobox"
ACTION="--help"
[ $# -gt 0 ] && ACTION="$1"

Loading…
Cancel
Save