From 5b928a6cc3cd8eead32679d68cae0654fbd68c22 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Tue, 4 Oct 2005 10:22:29 +0000
Subject: [PATCH] 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

---
 .../usr/lib/cryptobox/configure-cryptobox.sh    |   5 ++++-
 cover/antlogo-small.png                         | Bin 0 -> 7190 bytes
 etc-defaults.d/dfs-cbox.conf                    |   3 +--
 hints/release-policy.txt                        |  16 ++++++++++++++++
 scripts/cbox-build.sh                           |  16 ----------------
 scripts/cbox-dev.sh                             |  13 +++++++++----
 scripts/common.sh.inc                           |   3 +++
 7 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 cover/antlogo-small.png
 create mode 100644 hints/release-policy.txt

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 0000000000000000000000000000000000000000..b9fd8ffd65e77b12993a93745f04444e3b2f4a6b
GIT binary patch
literal 7190
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
XiK@l_u6+RR;DK~B?`zbcFi-ynYNo%S

literal 0
HcmV?d00001

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 <idfx@codecoop.org> 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"