From 0f216baca5e92164628d2908e6dcd4a91fa5d041 Mon Sep 17 00:00:00 2001 From: frisco <> Date: Sat, 11 Jul 2009 21:58:40 +0000 Subject: [PATCH] Added workaround for building Etch release version --- config/chroot_local-packageslists/cryptonas | 10 ++++++++++ config/cnas-default-settings | 3 ++- config/release-settings | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 config/release-settings diff --git a/config/chroot_local-packageslists/cryptonas b/config/chroot_local-packageslists/cryptonas index 22c0d8d..27314a0 100644 --- a/config/chroot_local-packageslists/cryptonas +++ b/config/chroot_local-packageslists/cryptonas @@ -45,3 +45,13 @@ patch #cryptobox-server ## ntfs-3g is not in etch + +## The following have been manually adapted from the +## live-helper "minimal" list. This is to work around an +## odd behavior which breaks the "secure" build on Etch +## (ie when $LH_PACKAGES_LISTS="minimal cryptonas") + +## "minimal" includes eject file sudo vim-tiny, +## but we don't need all of those +sudo file + diff --git a/config/cnas-default-settings b/config/cnas-default-settings index 3785d80..dd3f856 100644 --- a/config/cnas-default-settings +++ b/config/cnas-default-settings @@ -98,7 +98,8 @@ LH_PACKAGES="" # $LH_PACKAGES_LISTS: set package list to install # (Default: standard) -# FIXME: Use "minimal cryptonas" for CryptoNAS releases +# Use "cryptonas" (etch) or "minimal cryptonas" (lenny) +# for CryptoNAS releases # Use "standard cryptonas-devel" for development LH_PACKAGES_LISTS="standard cryptonas-devel" diff --git a/config/release-settings b/config/release-settings new file mode 100644 index 0000000..69006d7 --- /dev/null +++ b/config/release-settings @@ -0,0 +1,20 @@ +##deb-live/config/cnas-custom-settings.d/release-settings +##Activate release-specific live-helper settings +## +##To build a "release" version, this file should +##be copied to the cnas-custom-settings.d +##directory, where it will be sourced by +##the live-helper scripts. + +# $LH_PACKAGES_LISTS: set package list to install +# Use "cryptonas" for CryptoNAS releases +LH_PACKAGES_LISTS="cryptonas" + +#LH_BINARY_IMAGES="iso" +#LH_BINARY_IMAGES="usb-hdd" + +# $LH_SOURCE: Create a source code tarball? +LH_SOURCE="enabled" + +#Disable console login and enable other security measures +CNAS_HARDNESS="secure"