Did some cleanup. Builds and (unlike revision 1110) boots. See

"README.devel" for some additional notes.

Makefile

@@ -1,33 +0,0 @@
-
-
-
-# make-mode emacs thingamajig -*- makefile -*-
-
-
-#manually configured directories
-config_dirs := config binary_local-hooks chroot_local-hooks \
-chroot_local-includes chroot_local-packageslists \
-binary_syslinux
-
-emacs_files := $(wildcard *~ config/*~ config/*/*~ config/*/*/*~)
-
-#This is just a helper file, since emacs "foo~" files can sometimes break a 
-#build (files ending in ~ are considered valid shell scripts).
-#If you want to build the disk image, use "lh_build" as documented at
-# http://devel.cryptobox.org/wiki/DebianLiveBuild
-
-#Using a makefile for this is a bit of a drawback, since live-helper
-#doesn't really require `make'.
-
-
-# this makefile could eventually call the live-helper build system
-
-clean-config :
-	-rm -f $(emacs_files)
-#	-rm -f $(addsuffix /*~, $(config_dirs))
-
-clean-all :
-	lh_clean --purge
-
-.PHONY : clean-all clean-config
-

README.devel

@@ -0,0 +1,16 @@
+This is an EXPERIMENTAL version of CryptoNAS for Debian Live!
+
+## To get an NAS "good enough to play with", run the following commands once
+#you get to the root prompt (use "sudo -s" to get to the root prompt).
+
+#It is recommended that you run "./rm-tmps.sh" after making configuration
+#changes using an editor but before starting a new build.
+
+	
+/usr/lib/cryptobox-cd/configure-cryptobox.sh normal
+
+## optionally call it again with argument "secure" (again, EXPERIMENTAL)
+
+/sbin/telinit 3
+/etc/init.d/cryptobox-server restart
+/etc/init.d/samba restart

config/binary

@@ -120,8 +120,8 @@ LH_SYSLINUX_SPLASH=""
 
 # $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
 # (Default: 0)
-# "0" does NOT appear to boot immediately
+# "0" apparently means "wait forever"
-LH_SYSLINUX_TIMEOUT="3"
+LH_SYSLINUX_TIMEOUT="5"
 
 # $LH_SYSLINUX_CFG: set custom syslinux configuration file
 # (Default: empty)

config/chroot

@@ -64,25 +64,3 @@ LH_SYMLINKS="disabled"
 # (Default: disabled)
 LH_SYSVINIT="disabled"
 
-
-#FIXME: Note: Everything below represents brainstorming on the part of developer
-#"frisco" and is not official.
-###############################################################
-# This is the CryptoNAS-specific part of the file. Default
-# values are defined below. Since this config file is included
-# as part of various shell scripts, any definitions present
-# in the files we include below will override those defined
-# in the present file.
-#
-# It is recommended that CryptoNAS-specific variable
-# definitions follow the CN_FOO or _CN_FOO conventions to
-# avoid polluting the shared live-helper namespace.
-###############################################################
-
-#CN_DELETEFILES="/etc/rcS.d/*discover \
-#/etc/rcS.d/*lvm \
-#/var/log/dpkg.log \
-#/var/log/bootstrap.log"
-
-#CN_MAKEDIRS=""
-

config/chroot_local-includes/etc/initramfs-tools/scripts/init-bottom/80-cn-run-config-script.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-##run /usr/lib/cryptobox-cd/configure-cryptobox.sh
-
-
-##The contents of this script are commented out because this part 
-##isn't yet working. Running the script AFTER startup is complete
-## seems to result in a working CryptoNAS, but I haven't yet
-## made the changes necessary to get "configure-cryptobox.sh"
-## to run in the initramfs context.
-##
-## To get an NAS "good enough to play with", uncomment everything with
-## a single '#' after this point and run it once you get to the root
-## prompt (use "sudo -s" to get to the root prompt).
-##
-echo "Boot-time configuration not implemented; run"
-echo "/usr/lib/cryptobox-cd/configure-cryptobox.sh as root"
-#echo "Configuring the CryptoNAS live system..."
-##if we're doing a release version, call it with "normal, then secure"
-##disable for now to isolate smbd/nmbd other problems
-
-#/usr/lib/cryptobox-cd/configure-cryptobox.sh normal
-
-
-## call it again with argument "secure" if we're building a release
-
-
-#/sbin/telinit 3
-
-
-#/etc/init.d/cryptobox-server restart
-#/etc/init.d/samba restart

config/cnas-active-settings

@@ -0,0 +1,21 @@
+#CryptoNAS Live include file
+#$BUILD_DIR/config/cnas-active-settings
+# -*- bash -*- #configure Emacs for bash mode
+#This file includes the config files in the correct order.
+#It can be included by scripts both in the bootstrap and
+#chroot environments. Variable assignments in later
+#includes override earlier ones.
+
+
+. ./cnas-default-settings
+
+#May be necessary to include this file in the below files instead...
+#. ./common
+#. ./bootstrap
+#. ./chroot
+#. ./binary
+#. ./source
+
+#Include cnas-custom-settings IFF this file exists
+#. ./cnas-custom-settings
+[ -f ./cnas-custom-settings ] && . ./cnas-custom-settings

config/cnas-default-settings

@@ -0,0 +1,20 @@
+
+#include file for CryptoNAS Live
+
+
+#FIXME: move this somewhere else, such as "default settings"
+#Set this to "devel" or "normal" for development, or
+#set it to "hard" or "secure" for releases.
+CNAS_HARDNESS="devel"
+
+# It is recommended that CryptoNAS-specific variable
+# definitions follow the CNAS_FOO or _CNAS_FOO conventions to
+# avoid polluting the shared live-helper namespace.
+###############################################################
+
+#CNAS_DELETEFILES="/etc/rcS.d/*discover \
+#/etc/rcS.d/*lvm \
+#/var/log/dpkg.log \
+#/var/log/bootstrap.log"
+
+#CNAS_MAKEDIRS=""

rm-tmps.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#rm-tmps.sh
+#remove "foo~" temporary files left by Emacs and other editors
+
+#This is just a helper file, since Emacs-style "foo~" files can sometimes break a 
+#build (files ending in ~ are considered valid shell scripts).
+#If you want to build the disk image, use "lh_build" as documented at
+# http://devel.cryptobox.org/wiki/DebianLiveBuild
+
+rm --verbose -f `find config -name "*~"`