From 5281a3dfe6a49294779f44bacc78a16e41d45247 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 15 Oct 2018 23:46:08 +0300 Subject: [PATCH] datapart init script: do not do anything at stop --- board/common/overlay/etc/init.d/S00datapart | 38 ++++++++++----------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart index 63582b5fe7..b971503039 100755 --- a/board/common/overlay/etc/init.d/S00datapart +++ b/board/common/overlay/etc/init.d/S00datapart @@ -2,26 +2,26 @@ test -n "$os_version" || source /etc/init.d/base -msg_begin "Detecting disk device" -root_dev=$(cat /proc/cmdline | grep -oE 'root=[/a-z0-9]+' | cut -d '=' -f 2) -if [[ "$root_dev" =~ ^([/a-z0-9]+)(p[0-9])$ ]]; then # e.g. /dev/mmcblk0p2 - disk_dev=${BASH_REMATCH[1]} - boot_dev=${disk_dev}p1 - data_dev=${disk_dev}p3 -elif [[ "$root_dev" =~ ^([/a-z0-9]+)([0-9])$ ]]; then # e.g. /dev/sdc2 - disk_dev=${BASH_REMATCH[1]} - boot_dev=${disk_dev}1 - data_dev=${disk_dev}3 -else - msg_fail "unknown ($root_dev)" - exit 1 -fi -msg_done "$disk_dev" - -test -b $data_dev && exit 0 - case "$1" in start) + msg_begin "Detecting disk device" + root_dev=$(cat /proc/cmdline | grep -oE 'root=[/a-z0-9]+' | cut -d '=' -f 2) + if [[ "$root_dev" =~ ^([/a-z0-9]+)(p[0-9])$ ]]; then # e.g. /dev/mmcblk0p2 + disk_dev=${BASH_REMATCH[1]} + boot_dev=${disk_dev}p1 + data_dev=${disk_dev}p3 + elif [[ "$root_dev" =~ ^([/a-z0-9]+)([0-9])$ ]]; then # e.g. /dev/sdc2 + disk_dev=${BASH_REMATCH[1]} + boot_dev=${disk_dev}1 + data_dev=${disk_dev}3 + else + msg_fail "unknown ($root_dev)" + exit 1 + fi + msg_done "$disk_dev" + + test -b $data_dev && exit 0 + msg_begin "Creating data partition" root_end=$(partx -s -g -o END $root_dev) data_start=$(($root_end + 1)) @@ -68,5 +68,3 @@ case "$1" in exit 1 esac -# always exit with a successful status -exit 0