[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base: riscv: remove invalid redirections

Heinrich Schuchardt null at kde.org
Mon Nov 28 10:16:27 GMT 2022


Git commit c4dc7bce4c94e354ceed31e5f0765ff5668d4168 by Heinrich Schuchardt.
Committed on 17/11/2022 at 10:21.
Pushed by jriddell into branch 'Neon/release'.

riscv: remove invalid redirections

Remove redirections of type

    command &1>2

Executing the command in the background and creating and empty file '2'
was never intended.

As the messages are information only redirecting to stderr would not make
sense either.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

M  +3    -3    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/c4dc7bce4c94e354ceed31e5f0765ff5668d4168

diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index bc6749ff..5ff8fa33 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -238,7 +238,7 @@ install_grub() {
                 # Per-device images
                 case "${SUBARCH}" in
                     "icicle")
-                        echo "Installing GRUB for ${SUBARCH} board" &1>2
+                        echo "Installing GRUB for ${SUBARCH} board"
                         # flash-kernel is needed to install the dtb for update-grub: it uses the
                         # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
                         # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
@@ -267,7 +267,7 @@ install_grub() {
                         chroot mountpoint rm -f /boot/boot.scr
                         ;;
                     "nezha"|"licheerv")
-                        echo "Installing U-Boot for ${SUBARCH} board" &1>2
+                        echo "Installing U-Boot for ${SUBARCH} board"
                         # flash-kernel is needed to install the dtb for update-grub: it uses the
                         # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
                         # the model value is wrong and we need to use /etc/flash-kernel/machine instead.
@@ -312,7 +312,7 @@ install_grub() {
                         chroot mountpoint rm -f /boot/boot.scr
                         ;;
                     "visionfive")
-                        echo "Installing GRUB for VisionFive board" &1>2
+                        echo "Installing GRUB for VisionFive board"
                         # flash-kernel is needed to install the dtb for update-grub: it uses the
                         # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
                         # the model value is wrong and we need to use /etc/flash-kernel/machine instead.



More information about the Neon-commits mailing list