diff --git a/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh b/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh index d951144..1ea5f66 100755 --- a/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh +++ b/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh @@ -16,7 +16,7 @@ set -eu RUNTIMEDIR=/opt/dfsruntime/runtimerd TUNDEV=$RUNTIMEDIR/dev/net/tun -SECURITY_REMOVE_PACKAGES="ssh strace unzip tar zip wget nvi nano gzip curl bzip2 aptitude tasksel elinks" +SECURITY_REMOVE_PACKAGES="ssh strace unzip tar zip wget nvi nano gzip curl bzip2 aptitude tasksel elinks vim" DEVEL_REMOVE_PACKAGES="exim4-daemon-light exim4-config exim4-base netkit-inetd telnet ppp pppconfig pppoe pppoeconf" # remove rc symlinks for these services @@ -70,6 +70,9 @@ function configure_normal() do rm "$b" done done + + # remove deb-files, that were left by dfsbuild + [ -d /opt/packages ] && rm -r /opt/packages } diff --git a/cover/antlogo-small.png b/cover/antlogo-small.png new file mode 100644 index 0000000..b9fd8ff Binary files /dev/null and b/cover/antlogo-small.png differ diff --git a/etc-defaults.d/dfs-cbox.conf b/etc-defaults.d/dfs-cbox.conf index 6da3b73..76c0c17 100644 --- a/etc-defaults.d/dfs-cbox.conf +++ b/etc-defaults.d/dfs-cbox.conf @@ -69,6 +69,7 @@ allpackages = util-linux iptraf iptables ifupdown + # TODO: remove bzip2 dhcp-client iptraf iputils-tracepath zip unzip dhcp-client bzip2 busybox-static @@ -78,7 +79,6 @@ allpackages = util-linux discover hdparm binutils - ntpdate e2fsprogs debconf sysutils @@ -88,7 +88,6 @@ allpackages = util-linux cryptsetup hashalot kudzu - wipe elinks ssh strace diff --git a/hints/release-policy.txt b/hints/release-policy.txt new file mode 100644 index 0000000..1dee5a6 --- /dev/null +++ b/hints/release-policy.txt @@ -0,0 +1,16 @@ +1) set current version + - README + - cbox-tree.d/usr/share/cryptobox/templates/footer.cs + +2) build image + - 'scripts/cbox-build.sh release' + - for a compressed image: 'scripts/cbox-build.sh isoz' + +3) upload to codecoop + - type "scp FILE shell.codecoop.org:." + - upload a dummy file with the same name via upload-web-interface to codecoop + - ask Jan Kanzleiter to replace the dummy by the the scp-file + +4) release announcement + - codecoop + - distrowatch diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh index af1d80d..1e4d13d 100755 --- a/scripts/cbox-build.sh +++ b/scripts/cbox-build.sh @@ -38,22 +38,6 @@ source $(dirname $0)/common.sh.inc DFS_CONFIG=$(get_config_file dfs-cbox.conf) -############# include local configuration ############## - -if [ -e "$(get_config_file cbox-dev.conf)" ] - then source "$(get_config_file cbox-dev.conf)" - else echo "local cbox-dev.conf ($(get_config_file cbox-dev.conf)) does not exist!" >&2 - exit 1 - fi - -# image directory created by dfsbuild -# the BUILD_DIR is defined in the local cbox-dev.conf -IMAGE_DIR="$BUILD_DIR/image" -IMAGEZ_DIR="$BUILD_DIR/image.z" -IMAGEZ_FILE="${IMAGE_FILE/\.iso/_compressed.iso}" -UNCOMPRESSED_ITEMS="_offline autorun.inf start.html" - - ####################### functions ###################### function run_dfsbuild() diff --git a/scripts/cbox-dev.sh b/scripts/cbox-dev.sh index c18cab2..7fe9827 100755 --- a/scripts/cbox-dev.sh +++ b/scripts/cbox-dev.sh @@ -4,7 +4,8 @@ # # development actions: # chroot - run first tests in a chroot environment -# qemu - run the qemu emulation +# qemu - run the qemu emulation with the uncompressed image +# qemuz - run the qemu emulation with the compressed image # upload - copy your local files to tmpfs on a running cryptobox # diff - compare tmpfs-files on a running cryptobox with the original # merge - apply the diff to the local copy @@ -41,6 +42,7 @@ if [ -e "$TEMPLATE_DIR/etc/cryptobox/cryptobox.conf" ] function qemu_boot() +# parameter: iso_image_file { # create a virtual harddisk image file if [ ! -e "$HD_IMAGE" ] @@ -48,7 +50,7 @@ function qemu_boot() dd if=/dev/zero of="$HD_IMAGE" bs=1M count=20 fi echo "Starting qemu ..." - qemu -cdrom "$IMAGE_FILE" -m 96 -hda "$IMAGE_FILE" -boot d -n "$QEMU_IFUP_FILE" || true + qemu -cdrom "$1" -m 96 -hda "$IMAGE_FILE" -boot d -n "$QEMU_IFUP_FILE" || true # remove iptables rules "$QEMU_IFUP_FILE" stop } @@ -135,13 +137,16 @@ case "$1" in fi ;; qemu ) - qemu_boot + qemu_boot "$IMAGE_FILE" + ;; + qemuz ) + qemu_boot "$IMAGEZ_FILE" ;; ssh ) ssh -F "$SSH_CONFIG_FILE" "$SSH_HOST" ;; help|--help ) - echo "Syntax: `basename $0` ( qemu | chroot | upload | diff | merge | ssh | help )" + echo "Syntax: `basename $0` ( qemu | qemuz | chroot | upload | diff | merge | ssh | help )" echo ;; * ) diff --git a/scripts/common.sh.inc b/scripts/common.sh.inc index 8581d5f..17fdcfc 100644 --- a/scripts/common.sh.inc +++ b/scripts/common.sh.inc @@ -55,4 +55,7 @@ if [ -e "$(get_config_file cbox-dev.conf)" ] # image directory created by dfsbuild # the BUILD_DIR is defined in the local cbox-dev.conf IMAGE_DIR="$BUILD_DIR/image" +IMAGEZ_DIR="$BUILD_DIR/image.z" +IMAGEZ_FILE="${IMAGE_FILE/\.iso/_compressed.iso}" +UNCOMPRESSED_ITEMS="_offline autorun.inf start.html var boot opt"