@@ -36,7 +36,7 fi | |||||
36 |
|
36 | |||
37 | # Introduce settings |
|
37 | # Introduce settings | |
38 | set -e |
|
38 | set -e | |
39 |
echo -n -e "\n#\n# RPi 0/1/2/3 |
|
39 | echo -n -e "\n#\n# RPi 0/1/2/3 Bootstrap Settings\n#\n" | |
40 | set -x |
|
40 | set -x | |
41 |
|
41 | |||
42 | # Raspberry Pi model configuration |
|
42 | # Raspberry Pi model configuration | |
@@ -236,14 +236,12 CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""} | |||||
236 |
|
236 | |||
237 | # Packages required in the chroot build environment |
|
237 | # Packages required in the chroot build environment | |
238 | APT_INCLUDES=${APT_INCLUDES:=""} |
|
238 | APT_INCLUDES=${APT_INCLUDES:=""} | |
239 |
|
||||
240 | APT_INCLUDES="${APT_INCLUDES},flex,bison,libssl-dev,apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" |
|
239 | APT_INCLUDES="${APT_INCLUDES},flex,bison,libssl-dev,apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" | |
241 |
|
240 | |||
242 | # Packages to exclude from chroot build environment |
|
241 | # Packages to exclude from chroot build environment | |
243 | APT_EXCLUDES=${APT_EXCLUDES:=""} |
|
242 | APT_EXCLUDES=${APT_EXCLUDES:=""} | |
244 |
|
243 | |||
245 | # Packages required for bootstrapping |
|
244 | # Packages required for bootstrapping | |
246 |
|
||||
247 | REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus bison flex libssl-dev sudo" |
|
245 | REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus bison flex libssl-dev sudo" | |
248 | MISSING_PACKAGES="" |
|
246 | MISSING_PACKAGES="" | |
249 |
|
247 | |||
@@ -401,8 +399,7 fi | |||||
401 |
|
399 | |||
402 | # Add deps for nexmon |
|
400 | # Add deps for nexmon | |
403 | if [ "$ENABLE_NEXMON" = true ] ; then |
|
401 | if [ "$ENABLE_NEXMON" = true ] ; then | |
404 |
|
402 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf make autoconf automake build-essential libtool" | ||
405 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf bison flex make autoconf automake build-essential libtool" |
|
|||
406 | fi |
|
403 | fi | |
407 |
|
404 | |||
408 | # Add libncurses5 to enable kernel menuconfig |
|
405 | # Add libncurses5 to enable kernel menuconfig | |
@@ -418,7 +415,6 fi | |||||
418 | # Add cryptsetup package to enable filesystem encryption |
|
415 | # Add cryptsetup package to enable filesystem encryption | |
419 | if [ "$ENABLE_CRYPTFS" = true ] && [ "$BUILD_KERNEL" = true ] ; then |
|
416 | if [ "$ENABLE_CRYPTFS" = true ] && [ "$BUILD_KERNEL" = true ] ; then | |
420 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup" |
|
417 | REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cryptsetup" | |
421 |
|
||||
422 | APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs" |
|
418 | APT_INCLUDES="${APT_INCLUDES},cryptsetup,busybox,console-setup,cryptsetup-initramfs" | |
423 |
|
419 | |||
424 | # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package |
|
420 | # If cryptfs,dropbear and initramfs are enabled include dropbear-initramfs package | |
@@ -840,7 +836,6 if [ "$ENABLE_CRYPTFS" = true ] ; then | |||||
840 | echo -n ${CRYPTFS_PASSWORD} > .password |
|
836 | echo -n ${CRYPTFS_PASSWORD} > .password | |
841 |
|
837 | |||
842 | # Initialize encrypted partition |
|
838 | # Initialize encrypted partition | |
843 |
|
||||
844 | cryptsetup --verbose --debug -q luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -h "${CRYPTFS_HASH}" -s "${CRYPTFS_XTSKEYSIZE}" .password |
|
839 | cryptsetup --verbose --debug -q luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -h "${CRYPTFS_HASH}" -s "${CRYPTFS_XTSKEYSIZE}" .password | |
845 |
|
840 | |||
846 | # Open encrypted partition and setup mapping |
|
841 | # Open encrypted partition and setup mapping |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant