Fixed "scripts/cbox-dev.sh diff" (must run devel-features.sh manually first); cleaned up some pre-0.4 files
This commit is contained in:
parent
9d4f3d4f1e
commit
52d19f4ffe
17 changed files with 54 additions and 963 deletions
|
@ -21,6 +21,12 @@
|
|||
# problems of this script:
|
||||
# - chroot has to run as root
|
||||
#
|
||||
# jwc 9/08: started modifications to work with CryptoNAS Live
|
||||
|
||||
#Note: It appears to have been a long time since this script was maintained.
|
||||
#(For example, where *was* $DEV_FEATURES_SCRIPT defined previously?)
|
||||
#It may work or it may fail.
|
||||
DEV_FEATURES_SCRIPT="/usr/share/cryptonas-live/devel-features.sh"
|
||||
|
||||
set -ue
|
||||
|
||||
|
@ -61,7 +67,7 @@ function upload2box()
|
|||
# of course, only the directories that are mapped to tmpfs can
|
||||
# be updated this way
|
||||
{
|
||||
local DIRS="var/www usr/share/cryptobox usr/lib/cryptobox"
|
||||
local DIRS="var/www usr/share/cryptobox-server usr/share/cryptonas-live"
|
||||
echo "Uploading the following dirs: $DIRS "
|
||||
[ -e "$TMP_DIR" ] || mkdir -p "$TMP_DIR"
|
||||
for a in $DIRS
|
||||
|
@ -137,14 +143,11 @@ case "$1" in
|
|||
qemu )
|
||||
qemu_boot "$IMAGE_FILE"
|
||||
;;
|
||||
qemuz )
|
||||
qemu_boot "$IMAGEZ_FILE"
|
||||
;;
|
||||
ssh )
|
||||
ssh -F "$SSH_CONFIG_FILE" "$SSH_HOST"
|
||||
;;
|
||||
help|--help )
|
||||
echo "Syntax: `basename $0` ( qemu | qemuz | chroot | upload | diff | merge | ssh | help )"
|
||||
echo "Syntax: `basename $0` ( qemu | chroot | upload | diff | merge | ssh | help )"
|
||||
echo
|
||||
;;
|
||||
* )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue