Raspi2-3_GenImage Commit - r384:ebd8e6e39c8b · Collaboration Tremplin des Sciences

README.md +4 -4

             ##### Flashing examples:
             ```shell
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie.img /dev/mmcblk0
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster.img /dev/mmcblk0
-            dd bs=4M if=./images/jessie/2017-01-23-rpi3-jessie.img of=/dev/mmcblk0
+            dd bs=4M if=./images/buster/2017-01-23-rpi3-buster.img of=/dev/mmcblk0
             ```
             If you have set `ENABLE_SPLITFS`, copy the `-frmw` image on the microSD card, then the `-root` one on the USB drive:
             ```shell
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-frmw.img /dev/mmcblk0
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster-frmw.img /dev/mmcblk0
-            bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-root.img /dev/sdc
+            bmaptool copy ./images/buster/2017-01-23-rpi3-buster-root.img /dev/sdc
             ```
             ## QEMU emulation

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

             # Setup firmware boot cmdline
             if [ "$ENABLE_SPLITFS" = true ] ; then
-              CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
+              CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
             else
-              CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
+              CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
             fi
             # Add encrypted root partition to cmdline.txt
               CMDLINE="${CMDLINE} net.ifnames=1"
             fi
-            # Set init to systemd if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-              CMDLINE="${CMDLINE} init=/bin/systemd"
-            fi
             # Install firmware boot cmdline
             echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"

bootstrap.d/20-networking.sh +7 -8

             # Install and setup hostname
             install_readonly files/network/hostname "${ETC_DIR}/hostname"
-            sed -i "s/^rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hostname"
+            sed -i "s/^RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hostname"
             # Install and setup hosts
             install_readonly files/network/hosts "${ETC_DIR}/hosts"
-            sed -i "s/rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hosts"
+            sed -i "s/RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hosts"
             # Setup hostname entry with static IP
             if [ "$NET_ADDRESS" != "" ] ; then
             sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/wlan.network"
             # Move systemd network configuration if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+            mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
-              mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
+            # If WLAN is enabled copy wlan configuration too
-            	if [ "$ENABLE_WIRELESS" = true ] ; then
+            if [ "$ENABLE_WIRELESS" = true ] ; then
-            	mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
+              mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
-            	fi
-              rm -fr "${ETC_DIR}/systemd/network"
             fi
+            rm -fr "${ETC_DIR}/systemd/network"
             # Enable systemd-networkd service
             chroot_exec systemctl enable systemd-networkd

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

               # make sure iptables-legacy is the used alternatives
               #iptables-save and -restore are slaves of iptables and thus are set accordingly
-              if ! [ "$RELEASE" = jessie ] ; then
+              chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
-            	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"

bootstrap.d/42-fbturbo.sh +1 -5

               fi
               # Install Xorg build dependencies
-              if [ "$RELEASE" = "jessie" ] ; then
+              chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-                chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-                chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              fi
               # Build and install fbturbo driver inside chroot
               chroot_exec /bin/bash -x <<'EOF'

bootstrap.d/99-reduce.sh +2 -11

               # Replace bash shell by dash shell (experimental)
               if [ "$REDUCE_BASH" = true ] ; then
-                if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+                # Purge bash and update alternatives
-                  echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
+                echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
-                else
-                  echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --force-yes bash
-                fi
                 chroot_exec update-alternatives --install /bin/bash bash /bin/dash 100
               fi
                 chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data
               fi
-              # Re-install tools for managing kernel modules
-              if [ "$RELEASE" = "jessie" ] ; then
-                chroot_exec apt-get -qq -y install module-init-tools
-              fi
               # Remove GPU kernels
               if [ "$ENABLE_MINGPU" = true ] ; then
                 rm -f "${BOOT_DIR}/start.elf"

files/network/hostname +1 -1

	@@ -1,1 +1,1
	1	rpi2-jessie		1	RaspberryPI

files/network/hosts +1 -1

 .0.0.1       localhost
-.0.1.1       rpi2-jessie
+.0.1.1       RaspberryPI
             ::1             localhost ip6-localhost ip6-loopback
             ff02::1         ip6-allnodes

functions.sh +2 -6

               # 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
-                if [ "$RELEASE" = "jessie" ] ; then
+                chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
-                  chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-                elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-                  chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
-                fi
               fi
             }

rpi23-gen-image.sh +1 -1

-            #!/bin/bash
+            #!/bin/sh
             ########################################################################
             # rpi23-gen-image.sh					       2015-2017
             #

	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