cryptonas/cryptonas-livecd
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Disk format, shutdown, restart now work---is anything still broken??

Browse source 
Re-enabled apache2 install; not yet configured properly.
Builder is now able to provide /etc/modules and /etc/network/interfaces
This commit is contained in:
frisco 2008-07-12 03:27:05 +00:00
parent 9141c377d0
commit 8a9d8a7b57
6 changed files with 62 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/chroot_local-includes/usr/share/initramfs-tools/scripts/casper-bottom/90cnas_setup_etc
View file

@ -59,10 +59,9 @@ log_begin_msg "$DESCRIPTION"
. ${CNAS_ROOT_DIR}/usr/lib/cryptobox-cd/etc-scoreboard
# "/" must be writeable only by root, or else the CryptoNAS-Samba
# hook scripts will refuse to run for security reasons.
# "/" must be writeable only by root, or else some CryptoNAS
# scripts will refuse to run for security reasons.
chmod go-w ${CNAS_ROOT_DIR}
#chmod 755 ${CNAS_ROOT_DIR}
sed -i 's/^id:.*$/id:3:initdefault:/' ${CNAS_ROOT_DIR}/etc/inittab
# add tmpfs entry for mount parent
@ -71,9 +70,22 @@ test -e ${CNAS_ROOT_DIR}/etc/fstab && sed -i '#/var/cache/cryptobox-server/mnt#d
# add new line
echo "tmpfs /var/cache/cryptobox-server/mnt tmpfs defaults 0 0" >> ${CNAS_ROOT_DIR}/etc/fstab
#Set up /etc/modules with user-provided contents
MODULES="$CNAS_ROOT_DIR/$CNAS_SCOREBOARD_DIR/etc.d/modules"
if [ -f "$MODULES" ]
then
cp $MODULES ${CNAS_ROOT_DIR}/etc/modules
fi
#Set up /etc/network/interfaces with user-provided contents
INTERFACES="$CNAS_ROOT_DIR/$CNAS_SCOREBOARD_DIR/etc.d/network/interfaces"
if [ -f "$INTERFACES" ]
then
cp $INTERFACES ${CNAS_ROOT_DIR}/etc/network/interfaces
fi
#"hard" and "secure" are synonyms, so test for both of them
if [ ${CNAS_HARDNESS} -eq "hard" -o ${CNAS_HARDNESS} -eq "secure" ]
if [ ${CNAS_HARDNESS} = "hard" -o ${CNAS_HARDNESS} = "secure" ]
then
#FIXME: Since we're now doing this important step at runtime,