Raspi2-3_GenImage Commit - r524:213afb8eaa67 · Collaboration Tremplin des Sciences

may break - be caref

Unknown -

r524:213afb8eaa67

parent child

Context file:

r524:213afb8eaa67

Collapse all files

bootstrap.d/13-kernel.sh +1 -8

             # Need to use kali kernel src if nexmon is enabled
             if [ "$ENABLE_NEXMON" = true ] ; then
               KERNEL_URL="${KALI_KERNEL_URL}"
+              # Clear Branch and KernelSRC_DIR if using nexmon. Everyone will forget to clone kali kernel instead of nomrla kernel
               KERNEL_BRANCH=""
               KERNELSRC_DIR=""
             fi
             	    unset_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE
             	  fi
             	  #Revert to previous directory
             	  cd "${WORKDIR}" || exit
               if [ "$KERNEL_HEADERS" = true ] && [ "$KERNEL_REDUCE" = false ] ; then
                 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_HDR_PATH=../.. headers_install
               fi
-            # make tar.gz kernel package - missing os bzw. modules
-            #** ** **  WARNING  ** ** **
-            #Your architecture did not define any architecture-dependent files
-            #to be placed into the tarball. Please add those to ./scripts/package/buildtar .
-            #  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" targz-pkg
               # Prepare boot (firmware) directory
               mkdir "${BOOT_DIR}"
               fi
             else # BUILD_KERNEL=false
-              #  echo Install precompiled kernel...
-              #  echo error: not implemented
               if [ "$SET_ARCH" = 64 ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
             	# Use Sakakis modified kernel if ZSWAP is active

bootstrap.d/15-rpi-config.sh +1 -3

             # Load utility functions
             . ./functions.sh
-            #if [ "$BUILD_KERNEL" = true ] ; then
             if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
               # Install boot binaries from local directory
               cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
               chown -R root:root "${BOOT_DIR}"
               chmod -R 600 "${BOOT_DIR}"
             fi
-            #fi
             # Setup firmware boot cmdline
             if [ "$ENABLE_UBOOTUSB" = true ] ; then
               CMDLINE="${CMDLINE} console=serial0,115200"
               # Enable serial console systemd style
-              chroot_exec systemctl enable serial-getty@serial0.service
+              chroot_exec systemctl enable serial-getty\@serial0.service
             else
               echo "enable_uart=0"  >> "${BOOT_DIR}/config.txt"
             fi

bootstrap.d/21-firewall.sh +5 -3

               # Create iptables configuration directory
               mkdir -p "${ETC_DIR}/iptables"
-              # make sure iptables-legacy is the used alternatives
+              if [ "$KERNEL_NF" = false ] ; then
                 # iptables-save and -restore are slaves of iptables and thus are set accordingly
                 chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
+              fi
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"
               chroot_exec systemctl enable iptables.service
               if [ "$ENABLE_IPV6" = true ] ; then
-                # make sure ip6tables-legacy is the used alternatives
+                if [ "$KERNEL_NF" = false ] ; then
+                # iptables-save and -restore are slaves of iptables and thus are set accordingly
                 chroot_exec update-alternatives --verbose --set ip6tables /usr/sbin/ip6tables-legacy
+            	fi
                 # Install ip6tables systemd service
                 install_readonly files/iptables/ip6tables.service "${ETC_DIR}/systemd/system/ip6tables.service"

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

             # Extract kernel arch
             case "${KERNEL_ARCH}" in
               arm*) KERNEL_ARCH=arm ;;
+              aarch64) KERNEL_ARCH=arm64 ;;
             esac
             # Regenerate initramfs

rpi23-gen-image.sh +1 0

             KERNEL_BPF=${KERNEL_BPF:=false}
             KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=powersave}
             KERNEL_SECURITY=${KERNEL_SECURITY:=false}
+            KERNEL_NF=${KERNEL_NF:=false}
             # Kernel compilation from source directory settings
             KERNELSRC_DIR=${KERNELSRC_DIR:=""}

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