Raspi2-3_GenImage Commit - r87:861073c44ead · Collaboration Tremplin des Sciences

Merge pull request #37 from stevebrandli/enhance...

drtyhlpr -

r87:861073c44ead

parent child

Context file:

r87:861073c44ead

Collapse all files

.gitignore +1 0

             images
             custom.d
+            packages
             *.swp
             *.bak
             *.log

README.md +11 -1

             Enable iptables IPv4/IPv6 firewall. Simplified ruleset: Allow all outgoing connections. Block all incoming connections except to OpenSSH service.
             ##### `ENABLE_USER`=true
-            Create pi user with password raspberry
+            Create non-root user with password raspberry. Unless overridden with `USER_NAME`=user, username will be `pi`.
+            ##### `USER_NAME`=pi
+            Non-root user to create.  Ignored if `ENABLE_USER`=false
             ##### `ENABLE_ROOT`=true
             Set root user password so root login will be enabled
             ##### `KERNELSRC_PREBUILT`=false
             With this parameter set to true the script expects the existing kernel sources directory to be already successfully cross-compiled. The parameters `KERNELSRC_CLEAN`, `KERNELSRC_CONFIG` and `KERNEL_MENUCONFIG` are ignored and no kernel compilation tasks are performed.
+            ##### `FIRMWAREDIR`=""
+            The directory containing a local copy of the firmware from the [RaspberryPi firmware project](https://github.com/raspberrypi/firmware). Default is to download the latest firmware directly from the project.
             #### Reduce disk usage:
             The following list of parameters is ignored if `ENABLE_REDUCE`=false.
             | `sysctl.d` | Swapping and Network Hardening configuration |
             | `xorg` | fbturbo Xorg driver configuration |
+            Debian custom packages, i.e. those not in the debian repositories, can be installed by placing them in the `packages` directory. They are installed immediately after packages from the repositories are installed. Any dependencies listed in the custom packages will be downloaded automatically from the repositories. Do not list these custom packages in `APT_INCLUDES`.
+            Scripts in the custom.d directory will be executed after all other installation is complete but before the image is created.
             ## Logging of the bootstrapping process
             All information related to the bootstrapping process and the commands executed by the `rpi2-gen-image.sh` script can easily be saved into a logfile. The common shell command `script` can be used for this purpose:

bootstrap.d/11-apt.sh +9 0

@@ -34,4 +34,13 fi
34	# Upgrade package index and update all installed packages and changed dependencies	34	# Upgrade package index and update all installed packages and changed dependencies
35	chroot_exec apt-get -qq -y update	35	chroot_exec apt-get -qq -y update
36	chroot_exec apt-get -qq -y -u dist-upgrade	36	chroot_exec apt-get -qq -y -u dist-upgrade
		37
		38	if [ -d packages ] ; then
		39	for package in packages/*.deb ; do
		40	cp $package ${R}/tmp
		41	chroot_exec dpkg --unpack /tmp/$(basename $package)
		42	done
		43	fi
		44	chroot_exec apt-get -qq -y -f install
		45
37	chroot_exec apt-get -qq -y check	46	chroot_exec apt-get -qq -y check

bootstrap.d/13-kernel.sh +11 0

                 rm -fr "${KERNELDIR}"
               fi
+              if [ -n "$FIRMWAREDIR" ] && [ -d "$FIRMWAREDIR" ] ; then
+                # Install boot binaries from local directory
+                cp ${FIRMWAREDIR}/boot/bootcode.bin ${BOOTDIR}/bootcode.bin
+                cp ${FIRMWAREDIR}/boot/fixup.dat ${BOOTDIR}/fixup.dat
+                cp ${FIRMWAREDIR}/boot/fixup_cd.dat ${BOOTDIR}/fixup_cd.dat
+                cp ${FIRMWAREDIR}/boot/fixup_x.dat ${BOOTDIR}/fixup_x.dat
+                cp ${FIRMWAREDIR}/boot/start.elf ${BOOTDIR}/start.elf
+                cp ${FIRMWAREDIR}/boot/start_cd.elf ${BOOTDIR}/start_cd.elf
+                cp ${FIRMWAREDIR}/boot/start_x.elf ${BOOTDIR}/start_x.elf
+              else
                 # Install latest boot binaries from raspberry/firmware github
                 wget -q -O "${BOOTDIR}/bootcode.bin" https://github.com/raspberrypi/firmware/raw/master/boot/bootcode.bin
                 wget -q -O "${BOOTDIR}/fixup.dat" https://github.com/raspberrypi/firmware/raw/master/boot/fixup.dat
                 wget -q -O "${BOOTDIR}/start.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start.elf
                 wget -q -O "${BOOTDIR}/start_cd.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start_cd.elf
                 wget -q -O "${BOOTDIR}/start_x.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start_x.elf
+              fi
             else # BUILD_KERNEL=false
               # Kernel installation

bootstrap.d/20-networking.sh +5 0

@@ -70,3 +70,8 if [ "$ENABLE_HARDNET" = true ] ; then
70	# Setup resolver warnings about spoofed addresses	70	# Setup resolver warnings about spoofed addresses
71	sed -i "s/^# spoof warn/spoof warn/" "${ETCDIR}/host.conf"	71	sed -i "s/^# spoof warn/spoof warn/" "${ETCDIR}/host.conf"
72	fi	72	fi
		73
		74	# Enable time sync
		75	if [ "NET_NTP_1" != "" ] ; then
		76	chroot_exec systemctl enable systemd-timesyncd.service
		77	fi

bootstrap.d/30-security.sh +3 -2

             # Setup default user
             if [ "$ENABLE_USER" = true ] ; then
-              chroot_exec adduser --gecos pi --add_extra_groups --disabled-password pi
+              chroot_exec adduser --gecos $USER_NAME --add_extra_groups \
-              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_PASSWORD}" pi
+            	--disabled-password $USER_NAME
+              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_PASSWORD}" $USER_NAME
             fi
             # Setup root password or not

rpi2-gen-image.sh +4 0

             BOOTDIR="${R}/boot/firmware"
             KERNELDIR="${R}/usr/src/linux"
+            # Firmware directory: Blank if download from github
+            FIRMWAREDIR=${FIRMWAREDIR:=""}
             # General settings
             HOSTNAME=${HOSTNAME:=rpi2-${RELEASE}}
             PASSWORD=${PASSWORD:=raspberry}
             ENABLE_WM=${ENABLE_WM:=""}
             ENABLE_RSYSLOG=${ENABLE_RSYSLOG:=true}
             ENABLE_USER=${ENABLE_USER:=true}
+            USER_NAME=${USER_NAME:="pi"}
             ENABLE_ROOT=${ENABLE_ROOT:=false}
             ENABLE_ROOT_SSH=${ENABLE_ROOT_SSH:=false}

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