Raspi2-3_GenImage Commit - r583:e8ebe4a99dc7 · Collaboration Tremplin des Sciences

files/firstboot/23-restart-dphys-swapfile.sh created 644 +5 0

@@ -0,0 +1,5
	1	# Restart dphys-swapfile service if it exists
	2	logger -t "rc.firstboot" "Restarting dphys-swapfile"
	3
	4	systemctl enable dphys-swapfile
	5	systemctl restart dphys-swapfile

README.md +3 0

             ##### `EXPANDROOT`=true
             Expand the root partition and filesystem automatically on first boot.
+            ##### `ENABLE_DPHYSSWAP`=true
+            Enable swap. The size of the swapfile is chosen relative to the size of the root partition. It'll use the `dphys-swapfile` package for that.
             ##### `ENABLE_QEMU`=false
             Generate kernel (`vexpress_defconfig`), file system image (`qcow2`) and DTB files that can be used for QEMU full system emulation (`vexpress-A15`). The output files are stored in the `$(pwd)/images/qemu` directory. You can find more information about running the generated image in the QEMU section of this readme file.

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

               echo "enable_uart=0"  >> "${BOOT_DIR}/config.txt"
             fi
+            # Disable dphys-swapfile service. Will get enabled on first boot
+            if [ "$ENABLE_DPHYSSWAP" = true ] ; then
+              chroot_exec systemctl disable dphys-swapfile
+            fi
             if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then
               # Create temporary directory for systemd-swap sources
               temp_dir=$(as_nobody mktemp -d)

bootstrap.d/50-firstboot.sh +15 -10

             # Prepare rc.firstboot script
             cat files/firstboot/10-begin.sh > "${ETC_DIR}/rc.firstboot"
-            # Ensure openssh server host keys are regenerated on first boot
-            if [ "$ENABLE_SSHD" = true ] ; then
-              cat files/firstboot/21-generate-ssh-keys.sh >> "${ETC_DIR}/rc.firstboot"
-            fi
             # Prepare filesystem auto expand
             if [ "$EXPANDROOT" = true ] ; then
               if [ "$ENABLE_CRYPTFS" = false ] ; then
-                cat files/firstboot/22-expandroot.sh >> "${ETC_DIR}/rc.firstboot"
+                cat files/firstboot/20-expandroot.sh >> "${ETC_DIR}/rc.firstboot"
               else
                 # Regenerate initramfs to remove encrypted root partition auto expand
-                cat files/firstboot/23-regenerate-initramfs.sh >> "${ETC_DIR}/rc.firstboot"
+                cat files/firstboot/21-regenerate-initramfs.sh >> "${ETC_DIR}/rc.firstboot"
+              fi
+              # Restart dphys-swapfile so the size of the swap file is relative to the resized root partition
+              if [ "$ENABLE_DPHYSSWAP" = true ] ; then
+                cat files/firstboot/23-restart-dphys-swapfile.sh >> "${ETC_DIR}/rc.firstboot"
               fi
             fi
+            # Ensure openssh server host keys are regenerated on first boot
+            if [ "$ENABLE_SSHD" = true ] ; then
+              cat files/firstboot/30-generate-ssh-keys.sh >> "${ETC_DIR}/rc.firstboot"
+            fi
             # Ensure that dbus machine-id exists
-            cat files/firstboot/24-generate-machineid.sh >> "${ETC_DIR}/rc.firstboot"
+            cat files/firstboot/40-generate-machineid.sh >> "${ETC_DIR}/rc.firstboot"
             # Create /etc/resolv.conf symlink
-            cat files/firstboot/25-create-resolv-symlink.sh >> "${ETC_DIR}/rc.firstboot"
+            cat files/firstboot/41-create-resolv-symlink.sh >> "${ETC_DIR}/rc.firstboot"
             # Configure automatic network interface names
             if [ "$ENABLE_IFNAMES" = true ] ; then
-              cat files/firstboot/26-config-ifnames.sh >> "${ETC_DIR}/rc.firstboot"
+              cat files/firstboot/42-config-ifnames.sh >> "${ETC_DIR}/rc.firstboot"
             fi
             # Finalize rc.firstboot script

files/firstboot/20-expandroot.sh ~~files/firstboot/22-expandroot.sh~~ renamed 0 -8

@@ -66,11 +66,3 EOF2
66	partprobe &&	66	partprobe &&
67	resize2fs /dev/${ROOT_PART} &&	67	resize2fs /dev/${ROOT_PART} &&
68	logger -t "rc.firstboot" "Root partition successfully resized."	68	logger -t "rc.firstboot" "Root partition successfully resized."
69
70	# Restart dphys-swapfile service if it exists
71	if systemctl list-units \| grep -q dphys-swapfile ; then
72	if systemctl is-enabled dphys-swapfile ; then
73	logger -t "rc.firstboot" "Restarting dphys-swapfile"
74	systemctl restart dphys-swapfile
75	fi
76	fi

files/firstboot/21-regenerate-initramfs.sh ~~files/firstboot/23-regenerate-initramfs.sh~~ renamed 0 0

NO CONTENT: file renamed from files/firstboot/23-regenerate-initramfs.sh to files/firstboot/21-regenerate-initramfs.sh

files/firstboot/30-generate-ssh-keys.sh ~~files/firstboot/21-generate-ssh-keys.sh~~ renamed 0 0

NO CONTENT: file renamed from files/firstboot/21-generate-ssh-keys.sh to files/firstboot/30-generate-ssh-keys.sh

files/firstboot/40-generate-machineid.sh ~~files/firstboot/24-generate-machineid.sh~~ renamed 0 0

NO CONTENT: file renamed from files/firstboot/24-generate-machineid.sh to files/firstboot/40-generate-machineid.sh

files/firstboot/41-create-resolv-symlink.sh ~~files/firstboot/25-create-resolv-symlink.sh~~ renamed 0 0

NO CONTENT: file renamed from files/firstboot/25-create-resolv-symlink.sh to files/firstboot/41-create-resolv-symlink.sh

files/firstboot/42-config-ifnames.sh ~~files/firstboot/26-config-ifnames.sh~~ renamed 0 0

NO CONTENT: file renamed from files/firstboot/26-config-ifnames.sh to files/firstboot/42-config-ifnames.sh

rpi23-gen-image.sh +6 0

             DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"}
             TIMEZONE=${TIMEZONE:="Europe/Berlin"}
             EXPANDROOT=${EXPANDROOT:=true}
+            ENABLE_DPHYSSWAP=${ENABLE_DPHYSSWAP:=true}
             # Keyboard settings
             XKB_MODEL=${XKB_MODEL:=""}
               APT_INCLUDES="${APT_INCLUDES},parted"
             fi
+            # Add dphys-swapfile package, required to enable swap
+            if [ "$ENABLE_DPHYSSWAP" = true ] ; then
+              APT_INCLUDES="${APT_INCLUDES},dphys-swapfile"
+            fi
             # Add dbus package, recommended if using systemd
             if [ "$ENABLE_DBUS" = true ] ; then
               APT_INCLUDES="${APT_INCLUDES},dbus"

	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