Raspi2-3_GenImage Commit - r574:5a07e0ab6bd8 · Collaboration Tremplin des Sciences

rebase master testing

Unknown -

r574:5a07e0ab6bd8

parent child

Context file:

r574:5a07e0ab6bd8

Collapse all files

README.md +13 -1

             ## Supported parameters and settings
             #### APT settings:
-            ##### `APT_SERVER`="ftp.debian.org/debian"
+            ##### `APT_SERVER`="ftp.debian.org"
             Set Debian packages server address. Choose a server from the list of Debian worldwide [mirror sites](https://www.debian.org/mirror/list). Using a nearby server will probably speed-up all required downloads within the bootstrapping process.
             ##### `APT_PROXY`=""
             Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once. If `apt-cacher-ng` is running on default `http://127.0.0.1:3142` it is autodetected and you don't need to set this.
+            ##### `KEEP_APT_PROXY`=false
+            Keep the APT_PROXY settings used in the bootsrapping process in the generated image.
             ##### `APT_INCLUDES`=""
             A comma-separated list of additional packages to be installed by debootstrap during bootstrapping.
             ##### `ENABLE_IFNAMES`=true
             Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names.
+            ##### `ENABLE_SPLASH`=true
+            Enable default Raspberry Pi boot up rainbow splash screen.
+            ##### `ENABLE_LOGO`=true
+            Enable default Raspberry Pi console logo (image of four raspberries in the top left corner).
+            ##### `ENABLE_SILENT_BOOT`=false
+            Set the verbosity of console messages shown during boot up to a strict minimum.
             ##### `DISABLE_UNDERVOLT_WARNINGS`=
             Disable RPi2/3 under-voltage warnings and overlays. Setting the parameter to `1` will disable the warning overlay. Setting it to `2` will additionally allow RPi2/3 turbo mode when low-voltage is present.

bootstrap.d/13-kernel.sh +2 -3

                   cd "${KERNEL_DIR}" || exit
             	  if [ "$KERNEL_ARCH" = arm64 ] ; then
-            	    #Fix SD_DRIVER mess in 64bit config
+            	    #Fix SD_DRIVER upstream and downstream mess in 64bit RPIdeb_config
-            	    # use correct driver MMC_BCM2835_MMC instead of MMC_BCM2835_SDHOST - variable naming is bs
+            	    # use correct driver MMC_BCM2835_MMC instead of MMC_BCM2835_SDHOST - see https://www.raspberrypi.org/forums/viewtopic.php?t=210225
             	    set_kernel_config CONFIG_MMC_BCM2835 n
             	    set_kernel_config CONFIG_MMC_SDHCI_IPROC n
             	    set_kernel_config CONFIG_USB_DWC2 n
                     set_kernel_config CONFIG_INTEGRITY_AUDIT y
                     set_kernel_config CONFIG_INTEGRITY_SIGNATURE y
                     set_kernel_config CONFIG_INTEGRITY_TRUSTED_KEYRING y
-            		set_kernel_config CONFIG_SYSTEM_TRUSTED_KEYS ""
                     # This option provides support for retaining authentication tokens and access keys in the kernel.
                     set_kernel_config CONFIG_KEYS y

bootstrap.d/14-fstab.sh +3 -5

               install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
               echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
-              if [ "$ENABLE_USBBOOT" = true ] ; then
-                # Add usb/sda2 disk to crypttab
-                sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
-              fi
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 # Add usb/sda1 disk to crypttab
                 sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
             if [ "$ENABLE_USBBOOT" = true ] ; then
               sed -i "s/mmcblk0p1/sda1/" "${ETC_DIR}/fstab"
               sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
+              # Add usb/sda2 disk to crypttab
+              sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
             fi
             # Generate initramfs file

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

@@ -102,9 +102,24 else
102	CMDLINE="${CMDLINE} net.ifnames=1"	102	CMDLINE="${CMDLINE} net.ifnames=1"
103	fi	103	fi
104		104
		105	# Disable Raspberry Pi console logo
		106	if [ "$ENABLE_LOGO" = false ] ; then
		107	CMDLINE="${CMDLINE} logo.nologo"
		108	fi
		109
		110	# Strictly limit verbosity of boot up console messages
		111	if [ "$ENABLE_SILENT_BOOT" = true ] ; then
		112	CMDLINE="${CMDLINE} quiet loglevel=0 rd.systemd.show_status=auto rd.udev.log_priority=0"
		113	fi
		114
105	# Install firmware config	115	# Install firmware config
106	install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"	116	install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"
107		117
		118	# Disable Raspberry Pi console logo
		119	if [ "$ENABLE_SLASH" = false ] ; then
		120	echo "disable_splash=1" >> "${BOOT_DIR}/config.txt"
		121	fi
		122
108	# Locks CPU frequency at maximum	123	# Locks CPU frequency at maximum
109	if [ "$ENABLE_TURBO" = true ] ; then	124	if [ "$ENABLE_TURBO" = true ] ; then
110	echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"	125	echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"

bootstrap.d/21-firewall.sh +1 0

                   # 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"

functions.sh +11 -10

-            #!/bin/sh
             # This file contains utility functions used by rpi23-gen-image.sh
             cleanup (){
                 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}
+            }
             # GPL v2.0 - #https://github.com/sakaki-/bcmrpi3-kernel-bis/blob/master/conform_config.sh
             set_kernel_config() {
               # flag as $1, value to set as $2, config must exist at "./.config"
                 echo "${TGT}"="${2}" >> .config
               fi
             }
             # unset kernel config parameter
             unset_kernel_config() {
               # unsets flag with the value of $1, config must exist at "./.config"
               TGT="CONFIG_${1#CONFIG_}"
               sed -i "s/^${TGT}=.*/# ${TGT} is not set/" .config
             }
              No newline at end of file
-            # 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}
-            }
  No newline at end of file

rpi23-gen-image.sh +11 -3

             NEXMON_URL=${NEXMON_URL:=https://github.com/seemoo-lab/nexmon.git}
             SYSTEMDSWAP_URL=${SYSTEMDSWAP_URL:=https://github.com/Nefelim4ag/systemd-swap.git}
             # Kernel deb packages for 32bit kernel
             RPI_32_KERNEL_URL=${RPI_32_KERNEL_URL:=https://github.com/hypriot/rpi-kernel/releases/download/v4.14.34/raspberrypi-kernel_20180422-141901_armhf.deb}
             RPI_32_KERNELHEADER_URL=${RPI_32_KERNELHEADER_URL:=https://github.com/hypriot/rpi-kernel/releases/download/v4.14.34/raspberrypi-kernel-headers_20180422-141901_armhf.deb}
             # APT settings
             APT_PROXY=${APT_PROXY:=""}
             APT_SERVER=${APT_SERVER:="ftp.debian.org"}
+            KEEP_APT_PROXY=${KEEP_APT_PROXY:=false}
             # Feature settings
             ENABLE_PRINTK=${ENABLE_PRINTK:=false}
             ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}
             ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}
             ENABLE_IFNAMES=${ENABLE_IFNAMES:=true}
+            ENABLE_SPLASH=${ENABLE_SPLASH:=true}
+            ENABLE_LOGO=${ENABLE_LOGO:=true}
+            ENABLE_SILENT_BOOT=${ENABLE_SILENT_BOOT=false}
             DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=}
             # Kernel compilation settings
             APT_EXCLUDES=${APT_EXCLUDES:=""}
             # Packages required for bootstrapping
-            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"
+            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
+            #Requierd=netselect-apt
             MISSING_PACKAGES=""
             # Packages installed for c/c++ build environment in chroot (keep empty)
             rm -rf "${R}/run/*"
             rm -rf "${R}/tmp/*"
+            # Clean up APT proxy settings
+            if [ "$KEEP_APT_PROXY" = false ] ; then
+              rm -f "${ETC_DIR}/apt/apt.conf.d/10proxy"
+            fi
             # Clean up files
             rm -f "${ETC_DIR}/ssh/ssh_host_*"
             rm -f "${ETC_DIR}/dropbear/dropbear_*"
             rm -f "${ETC_DIR}/apt/sources.list.save"
             rm -f "${ETC_DIR}/resolvconf/resolv.conf.d/original"
             rm -f "${ETC_DIR}/*-"
-            rm -f "${ETC_DIR}/apt/apt.conf.d/10proxy"
             rm -f "${ETC_DIR}/resolv.conf"
             rm -f "${R}/root/.bash_history"
             rm -f "${R}/var/lib/urandom/random-seed"

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