diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Makefile.am | 3 | ||||
-rw-r--r-- | utils/hooks/30-add-offb.c | 5 | ||||
-rwxr-xr-x | utils/hooks/80-set-stdout | 23 |
3 files changed, 5 insertions, 26 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index 2bbfb9c..453fdbd 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -34,5 +34,4 @@ dist_pkgdata_DATA = \ utils/logrotate.conf \ utils/hooks/01-create-default-dtb \ utils/hooks/20-update-dtb-sample \ - utils/hooks/90-sort-dtb \ - utils/hooks/80-set-stdout + utils/hooks/90-sort-dtb diff --git a/utils/hooks/30-add-offb.c b/utils/hooks/30-add-offb.c index eca9d13..aff3844 100644 --- a/utils/hooks/30-add-offb.c +++ b/utils/hooks/30-add-offb.c @@ -512,7 +512,10 @@ static int set_stdout(struct offb_ctx *ctx) return 0; } - if (strstr(boot_console, "tty") != NULL) { + if (strncmp(boot_console, "/dev/", strlen("/dev/")) != 0) { + /* We already have the full path */ + stdout_path = talloc_strdup(ctx, boot_console); + } else if (strstr(boot_console, "tty") != NULL) { fprintf(stderr, "TTY recognised: %s\n", boot_console); stdout_path = get_vga_path(ctx); } else { diff --git a/utils/hooks/80-set-stdout b/utils/hooks/80-set-stdout deleted file mode 100755 index 92ff030..0000000 --- a/utils/hooks/80-set-stdout +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Hook to set the linux,stdout-path property from an nvram property -# (named $nvram_prop). - -nvram_prop=petitboot,console - -# we need to be using a dtb -[ -n "$boot_dtb" ] || exit - -console=$(nvram --print-config="$nvram_prop") - -[ $? = 0 -a -n "$console" ] || exit - -dtb_in=$boot_dtb -dtb_out=$(mktemp) - -( - dtc -I dtb -O dts $dtb_in - echo '/ { chosen { linux,stdout-path = "'$console'"; }; }; ' -) | dtc -I dts -O dtb -o $dtb_out - -[ $? = 0 ] && mv $dtb_out $dtb_in |