diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-08-13 19:46:50 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-08-14 09:00:06 +0200 |
| commit | e5534a72d2c75faf1d8024ec20e7273a7c3ddc80 (patch) | |
| tree | ee830998779b8e9ceffddcba8b3f539078cbe2fe /source/a/sysvinit-scripts | |
| parent | f47eb68c993fdef0b672c5329fd2a01e8b549b46 (diff) | |
| download | current-e5534a72d2c75faf1d8024ec20e7273a7c3ddc80.tar.gz | |
Thu Aug 13 19:46:50 UTC 202020200813194650
a/sysvinit-scripts-2.1-noarch-35.txz: Rebuilt.
rc.6: don't try to turn off swap if none is active. Thanks to stf92.
ap/man-pages-5.08-noarch-1.txz: Upgraded.
d/python-setuptools-49.4.0-x86_64-1.txz: Upgraded.
x/libinput-1.16.1-x86_64-1.txz: Upgraded.
xfce/tumbler-0.3.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/sysvinit-scripts')
| -rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.6 | 8 | ||||
| -rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 |
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 405773d1..e3e71bef 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 3f08aad9..34d6dd3b 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 |