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
|
RUNTIMEDIR=/opt/dfsruntime/runtimerd
|
||||||
TUNDEV=$RUNTIMEDIR/dev/net/tun
|
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"
|
DEVEL_REMOVE_PACKAGES="exim4-daemon-light exim4-config exim4-base netkit-inetd telnet ppp pppconfig pppoe pppoeconf"
|
||||||
|
|
||||||
# remove rc symlinks for these services
|
# remove rc symlinks for these services
|
||||||
|
@ -70,6 +70,9 @@ function configure_normal()
|
||||||
do rm "$b"
|
do rm "$b"
|
||||||
done
|
done
|
||||||
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
|
iptraf
|
||||||
iptables
|
iptables
|
||||||
ifupdown
|
ifupdown
|
||||||
|
# TODO: remove bzip2 dhcp-client iptraf iputils-tracepath zip unzip
|
||||||
dhcp-client
|
dhcp-client
|
||||||
bzip2
|
bzip2
|
||||||
busybox-static
|
busybox-static
|
||||||
|
@ -78,7 +79,6 @@ allpackages = util-linux
|
||||||
discover
|
discover
|
||||||
hdparm
|
hdparm
|
||||||
binutils
|
binutils
|
||||||
ntpdate
|
|
||||||
e2fsprogs
|
e2fsprogs
|
||||||
debconf
|
debconf
|
||||||
sysutils
|
sysutils
|
||||||
|
@ -88,7 +88,6 @@ allpackages = util-linux
|
||||||
cryptsetup
|
cryptsetup
|
||||||
hashalot
|
hashalot
|
||||||
kudzu
|
kudzu
|
||||||
wipe
|
|
||||||
elinks
|
elinks
|
||||||
ssh
|
ssh
|
||||||
strace
|
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)
|
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 ######################
|
####################### functions ######################
|
||||||
|
|
||||||
function run_dfsbuild()
|
function run_dfsbuild()
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
#
|
#
|
||||||
# development actions:
|
# development actions:
|
||||||
# chroot - run first tests in a chroot environment
|
# 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
|
# upload - copy your local files to tmpfs on a running cryptobox
|
||||||
# diff - compare tmpfs-files on a running cryptobox with the original
|
# diff - compare tmpfs-files on a running cryptobox with the original
|
||||||
# merge - apply the diff to the local copy
|
# merge - apply the diff to the local copy
|
||||||
|
@ -41,6 +42,7 @@ if [ -e "$TEMPLATE_DIR/etc/cryptobox/cryptobox.conf" ]
|
||||||
|
|
||||||
|
|
||||||
function qemu_boot()
|
function qemu_boot()
|
||||||
|
# parameter: iso_image_file
|
||||||
{
|
{
|
||||||
# create a virtual harddisk image file
|
# create a virtual harddisk image file
|
||||||
if [ ! -e "$HD_IMAGE" ]
|
if [ ! -e "$HD_IMAGE" ]
|
||||||
|
@ -48,7 +50,7 @@ function qemu_boot()
|
||||||
dd if=/dev/zero of="$HD_IMAGE" bs=1M count=20
|
dd if=/dev/zero of="$HD_IMAGE" bs=1M count=20
|
||||||
fi
|
fi
|
||||||
echo "Starting qemu ..."
|
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
|
# remove iptables rules
|
||||||
"$QEMU_IFUP_FILE" stop
|
"$QEMU_IFUP_FILE" stop
|
||||||
}
|
}
|
||||||
|
@ -135,13 +137,16 @@ case "$1" in
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
qemu )
|
qemu )
|
||||||
qemu_boot
|
qemu_boot "$IMAGE_FILE"
|
||||||
|
;;
|
||||||
|
qemuz )
|
||||||
|
qemu_boot "$IMAGEZ_FILE"
|
||||||
;;
|
;;
|
||||||
ssh )
|
ssh )
|
||||||
ssh -F "$SSH_CONFIG_FILE" "$SSH_HOST"
|
ssh -F "$SSH_CONFIG_FILE" "$SSH_HOST"
|
||||||
;;
|
;;
|
||||||
help|--help )
|
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
|
echo
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
|
|
|
@ -55,4 +55,7 @@ if [ -e "$(get_config_file cbox-dev.conf)" ]
|
||||||
# image directory created by dfsbuild
|
# image directory created by dfsbuild
|
||||||
# the BUILD_DIR is defined in the local cbox-dev.conf
|
# the BUILD_DIR is defined in the local cbox-dev.conf
|
||||||
IMAGE_DIR="$BUILD_DIR/image"
|
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