From f4bb52096b07ebd6bbf7408d8a6a8df4e8eb55f4 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 7 Oct 2016 06:12:20 +0900 Subject: [PATCH] dist/common/scripts/scylla_setup: use 'swapon -s' instead of 'swapon --show' Since Ubuntu 14.04 doesn't supported --show option, we need to prevent use it. Fixes #1740 Signed-off-by: Takuya ASADA Message-Id: <1475788340-22939-2-git-send-email-syuu@scylladb.com> (cherry picked from commit 469e9af1f4a1b9443d795c2adba33ab421dc1e9b) --- dist/common/scripts/scylla_setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/common/scripts/scylla_setup b/dist/common/scripts/scylla_setup index d67786d3b4..e8b91ef1b6 100755 --- a/dist/common/scripts/scylla_setup +++ b/dist/common/scripts/scylla_setup @@ -84,7 +84,7 @@ get_unused_disks() { if [ -f /usr/sbin/pvs ]; then count_pvs=$(pvs|grep $dev|wc -l) fi - count_swap=$(swapon --show |grep `realpath $dev`|wc -l) + count_swap=$(swapon -s |grep `realpath $dev`|wc -l) if [ $count_raw -eq 0 -a $count_pvs -eq 0 -a $count_swap -eq 0 ]; then echo -n "$dev " fi