Raspi2-3_GenImage Commit - r521:13726dc8a192 · Collaboration Tremplin des Sciences

- remove some whitespace...

Unknown -

r521:13726dc8a192

parent child

Context file:

r521:13726dc8a192

Collapse all files

bootstrap.d/15-rpi-config.sh 0 0

NO CONTENT: modified file

files/firstboot/23-regenerate-initramfs.sh +1 0

             logger -t "rc.firstboot" "Regenerating initramfs to remove encrypted root partition auto-expand"
             KERNEL_VERSION=$(uname -r)
             KERNEL_ARCH=$(uname -m)
             INITRAMFS="/boot/firmware/initramfs-${KERNEL_VERSION}"
             INITRAMFS_UBOOT="${INITRAMFS}.uboot"
             # Extract kernel arch
             case "${KERNEL_ARCH}" in
               arm*) KERNEL_ARCH=arm ;;
+              aarch64) KERNEL_ARCH=arm64 ;;
             esac
             # Regenerate initramfs
             if [ -r "${INITRAMFS}" ] ; then
               rm -f /etc/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs
               rm -f /etc/initramfs-tools/scripts/local-premount/expand-premount
               rm -f /etc/initramfs-tools/hooks/expand-tools
               rm -f "${INITRAMFS}"
               mkinitramfs -o "${INITRAMFS}" "${KERNEL_VERSION}"
             fi
             # Convert generated initramfs for U-Boot using mkimage
             if [ -r "${INITRAMFS_UBOOT}" ] ; then
               rm -f /etc/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs
               rm -f /etc/initramfs-tools/scripts/local-premount/expand-premount
               rm -f /etc/initramfs-tools/hooks/expand-tools
               rm -f "${INITRAMFS_UBOOT}"
               mkinitramfs -o "${INITRAMFS}" "${KERNEL_VERSION}"
               mkimage -A "${KERNEL_ARCH}" -T ramdisk -C none -n "initramfs-${KERNEL_VERSION}" -d "${INITRAMFS}" "${INITRAMFS_UBOOT}"
               rm -f "${INITRAMFS}"
             fi

functions.sh +3 -3

             # This file contains utility functions used by rpi23-gen-image.sh
             cleanup (){
               set +x
               set +e
               # Identify and kill all processes still using files
               echo "killing processes using mount point ..."
               fuser -k "${R}"
               sleep 3
               fuser -9 -k -v "${R}"
               # Clean up temporary .password file
               if [ -r ".password" ] ; then
                 shred -zu .password
               fi
               # Clean up all temporary mount points
               echo "removing temporary mount points ..."
               umount -l "${R}/proc" 2> /dev/null
               umount -l "${R}/sys" 2> /dev/null
               umount -l "${R}/dev/pts" 2> /dev/null
               umount "$BUILDDIR/mount/boot/firmware" 2> /dev/null
               umount "$BUILDDIR/mount" 2> /dev/null
               cryptsetup close "${CRYPTFS_MAPPING}" 2> /dev/null
               losetup -d "$ROOT_LOOP" 2> /dev/null
               losetup -d "$FRMW_LOOP" 2> /dev/null
               trap - 0 1 2 3 6
             }
             chroot_exec() {
               # Exec command in chroot
               LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot "${R}" "$@"
             }
             as_nobody() {
               # Exec command as user nobody
               sudo -E -u nobody LANG=C LC_ALL=C "$@"
             }
             install_readonly() {
               # Install file with user read-only permissions
               install -o root -g root -m 644 "$@"
             }
             install_exec() {
               # Install file with root exec permissions
               install -o root -g root -m 744 "$@"
             }
             use_template () {
               # Test if configuration template file exists
               if [ ! -r "./templates/${CONFIG_TEMPLATE}" ] ; then
                 echo "error: configuration template ${CONFIG_TEMPLATE} not found"
                 exit 1
               fi
               # Load template configuration parameters
               . "./templates/${CONFIG_TEMPLATE}"
             }
             chroot_install_cc() {
               # Install c/c++ build environment inside the chroot
               if [ -z "${COMPILER_PACKAGES}" ] ; then
                 COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
-            	# Install COMPILER_PACKAGES in chroot
+            	# Install COMPILER_PACKAGES in chroot - NEVER do "${COMPILER_PACKAGES}" -> breaks uboot
-                chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install "${COMPILER_PACKAGES}"
+                chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
               fi
             }
             chroot_remove_cc() {
               # Remove c/c++ build environment from the chroot
               if [ -n "${COMPILER_PACKAGES}" ] ; then
-                chroot_exec apt-get -qq -y --auto-remove purge "${COMPILER_PACKAGES}"
+                chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
                 COMPILER_PACKAGES=""
               fi
             }
             # https://serverfault.com/a/682849 - converts e.g. /24 to 255.255.255.0
             cdr2mask ()
             {
                # Number of args to shift, 255..255, first non-255 byte, zeroes
                set -- $(( 5 - ($1 / 8) )) 255 255 255 255 $(( (255 << (8 - ($1 % 8))) & 255 )) 0 0 0
                [ $1 -gt 1 ] && shift $1 || shift
                echo ${1-0}.${2-0}.${3-0}.${4-0}
             }

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages