main/postmarketos-mkinitfs-hook-netboot: update show_splash calls for plymouth
The show_splash function has been replaced by splash_show, splash_set_message and splash_set_error, but the netboot hook still calls the old function, logging errors in boot dmesg. Signed-off-by: Luca Leonardo Scorcia <l.scorcia@gmail.com> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8526>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
maintainer="Aster Boese <asterboese@mailbox.org>"
|
||||
pkgname=postmarketos-mkinitfs-hook-netboot
|
||||
pkgver=4.2.0
|
||||
pkgver=4.2.1
|
||||
pkgrel=2
|
||||
pkgdesc="Netboot postmarketOS using nbd feature"
|
||||
url="https://postmarketos.org"
|
||||
@@ -21,6 +21,6 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c681d0c39eecd9fe5d284e07f9c6f79e41085628abe1c645b8ea3cc4e621fd603fca9db4a555fa689a3268925cb6d23c12baa98986baed452375acd1e3fe26b1 netboot.sh
|
||||
d4eb04601ea0cba78412d52946543571a5152a370e574c2a8170474bbf6b3d03b6a8aa771c7c5b2c91ef27f1ee34a8f4fdfc4c6ca64f011776c916f7af90d183 netboot.sh
|
||||
3c9c812a6cd25640e6cf4d722cff6c6356d5666ec6009b4c65f89e62211cc406d2cd09e0fdda6b1c1906ee32c3854988ab701cee8811208e3ef666f09e638568 netboot.modules
|
||||
"
|
||||
|
||||
@@ -8,7 +8,7 @@ NBD_BLOCK_SIZE=${deviceinfo_rootfs_image_sector_size:-512}
|
||||
setup_usb_network
|
||||
start_unudhcpd
|
||||
|
||||
show_splash "Waiting for netboot...\\nhttps://postmarketos.org/netboot"
|
||||
splash_set_message "Waiting for netboot...\\nhttps://postmarketos.org/netboot"
|
||||
|
||||
# Attempt to load the kernel module if CONFIG_BLK_DEV_NBD=m
|
||||
modprobe nbd
|
||||
@@ -16,7 +16,7 @@ modprobe nbd
|
||||
# Check that we actually have nbd0 available, otherwise show an error screen.
|
||||
if [ ! -b /dev/nbd0 ]; then
|
||||
echo "Failed to get /dev/nbd0, stopping."
|
||||
show_splash "ERROR: Failed to initialise netboot\\nhttps://postmarketos.org/netboot"
|
||||
splash_set_error "ERROR: Failed to initialise netboot\\nhttps://postmarketos.org/netboot"
|
||||
fail_halt_boot
|
||||
fi
|
||||
|
||||
@@ -30,6 +30,6 @@ done
|
||||
echo "Connected to $client_ip!"
|
||||
|
||||
# Show "Loading" splash again when continuing
|
||||
show_splash "Loading..."
|
||||
splash_set_message "Loading..."
|
||||
|
||||
mount_subpartitions
|
||||
|
||||
Reference in New Issue
Block a user