From c4720d950852503245e13fec10d8e25b3249c06d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 30 Mar 2018 12:02:34 +0100
Subject: [PATCH] Apply hold after checks
---
src/freedombone-utils-nodejs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 2c8cdc6b8..dcae2757d 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -96,7 +96,6 @@ function mesh_install_nodejs {
fi
$mesh_install_nodejs_prefix apt-get -yq install nodejs
- $mesh_install_nodejs_prefix apt-mark -q hold nodejs
if [ -f "$rootdir/usr/bin/nodejs" ]; then
cp "$rootdir/usr/bin/nodejs" "$rootdir/usr/bin/node"
@@ -106,6 +105,8 @@ function mesh_install_nodejs {
cp "$rootdir/usr/bin/node" "$rootdir/usr/local/bin/node"
fi
+ $mesh_install_nodejs_prefix apt-mark -q hold nodejs
+
if [ ! -f "${rootdir}/usr/bin/node" ]; then
if [ ! -f "${rootdir}/usr/local/bin/node" ]; then
if [ ! -f "${rootdir}/usr/bin/nodejs" ]; then
--
GitLab