manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow LH_ENCRYPTION="disabled" to disable encryption 

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-03-23 04:21:47 +00:00
parent ea375828e9
commit 1ca0b58aac
6 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions/defaults.sh
View File

@ -430,10 +430,13 @@ Set_defaults ()
fi
fi
if [ -n "${LH_ENCRYPTION}" ]
then
LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
fi
case "${LH_ENCRYPTION}" in
""|disabled)
;;
*)
LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES} loop-aes-modules-2.6"
;;
esac
fi
# Setting packages string
@ -529,7 +532,7 @@ Set_defaults ()
LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}"
# Setting encryption
# LH_ENCRYPTION
LH_ENCRYPTION="${LH_ENCRYPTION:-disabled}"
# Setting grub splash
# LH_GRUB_SPLASH

45
helpers/lh_binary_encryption
View File

@ -33,10 +33,27 @@ Read_conffile config/source
Read_conffile "${LH_CONFIG}"
Set_defaults
if [ -z "${LH_ENCRYPTION}" ]
then
exit 0
fi
case "${LH_ENCRYPTION}" in
aes128|aes192|aes256)
;;
""|disabled)
exit 0
;;
*)
Echo_error "Encryption type \"${LH_ENCRYPTION}\" not supported."
exit 1
;;
esac
case "${LH_CHROOT_FILESYSTEM}" in
ext2|squashfs)
;;
*)
Echo_error "Encryption not yet supported on ${LH_CHROOT_FILESYSTEM} filesystems."
exit 1
;;
esac
Echo_message "Begin encrypting root filesystem image..."
@ -63,26 +80,6 @@ case "${LH_INITRAMFS}" in
;;
esac
case "${LH_CHROOT_FILESYSTEM}" in
ext2)
ROOTFS="ext2"
;;
jffs2)
Echo_warning "encryption not yet supported on jffs2 filesystem."
exit 0
;;
plain)
Echo_warning "encryption not supported on plain filesystem."
exit 0
;;
squashfs)
ROOTFS="squashfs"
;;
esac
# Checking depends
Check_package chroot/usr/bin/aespipe aespipe

11
helpers/lh_binary_grub
View File

@ -136,10 +136,13 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ]
then
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi
case "${LH_ENCRYPTION}" in
""|disabled)
;;
*)
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
esac
if [ -n "${LH_USERNAME}" ]
then

11
helpers/lh_binary_syslinux
View File

@ -388,10 +388,13 @@ mkdir -p "${SCREEN_PATH}"
mkdir -p "${DATA_PATH}"
# Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ]
then
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi
case "${LH_ENCRYPTION}" in
""|disabled)
;;
*)
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
;;
esac
if [ -n "${LH_USERNAME}" ]
then

11
helpers/lh_binary_yaboot
View File

@ -144,10 +144,13 @@ Check_multiarchitecture
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ]
then
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi
case "${LH_ENCRYPTION}" in
""|disabled)
;;
*)
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
;;
esac
if [ -n "${LH_USERNAME}" ]
then

4
helpers/lh_config
View File

@ -56,7 +56,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--debian-installer-daily enabled|disabled]\n\
\t [--debug]\n\
\t [-d|--distribution CODENAME]\n\
\t [-e|--encryption aes128|aes192|aes256]\n\
\t [-e|--encryption disabled|aes128|aes192|aes256]\n\
\t [--fdisk fdisk|fdisk.dist]\n\
\t [--force]\n\
\t [--genisoimage genisomage|mkisofs]\n\
@ -989,7 +989,7 @@ LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY}"
# \$LH_ENCRYPTION: set encrytion
# (Default: empty)
# (Default: ${LH_ENCRYPTION})
LH_ENCRYPTION="${LH_ENCRYPTION}"
# \$LH_GRUB_SPLASH: set custom grub splash