From dd9ecf35600a2df29afd7ca5eecf120fa85fcdbd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 2 Jan 2011 00:53:52 +0100 Subject: Removing encryption support until we have something for current kernels again. --- scripts/build/lb_binary | 1 - scripts/build/lb_binary_encryption | 147 ------------------------------------- scripts/build/lb_binary_grub | 8 -- scripts/build/lb_binary_grub2 | 8 -- scripts/build/lb_binary_silo | 8 -- scripts/build/lb_binary_yaboot | 8 -- scripts/build/lb_config | 12 +-- 7 files changed, 1 insertion(+), 191 deletions(-) delete mode 100755 scripts/build/lb_binary_encryption (limited to 'scripts') diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index 8d3e6cd6a..0eddd7c53 100755 --- a/scripts/build/lb_binary +++ b/scripts/build/lb_binary @@ -56,7 +56,6 @@ fi # Building root filesystem lb binary_rootfs ${*} lb binary_manifest ${*} -lb binary_encryption ${*} # Prepare images lb binary_local-packagelists ${*} diff --git a/scripts/build/lb_binary_encryption b/scripts/build/lb_binary_encryption deleted file mode 100755 index f5e645850..000000000 --- a/scripts/build/lb_binary_encryption +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2010 Daniel Baumann -## -## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'encrypts rootfs')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] -then - exit 0 -fi - -case "${LB_ENCRYPTION}" in - aes128|aes192|aes256) - ;; - ""|false) - exit 0 - ;; - *) - Echo_error "Encryption type %s not supported." "${LB_ENCRYPTION}" - exit 1 - ;; -esac - -case "${LB_CHROOT_FILESYSTEM}" in - ext2|squashfs) - ;; - - *) - Echo_error "Encryption not yet supported on %s filesystems." "${LB_CHROOT_FILESYSTEM}" - exit 1 - ;; -esac - -Echo_message "Begin encrypting root filesystem image..." - -# Requiring stage file -Require_stagefile .stage/config .stage/bootstrap .stage/binary_rootfs - -# Checking stage file -Check_stagefile .stage/binary_encryption - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -case "${LB_INITRAMFS}" in - casper) - INITFS="casper" - ;; - - live-initramfs|live-boot) - INITFS="live" - ;; -esac - -# Checking depends -Check_package chroot/usr/bin/aespipe aespipe - -# Restoring cache -Restore_cache cache/packages_binary - -# Installing depends -Install_package - -Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LB_CHROOT_FILESYSTEM}" "${LB_ENCRYPTION}" - -if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] -then - # Moving image - mv binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} chroot -fi - -while true -do - echo - echo " **************************************" - Echo " ** Configuring encrypted filesystem **" - echo " **************************************" - Echo " (Passwords must be at least 20 characters long)" - echo - - case "${LB_BUILD_WITH_CHROOT}" in - true) - if Chroot chroot aespipe -e ${LB_ENCRYPTION} -T \ - < chroot/filesystem.${LB_CHROOT_FILESYSTEM} \ - > chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp - then - mv chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} - break - fi - ;; - false) - if aespipe -e ${LB_ENCRYPTION} -T \ - < binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} \ - > binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp - then - mv binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} - break - fi - ;; - esac - - printf "\nThere was an error configuring encryption ... Retry? [Y/n] " - read ANSWER - - if [ "$(echo "${ANSWER}" | cut -b1 | tr A-Z a-z)" = "n" ] - then - unset ANSWER - break - fi -done - -# Cleanup temporary filesystems -rm -f chroot/filesystem.${LB_CHROOT_FILESYSTEM} -rm -f chroot/filesystem.${LB_CHROOT_FILESYSTEM}.tmp -rm -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}.tmp - -# Saving cache -Save_cache cache/packages_binary - -# Removing depends -Remove_package - -# Creating stage file -Create_stagefile .stage/binary_encryption diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index e2228a78d..e6662fa28 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -156,14 +156,6 @@ Check_multiarchitectures mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters - -case "${LB_ENCRYPTION}" in - ""|false) - ;; - *) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}" -esac - if [ -n "${LB_USERNAME}" ] then case "${LB_INITRAMFS}" in diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 7228309e6..34043cadf 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -130,14 +130,6 @@ Check_multiarchitectures mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters - -case "${LB_ENCRYPTION}" in - ""|false) - ;; - *) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}" -esac - if [ -n "${LB_USERNAME}" ] then case "${LB_INITRAMFS}" in diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 41df7f317..653e0f405 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -123,14 +123,6 @@ esac mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters -case "${LB_ENCRYPTION}" in - ""|false) - ;; - *) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}" - ;; -esac - if [ -n "${LB_USERNAME}" ] then case "${LB_INITRAMFS}" in diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index 49d5b0d48..bfbb58a30 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -162,14 +162,6 @@ Check_multiarchitectures mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters -case "${LB_ENCRYPTION}" in - ""|false) - ;; - *) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}" - ;; -esac - if [ -n "${LB_USERNAME}" ] then case "${LB_INITRAMFS}" in diff --git a/scripts/build/lb_config b/scripts/build/lb_config index e9ebd9af6..ad8059600 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -68,7 +68,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--debug]\n\ \t [-d|--distribution CODENAME]\n\ \t [--dump]\n\ -\t [-e|--encryption false|aes128|aes192|aes256]\n\ \t [--fdisk fdisk|fdisk.dist]\n\ \t [--force]\n\ \t [--grub-splash FILE]\n\ @@ -147,7 +146,7 @@ Local_arguments () packages:,package-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:, apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:, debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:, - encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:, + grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:, iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:, net-cow-server:,net-tarball:,syslinux-theme:, @@ -586,11 +585,6 @@ Local_arguments () shift 2 ;; - -e|--encryption) - LB_ENCRYPTION="${2}" - shift 2 - ;; - --grub-splash) LB_GRUB_SPLASH="${2}" shift 2 @@ -1174,10 +1168,6 @@ LB_DEBIAN_INSTALLER_PRESEEDFILE="${LB_DEBIAN_INSTALLER_PRESEEDFILE}" # (Default: ${LB_DEBIAN_INSTALLER_GUI}) LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI}" -# \$LB_ENCRYPTION: set encryption -# (Default: ${LB_ENCRYPTION}) -LB_ENCRYPTION="${LB_ENCRYPTION}" - # \$LB_GRUB_SPLASH: set custom grub splash # (Default: empty) LB_GRUB_SPLASH="${LB_GRUB_SPLASH}" -- cgit v1.2.3