From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 5 Aug 2016 07:05:12 +0000 (+0800)
Subject: hooks/set-stdout: move hook to after automatic stdout settings
X-Git-Tag: v1.2.2^0
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=8f0e069fc43ed6f6a230329839f970415147d1aa;hp=0611a74491328d9ce346957c2320310a21caa8a9

hooks/set-stdout: move hook to after automatic stdout settings

If a console is defined in NVRAM, we want it to take precedence over
anything that 30-add-offb calculates automatically. This change shifts
the 20-set-stdout script to later in the hook processing, so that it
will override any automatic settings.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/utils/Makefile.am b/utils/Makefile.am
index f1b852e..2bbfb9c 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -34,5 +34,5 @@ dist_pkgdata_DATA = \
 	utils/logrotate.conf \
 	utils/hooks/01-create-default-dtb \
 	utils/hooks/20-update-dtb-sample \
-	utils/hooks/20-set-stdout \
-	utils/hooks/90-sort-dtb
+	utils/hooks/90-sort-dtb \
+	utils/hooks/80-set-stdout
diff --git a/utils/hooks/20-set-stdout b/utils/hooks/20-set-stdout
deleted file mode 100755
index 92ff030..0000000
--- a/utils/hooks/20-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
diff --git a/utils/hooks/80-set-stdout b/utils/hooks/80-set-stdout
new file mode 100755
index 0000000..92ff030
--- /dev/null
+++ b/utils/hooks/80-set-stdout
@@ -0,0 +1,23 @@
+#!/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