diff --git a/CHANGELOG.md b/CHANGELOG.md index 9260c3a..ba22c81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # 履歴 +* 1.7.1 + - オンラインインストール時に途中で失敗する問題を修正 * 1.7.0 - APNの設定方法を変更 - `/boot/apn`にファイルを配置することにより起動時にAPNを設定できる機能を追加 diff --git a/README.md b/README.md index 068bac3..25367ca 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ $ make PI_USER=linaro PI_HOST=192.168.1.10 ### 動作確認 (RPi) ```bash -$ VERSION=1.7.0 && rm -fr tmp && mkdir tmp && cd tmp && \ +$ VERSION=1.7.1 && rm -fr tmp && mkdir tmp && cd tmp && \ tar zxf ~/candy-pi-lite-service-${VERSION}.tgz $ time sudo SRC_DIR=$(pwd) DEBUG=1 ./install.sh $ time sudo SRC_DIR=$(pwd) DEBUG=1 CONFIGURE_STATIC_IP_ON_BOOT=1 ./install.sh diff --git a/install.sh b/install.sh index 972a9cf..255f58a 100755 --- a/install.sh +++ b/install.sh @@ -18,7 +18,7 @@ VENDOR_HOME=/opt/candy-line SERVICE_NAME=candy-pi-lite GITHUB_ID=CANDY-LINE/candy-pi-lite-service -VERSION=1.7.0 +VERSION=1.7.1 # Channel B UART_PORT="/dev/ttySC1" MODEM_BAUDRATE=${MODEM_BAUDRATE:-460800} @@ -49,8 +49,6 @@ CONFIGURE_STATIC_IP_ON_BOOT=${CONFIGURE_STATIC_IP_ON_BOOT:-""} OFFLINE_PERIOD_SEC=${OFFLINE_PERIOD_SEC:-30} ENABLE_WATCHDOG=${ENABLE_WATCHDOG:-1} COFIGURE_ENOCEAN_PORT=${COFIGURE_ENOCEAN_PORT:-1} -FALLBACK_APN=$(cat ${SRC_DIR}/systemd/fallback_apn) -BOOT_APN=${BOOT_APN:-${FALLBACK_APN}} REBOOT=0 @@ -279,6 +277,8 @@ function install_candy_red { } function test_boot_apn { + FALLBACK_APN=$(cat ${SRC_DIR}/systemd/fallback_apn) + BOOT_APN=${BOOT_APN:-${FALLBACK_APN}} CREDS=`/usr/bin/env python -c "with open('${SRC_DIR}/systemd/apn-list.json') as f:import json;c=json.load(f);print('${BOOT_APN}' in c)"` if [ "${CREDS}" != "True" ]; then err "Invalid BOOT_APN value => ${BOOT_APN}"