From 5b43c7c13a52382f6945013943903cc09a2e6510 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 10 May 2019 23:32:45 +0200 Subject: [PATCH] Update experimental helpers --- scripts/_common.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index baa3636..cfe8cdb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -56,8 +56,9 @@ ynh_add_swap () { SD_CARD_CAN_SWAP=${SD_CARD_CAN_SWAP:-0} # Swap on SD card only if it's is specified - if ynh_is_main_device_is_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ] + if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ] then + ynh_print_warn --message="The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" return fi @@ -113,7 +114,7 @@ ynh_del_swap () { # [internal] # # return 0 if it's an SD card, else 1 -ynh_is_main_device_is_sd_card () { +ynh_is_main_device_a_sd_card () { local main_device=$(lsblk --output PKNAME --noheadings $(findmnt / --nofsroot --uniq --output source --noheadings --first-only)) if echo $main_device | grep --quiet "mmc" && [ $(tail -n1 /sys/block/$main_device/queue/rotational) == "0" ]