summaryrefslogtreecommitdiffstats
path: root/source/a/sysvinit-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/sysvinit-scripts')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.68
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
2 files changed, 6 insertions, 4 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index 405773d10..e3e71bef0 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -225,9 +225,11 @@ fi
$shutdown_command -w
# Turn off swap:
-echo "Turning off swap."
-/sbin/swapoff -a
-/bin/sync
+if [ ! "$(cat /proc/swaps | wc -l)" = "1" ]; then
+ echo "Turning off swap."
+ /sbin/swapoff -a
+ /bin/sync
+fi
# Stop cgmanager and cgproxy:
if [ -x /etc/rc.d/rc.cgmanager ]; then
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 3f08aad90..34d6dd3bc 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit-scripts
VERSION=${VERSION:-2.1}
ARCH=noarch
-BUILD=${BUILD:-34}
+BUILD=${BUILD:-35}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information