summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2016-08-05 15:05:12 +0800
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2016-08-08 16:39:40 +1000
commit8f0e069fc43ed6f6a230329839f970415147d1aa (patch)
tree316350e7c1f3a8200f68fa5b52aa53fe5331f140
parent0611a74491328d9ce346957c2320310a21caa8a9 (diff)
downloadtalos-petitboot-8f0e069fc43ed6f6a230329839f970415147d1aa.zip
talos-petitboot-8f0e069fc43ed6f6a230329839f970415147d1aa.tar.gz
hooks/set-stdout: move hook to after automatic stdout settingsv1.2.2
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>
-rw-r--r--utils/Makefile.am4
-rwxr-xr-xutils/hooks/80-set-stdout (renamed from utils/hooks/20-set-stdout)0
2 files changed, 2 insertions, 2 deletions
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/80-set-stdout
index 92ff030..92ff030 100755
--- a/utils/hooks/20-set-stdout
+++ b/utils/hooks/80-set-stdout
OpenPOWER on IntegriCloud