Raspi2-3_GenImage Commit - r541:fa11a3c0304b · Collaboration Tremplin des Sciences

removed the usb part from ubootusb

Unknown -

r541:fa11a3c0304b

parent child

Context file:

r541:fa11a3c0304b

bootstrap.d/14-fstab.sh +15 -1

             # Install and setup fstab
             install_readonly files/mount/fstab "${ETC_DIR}/fstab"
-            if [ "$ENABLE_UBOOTUSB" = true ] ; then
+            if [ "$ENABLE_USBBOOT" = true ] ; then
               sed -i "s/mmcblk0p1/sda1/" "${ETC_DIR}/fstab"
               sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
             fi
                 fi
             	if [ "$CRYPTFS_DROPBEAR" = true ] ; then
+                  # Get cdir from NET_ADDRESS e.g. 24
+                  cdir=$(${NET_ADDRESS} | cut -d '/' -f2)
+                  # Convert cdir ro netmask e.g. 24 to 255.255.255.0
+                  NET_MASK=$(cdr2mask "$cdir")
+            	  # Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
+                  sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
+            	  # Regenerate initramfs
+            	  chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
+                fi
+            	if [ "$CRYPTFS_DROPBEAR" = true ]; then
             	  if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
              	    install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
              	    cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys

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

             fi
             # Setup firmware boot cmdline
-            if [ "$ENABLE_UBOOTUSB" = true ] ; then
+            if [ "$ENABLE_USBBOOT" = true ] ; then
               CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd"
             else
               if [ "$ENABLE_SPLITFS" = true ] ; then
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 CMDLINE=$(echo "${CMDLINE}" | sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
               else
-                if [ "$ENABLE_UBOOTUSB" = true ] ; then
+                if [ "$ENABLE_USBBOOT" = true ] ; then
                   CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/")
                 else
                   CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")

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

rpi23-gen-image.sh +8 -6

             ENABLE_REDUCE=${ENABLE_REDUCE:=false}
             ENABLE_UBOOT=${ENABLE_UBOOT:=false}
             UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
-            ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}
+            ENABLE_USBBOOT=${ENABLE_USBBOOT=false}
             ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
             ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
             ENABLE_NEXMON=${ENABLE_NEXMON:=false}
             # Add device-tree-compiler required for building the U-Boot bootloader
             if [ "$ENABLE_UBOOT" = true ] ; then
               APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
-            #else
+            fi
-            #  if [ "$ENABLE_UBOOTUSB" = true ] ; then
-            #    echo "error: Enabling UBOOTUSB requires u-boot to be enabled"
+            if [ "$ENABLE_USBBOOT" = true ] ; then
-            #	exit 1
+              if ["$RPI_MODEL" != 3 ] || ["$RPI_MODEL" != 3P ] ; then
-            #  fi
+                echo "error: Booting from USB alone is only supported by Raspberry Pi 3 and 3P"
+                exit 1
+              fi
             fi
             # Check if root SSH (v2) public key file exists

General Comments 0

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

No TODOs yet

	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