Raspi2-3_GenImage Commit - r576:291657012c0e · Collaboration Tremplin des Sciences

Reordered firstboot script...

Yannick Schinko -

r576:291657012c0e

parent child

Context file:

r576:291657012c0e

Collapse all files

bootstrap.d/50-firstboot.sh +12 -12

             #
             # First boot actions
             #
             # Load utility functions
             . ./functions.sh
             # 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/20-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/30-expandroot.sh >> "${ETC_DIR}/rc.firstboot"
+                cat files/firstboot/20-expandroot.sh >> "${ETC_DIR}/rc.firstboot"
-                # 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/31-restart-dphys-swapfile.sh >> "${ETC_DIR}/rc.firstboot"
-                fi
               else
                 # Regenerate initramfs to remove encrypted root partition auto expand
-                cat files/firstboot/33-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/40-generate-machineid.sh >> "${ETC_DIR}/rc.firstboot"
             # Create /etc/resolv.conf symlink
             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/42-config-ifnames.sh >> "${ETC_DIR}/rc.firstboot"
             fi
             # Finalize rc.firstboot script
             cat files/firstboot/99-finish.sh >> "${ETC_DIR}/rc.firstboot"
             chmod +x "${ETC_DIR}/rc.firstboot"
             # Install default rc.local if it does not exist
             if [ ! -f "${ETC_DIR}/rc.local" ] ; then
               install_exec files/etc/rc.local "${ETC_DIR}/rc.local"
             fi
             # Add rc.firstboot script to rc.local
             sed -i '/exit 0/d' "${ETC_DIR}/rc.local"
             echo /etc/rc.firstboot >> "${ETC_DIR}/rc.local"
             echo exit 0 >> "${ETC_DIR}/rc.local"

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

             logger -t "rc.firstboot" "Expanding root partition"
             # Detect root partition device
             ROOT_PART=$(mount | sed -n 's|^/dev/\(.*\) on / .*|\1|p')
             if [ -z "$ROOT_PART" ] ; then
               log_warning_msg "unable to detect root partition device"
               return 1
             fi
             # Extract root device name
             case "${ROOT_PART}" in
               mmcblk0*) ROOT_DEV=mmcblk0 ;;
               sda*)     ROOT_DEV=sda ;;
             esac
             # Check detected root partition name
             PART_NUM=$(echo ${ROOT_PART} | grep -o '[1-9][0-9]*$')
             if [ "$PART_NUM" = "$ROOT_PART" ] ; then
               logger -t "rc.firstboot" "$ROOT_PART is not an SD card. Don't know how to expand"
               return 0
             fi
             # NOTE: the NOOBS partition layout confuses parted. For now, let's only
             # agree to work with a sufficiently simple partition layout
             if [ "$PART_NUM" -gt 2 ] ; then
               logger -t "rc.firstboot" "Your partition layout is not currently supported by this tool."
               return 0
             fi
             # Check if last partition number
             LAST_PART_NUM=$(parted /dev/${ROOT_DEV} -ms unit s p | tail -n 1 | cut -f 1 -d:)
             if [ $LAST_PART_NUM -ne $PART_NUM ]; then
               logger -t "rc.firstboot" "$ROOT_PART is not the last partition. Don't know how to expand"
               return 0
             fi
             # Get the starting offset of the root partition
             PART_START=$(parted /dev/${ROOT_DEV} -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d: | sed 's/[^0-9]//g')
             if [ -z "$PART_START" ] ; then
               logger -t "rc.firstboot" "${ROOT_DEV} unable to get starting sector of the partition"
               return 1
             fi
             # Get the possible last sector for the root partition
             PART_LAST=$(fdisk -l /dev/${ROOT_DEV} | grep '^Disk.*sectors' | awk '{ print $7 - 1 }')
             if [ -z "$PART_LAST" ] ; then
               logger -t "rc.firstboot" "${ROOT_DEV} unable to get last sector of the partition"
               return 1
             fi
             ### Since rc.local is run with "sh -e", let's add "|| true" to prevent premature exit
             fdisk /dev/${ROOT_DEV} <<EOF2 || true
             p
             d
             $PART_NUM
             n
             p
             $PART_NUM
             $PART_START
             $PART_LAST
             p
             w
             EOF2
             # Reload the partition table, resize root filesystem then remove resizing code from this file
             partprobe &&
               resize2fs /dev/${ROOT_PART} &&
               logger -t "rc.firstboot" "Root partition successfully resized."
-            # Restart dphys-swapfile service if it exists
-            if systemctl list-units | grep -q dphys-swapfile ; then
-              if systemctl is-enabled dphys-swapfile ; then
-                logger -t "rc.firstboot" "Restarting dphys-swapfile"
-                systemctl restart dphys-swapfile
-              fi
-            fi

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

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

files/firstboot/23-restart-dphys-swapfile.sh ~~files/firstboot/31-restart-dphys-swapfile.sh~~ renamed +4 -2

@@ -1,5 +1,7
1	logger -t "rc.firstboot" "Restarting dphys-swapfile"	1	# Restart dphys-swapfile service if it exists
		2	if systemctl list-units \| grep -q dphys-swapfile ; then
		3	logger -t "rc.firstboot" "Restarting dphys-swapfile"
2		4
3	if systemctl ~~is-~~enabled dphys-swapfile ; ~~then~~	5	systemctl enable dphys-swapfile
4	systemctl restart dphys-swapfile	6	systemctl restart dphys-swapfile
5	fi	7	fi

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

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

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