Raspi2-3_GenImage Commit - r569:c84998d2e8c2 · Collaboration Tremplin des Sciences

formating and dropbear fix for static ip

Unknown -

r569:c84998d2e8c2

parent child

Context file:

r569:c84998d2e8c2

Collapse all files

bootstrap.d/14-fstab.sh +14 0

@@ -46,6 +46,20 if [ "$ENABLE_INITRAMFS" = true ] ; then
46	install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"	46	install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"
47	fi	47	fi
48		48
		49	if [ "$ENABLE_DHCP" = false ] ; then
		50	# Get cdir from NET_ADDRESS e.g. 24
		51	cdir=$(${NET_ADDRESS} \| cut -d '/' -f2)
		52
		53	# Convert cdir ro netmask e.g. 24 to 255.255.255.0
		54	NET_MASK=$(cdr2mask "$cdir")
		55
		56	# Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
		57	sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
		58
		59	# Regenerate initramfs
		60	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
		61	fi
		62
49	if [ "$CRYPTFS_DROPBEAR" = true ]; then	63	if [ "$CRYPTFS_DROPBEAR" = true ]; then
50	if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then	64	if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
51	install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub	65	install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub

bootstrap.d/15-rpi-config.sh +20 -18

                 # Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
                 if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
             	  # set overlay to swap ttyAMA0 and ttyS0
                   echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
-            	  # if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
             	  if [ "$ENABLE_TURBO" = false ] ; then
                     echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
                   fi
             	fi
             	# Activate services
               # add string to cmdline
               CMDLINE="${CMDLINE} console=serial0,115200"
+              if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]|| [ "$RPI_MODEL" = 0 ]; then
+                # if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
+                if [ "$ENABLE_TURBO" = false ] ; then
+                  echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
+                fi
+              fi
               # 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"
-              # disable serial console systemd style
-              chroot_exec systemctl disable serial-getty\@"$SET_SERIAL".service
             fi
             if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then
               # Copy downloaded systemd-swap sources
               mv "${temp_dir}/systemd-swap" "${R}/tmp/"
-              # Set permissions of the systemd-swap sources
-              chown -R root:root "${R}/tmp/systemd-swap"
-              # Remove temporary directory for systemd-swap sources
-              rm -fr "${temp_dir}"
               # Change into downloaded src dir
               cd "${R}/tmp/systemd-swap" || exit
               # Build package
-              . ./package.sh debian
+              bash ./package.sh debian
-              # Install package
+              # Change back into script root dir
-              chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap-*any.deb
+              cd "${WORKDIR}" || exit
+              # Set permissions of the systemd-swap sources
+              chown -R root:root "${R}/tmp/systemd-swap"
+              # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR.
+              chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_4.0.1_any.deb
               # Enable service
               chroot_exec systemctl enable systemd-swap
-              # Change back into script root dir
+              # Remove temporary directory for systemd-swap sources
-              cd "${WORKDIR}" || exit
+              rm -fr "${temp_dir}"
             else
               # Enable ZSWAP in cmdline if systemd-swap is not used
               if [ "$KERNEL_ZSWAP" = true ] ; then
                 CMDLINE="${CMDLINE} zswap.enabled=1 zswap.max_pool_percent=25 zswap.compressor=lz4"
               fi
             fi
               if [ "$KERNEL_SECURITY" = true ] ; then
                 CMDLINE="${CMDLINE} apparmor=1 security=apparmor"
               fi

bootstrap.d/20-networking.sh 0 -14

@@ -57,20 +57,6 else # ENABLE_DHCP=false
57	-e "0,/NTP=\$/ s\|NTP=\$\|NTP=${NET_NTP_1}\|"\	57	-e "0,/NTP=\$/ s\|NTP=\$\|NTP=${NET_NTP_1}\|"\
58	-e "0,/NTP=\$/ s\|NTP=\$\|NTP=${NET_NTP_2}\|"\	58	-e "0,/NTP=\$/ s\|NTP=\$\|NTP=${NET_NTP_2}\|"\
59	"${ETC_DIR}/systemd/network/eth.network"	59	"${ETC_DIR}/systemd/network/eth.network"
60
61	if [ "$CRYPTFS_DROPBEAR" = true ] ; then
62	# Get cdir from NET_ADDRESS e.g. 24
63	cdir=$(${NET_ADDRESS} \| cut -d '/' -f2)
64
65	# Convert cdir ro netmask e.g. 24 to 255.255.255.0
66	NET_MASK=$(cdr2mask "$cdir")
67
68	# Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
69	sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
70
71	# Regenerate initramfs
72	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
73	fi
74	fi	60	fi
75		61
76	# Remove empty settings from network configuration	62	# Remove empty settings from network configuration

bootstrap.d/21-firewall.sh 0 0

NO CONTENT: modified file

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