Merge branch 'release/2.1.1'

CANDY-LINE · Feb 23, 2018 · 2afeca9 · 2afeca9
2 parents 3d35a58 + adbf6aa
commit 2afeca9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,9 @@ Use [Etcher](https://etcher.io) for burning the image, which is a cross-platform
 
 # Revision History
 
+* 2.1.1
+  - CANDY Pi Lite Board Service 2.0.1
+
 * 2.1.0
   - ARMv6 Raspberry Pi Boards(Zero/Zero W/Zero WH/Model A+/Model B+) Support
   - CANDY Pi Lite Board Service 2.0.0

diff --git a/overlay/stage2-1-en_US/00-configuration/01-run-chroot.sh b/overlay/stage2-1-en_US/00-configuration/01-run-chroot.sh
@@ -7,6 +7,15 @@ locale-gen
 
 ARMv6_NODEJS_VERSION="6.12.3"
 
+apt-get remove -y nodered nodejs nodejs-legacy npm
+rm -f \
+  /usr/bin/node \
+  /usr/bin/npm \
+  /usr/sbin/node \
+  /usr/sbin/npm \
+  /usr/local/bin/node \
+  /usr/local/bin/npm
+
 cd /tmp
 wget https://nodejs.org/dist/v${ARMv6_NODEJS_VERSION}/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
 tar zxf node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz