# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1452105192 0
# Node ID 200cbf34148af5ac97809d21dd80d609c91fde44
# Parent  34162aea5267de5d19299eda554b769c15614b57
system.sh: add "noswap" kernel option, auth test

diff -r 34162aea5267 -r 200cbf34148a etc/init.d/system.sh
--- a/etc/init.d/system.sh	Thu Dec 24 11:38:20 2015 +0100
+++ b/etc/init.d/system.sh	Wed Jan 06 18:33:12 2016 +0000
@@ -61,6 +61,7 @@
 fi
 
 # Activate an eventual swap file or partition
+if ! grep -q 'noswap' /proc/cmdline; then
 if [ "$(blkid | grep 'TYPE="swap"')" ]; then
 	for swd in $(blkid | sed '/TYPE="swap"/!d;s/:.*//'); do
 		if ! grep -q "$swd	" /etc/fstab; then
@@ -76,6 +77,7 @@
 	swapon -a
 	status
 fi
+fi
 
 # Start TazPanel
 [ -x /usr/bin/tazpanel ] && tazpanel start