package/petitboot: misc enhancement

HOST_PROG_SHUTDOWN currently references a file that doesn't exist. Fix by setting it to /usr/libexec/petitboot/bb-kexec-reboot, which this package already installs but doesn't use.

Signed-off-by Reza Arbab <[email protected]>

---
  package/petitboot/petitboot.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

package/petitboot/petitboot.mk +0 -0

index 8b4c14207ec4..8d220f88f45a 100644

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Reza" == Reza Arbab <[email protected]> writes:

HOST_PROG_SHUTDOWN currently references a file that doesn't exist. Fix by setting it to /usr/libexec/petitboot/bb-kexec-reboot, which this package already installs but doesn't use.

Signed-off-by Reza Arbab <[email protected]>

index 8d220f88f45a..556d41230237 100644

package/petitboot/petitboot.mk +4 -0

@@ -55,6 +55,10 @@ define PETITBOOT_POST_INSTALL
  		$(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb
  	$(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \
  		$(TARGET_DIR)/etc/init.d/S15pb-discover
+	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \
+		$(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules
+	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/sysctl.conf \
+		$(TARGET_DIR)/etc/sysctl.d/petitboot.conf
  	mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/
  	ln -sf /usr/sbin/pb-udhcpc \
  		$(TARGET_DIR)/usr/share/udhcpc/default.script.d/

package/petitboot/sysctl.conf new file +0 -0

new file mode 100644
index 000000000000..02ab8e3275b5

Le 06/09/2023 à 21:46, Reza Arbab a écrit :

package/petitboot/petitboot.mk

Quoted 8 lines

package/petitboot/petitboot-console-ui.rules new file +4 -0

@@ -0,0 +1,4 @@
+# spawn a petitboot UI on common user-visible interface devices
+SUBSYSTEM=="tty", KERNEL=="hvc*", RUN+="/usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 $name linux"
+SUBSYSTEM=="tty", KERNEL=="tty0", RUN+="/usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 $name linux"
+SUBSYSTEM=="tty", KERNEL=="ttyS*", RUN+="/usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 $name linux"

package/petitboot/petitboot.mk +0 -0

Could you add:

SUBSYSTEM=="tty", KERNEL=="ttyGF*", RUN+="/usr/libexec/petitboot/pb-console --getty=/sbin/getty --detach -- -n -i $name 0 linux"

It's needed for my work on virt-m68k petitboot.

I think you also need:

system/Config.in +0 -0

index 1ca7690ea3ba..786ec9a1c6b3 100644
@@ -375,7 +375,7 @@ config BR2_SYSTEM_BIN_SH
 

menuconfig BR2_TARGET_GENERIC_GETTY
bool "Run a getty (login prompt) after boot"

system/Config.in +1 -1

-       default y
+       default y         if !BR2_PACKAGE_PETITBOOT

if BR2_TARGET_GENERIC_GETTY
config BR2_TARGET_GENERIC_GETTY_PORT

Otherwise the petitboot prompt will be mixed with getty prompt.

Quoted 16 lines · Laurent Vivier

I think you also need:

system/Config.in +0 -0

index 1ca7690ea3ba..786ec9a1c6b3 100644
@@ -375,7 +375,7 @@ config BR2_SYSTEM_BIN_SH
 

menuconfig BR2_TARGET_GENERIC_GETTY
bool "Run a getty (login prompt) after boot"

system/Config.in +1 -1

-       default y
+       default y         if !BR2_PACKAGE_PETITBOOT

if BR2_TARGET_GENERIC_GETTY
config BR2_TARGET_GENERIC_GETTY_PORT

Quoted 1 line

Otherwise the petitboot prompt will be mixed with getty prompt.

This makes sense, but oddly, all our configs have

BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_PORT="hvc0"

Let me try to figure out why it's never caused problems.

Add a udev rule to enable notification of media change events on removable devices, so petitboot can dynamically adapt to them.

Signed-off-by Reza Arbab <[email protected]>

---
  package/petitboot/petitboot.mk               | 2 ++
  package/petitboot/removable-event-poll.rules | 3 +++
  2 files changed, 5 insertions(+)

create mode 100644 package/petitboot/removable-event-poll.rules

package/petitboot/petitboot.mk +2 -0

index 556d41230237..9326738aa038 100644
@@ -57,6 +57,8 @@ define PETITBOOT_POST_INSTALL
  		$(TARGET_DIR)/etc/init.d/S15pb-discover
  	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/petitboot-console-ui.rules \
  		$(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules
+	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/removable-event-poll.rules \
+		$(TARGET_DIR)/etc/udev/rules.d/removable-event-poll.rules
  	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/sysctl.conf \
  		$(TARGET_DIR)/etc/sysctl.d/petitboot.conf
  	mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/

package/petitboot/removable-event-poll.rules new file +0 -0

new file mode 100644
index 000000000000..57bb74d3c00c

Petitboot can support filesystems on software RAID arrays. If mdadm is selected, install the associated udev rules to assemble the device.

Signed-off-by Reza Arbab <[email protected]>

---
  package/petitboot/63-md-raid-arrays.rules | 41 ++++++++++++++
  package/petitboot/65-md-incremental.rules | 69 +++++++++++++++++++++++
  package/petitboot/petitboot.mk            | 10 ++++
  3 files changed, 120 insertions(+)

create mode 100644 package/petitboot/63-md-raid-arrays.rules create mode 100644 package/petitboot/65-md-incremental.rules

package/petitboot/63-md-raid-arrays.rules new file +41 -0

new file mode 100644
index 000000000000..92aec36e69d4
@@ -0,0 +1,41 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="block", GOTO="md_end"
+
+# handle md arrays
+ACTION!="add|change", GOTO="md_end"
+KERNEL!="md*", GOTO="md_end"
+
+# partitions have no md/{array_state,metadata_version}, but should not
+# for that reason be ignored.
+ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+
+# container devices have a metadata version of e.g. 'external:ddf' and
+# never leave state 'inactive'
+ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+LABEL="md_ignore_state"
+
+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
+ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
+ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
+ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+
+IMPORT{builtin}="blkid"
+OPTIONS+="link_priority=100"
+OPTIONS+="watch"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
+
+# Tell systemd to run mdmon for our container, if we need it.
+ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
+ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
+
+LABEL="md_end"

package/petitboot/65-md-incremental.rules new file +69 -0

new file mode 100644
index 000000000000..153d12fe6f7e
@@ -0,0 +1,69 @@
+# This file causes block devices with Linux RAID (mdadm) signatures to
+# automatically cause mdadm to be run.
+# See udev(8) for syntax
+
+# Don't process any events if anaconda is running as anaconda brings up
+# raid devices manually
+ENV{ANACONDA}=="?*", GOTO="md_end"
+
+# Also don't process disks that are slated to be a multipath device
+ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="md_end"
+
+# We process add events on block devices (since they are ready as soon as
+# they are added to the system), but we must process change events as well
+# on any dm devices (like LUKS partitions or LVM logical volumes) and on
+# md devices because both of these first get added, then get brought live
+# and trigger a change event.  The reason we don't process change events
+# on bare hard disks is because if you stop all arrays on a disk, then
+# run fdisk on the disk to change the partitions, when fdisk exits it
+# triggers a change event, and we want to wait until all the fdisks on
+# all member disks are done before we do anything.  Unfortunately, we have
+# no way of knowing that, so we just have to let those arrays be brought
+# up manually after fdisk has been run on all of the disks.
+
+# First, process all add events (md and dm devices will not really do
+# anything here, just regular disks, and this also won't get any imsm
+# array members either)
+SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	RUN+="/sbin/mdadm -I --export $env{DEVNAME}"
+
+# Next, check to make sure the BIOS raid stuff wasn't turned off via cmdline
+IMPORT{cmdline}="noiswmd"
+IMPORT{cmdline}="nodmraid"
+ENV{noiswmd}=="?*", GOTO="md_imsm_inc_end"
+ENV{nodmraid}=="?*", GOTO="md_imsm_inc_end"
+SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \
+	RUN+="/sbin/mdadm -I $env{DEVNAME}"
+LABEL="md_imsm_inc_end"
+
+SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \
+	RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
+SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}!="?*", \
+	RUN+="/sbin/mdadm -If $name"
+
+# Next make sure that this isn't a dm device we should skip for some reason
+ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end"
+ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end"
+ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end"
+KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}"
+LABEL="dm_change_end"
+
+# Finally catch any nested md raid arrays.  If we brought up an md raid
+# array that's part of another md raid array, it won't be ready to be used
+# until the change event that occurs when it becomes live
+KERNEL=="md*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \
+	ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}"
+
+# In case the initramfs only started some of the arrays in our container,
+# run incremental assembly on the container itself.  Note: we ran mdadm
+# on the container in 64-md-raid.rules, and that's how the MD_LEVEL
+# environment variable is already set.  If that disappears from the other
+# file, we will need to add this line into the middle of the next rule:
+#	IMPORT{program}="/sbin/mdadm -D --export $tempnode", \
+
+SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \
+	ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $env{DEVNAME}"
+
+
+LABEL="md_end"

package/petitboot/petitboot.mk +3 -0

index 9326738aa038..596e801b781c 100644
@@ -46,6 +46,16 @@ else
  PETITBOOT_CONF_OPTS += --without-fdt
  endif
 
+ifeq ($(BR2_PACKAGE_MDADM),y)
+define PETITBOOT_POST_INSTALL_MDADM
+	$(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/63-md-raid-arrays.rules \

It's likely that the "sg" kernel driver needed to scan SCSI devices is a module. Install a udev rule to load it automatically when devices are present.

Signed-off-by Reza Arbab <[email protected]>

---
  package/petitboot/66-add-sg-module.rules | 2 ++
  package/petitboot/petitboot.mk           | 2 ++
  2 files changed, 4 insertions(+)

create mode 100644 package/petitboot/66-add-sg-module.rules

package/petitboot/66-add-sg-module.rules new file +2 -0

new file mode 100644
index 000000000000..ae18d28c570e
@@ -0,0 +1,2 @@
+# load modules to scsi disks, if they aren't in kernel
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"

package/petitboot/petitboot.mk +0 -0

index 596e801b781c..590b58e9c71a 100644