dfsbuild: removed ntpdate and wipe packages
release policy added cbox-dev: new action "qemuz" (for compressed image) cbox-build: added "opt", "boot" and "var" to "uncompressed_items" for compressed iso cbox-build: remove deb-archiv-pool from "/opt/packages" (used by dfsbuild) small logo added
This commit is contained in:
parent
f026370bbe
commit
5b928a6cc3
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 7.0 KiB |
|
@ -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
|
||||
|
|
|
@ -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 <idfx@codecoop.org> to replace the dummy by the the scp-file
|
||||
|
||||
4) release announcement
|
||||
- codecoop
|
||||
- distrowatch
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
;;
|
||||
* )
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue