added nc-zramv0.47.0

4 files changed, 107 insertions, 4 deletions

diff --git a/changelog.md b/changelog.md
index 3aa07551..9d2a8256 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.46.40](https://github.com/nextcloud/nextcloudpi/commit/e88aa04) (2018-03-04) nc-backup-auto: change to using cron
+[v0.47.0](https://github.com/nextcloud/nextcloudpi/commit/4dd3979) (2018-03-05) added nc-zram
 
-[v0.46.39](https://github.com/nextcloud/nextcloudpi/commit/2371806) (2018-03-04) nc-ramlogs: change implementation to use log2ram
+[v0.46.40](https://github.com/nextcloud/nextcloudpi/commit/a251f64) (2018-03-04) nc-backup-auto: change to using cron
+
+[v0.46.39](https://github.com/nextcloud/nextcloudpi/commit/5ed50c9) (2018-03-04) nc-ramlogs: change implementation to use log2ram
 
 [v0.46.38](https://github.com/nextcloud/nextcloudpi/commit/63513bc) (2018-03-04) disable ncp user login
 
diff --git a/etc/nextcloudpi-config.d/nc-swapfile.sh b/etc/nextcloudpi-config.d/nc-swapfile.sh
index 3f2c1670..4dfd2212 100644
--- a/etc/nextcloudpi-config.d/nc-swapfile.sh
+++ b/etc/nextcloudpi-config.d/nc-swapfile.sh
@@ -33,7 +33,7 @@ configure()
   [[ -d "$DSTDIR"            ]] || { echo "$DSTDIR Doesn't exist. Abort";     return 1; }
 
   [[ "$( stat -fc%T "$DSTDIR" )" == "btrfs" ]] && {
-    echo "BTRFS doesn't support swapfiles"
+    echo "BTRFS doesn't support swapfiles. You can still use nc-zram"
     return 1
   }
 
diff --git a/etc/nextcloudpi-config.d/nc-zram.sh b/etc/nextcloudpi-config.d/nc-zram.sh
new file mode 100644
index 00000000..4644ff8d
--- /dev/null
+++ b/etc/nextcloudpi-config.d/nc-zram.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# NextCloudPi ZRAM settings
+#
+# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
+# GPL licensed (see end of file) * Use at your own risk!
+#
+# Usage:
+# 
+#   ./installer.sh nc-zram.sh <IP> (<img>)
+#
+# See installer.sh instructions for details
+#
+# More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
+#
+
+ACTIVE_=no
+DESCRIPTION="Enable compressed RAM to improve swap performance"
+
+install()
+{
+  cat > /etc/systemd/system/zram.service <<EOF
+[Unit]
+Description=Set up ZRAM
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/ncp-zram start
+ExecStop=/usr/local/bin/ncp-zram  stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
+EOF
+
+cat > /usr/local/bin/ncp-zram <<'EOF'
+#!/bin/bash
+# inspired by https://github.com/novaspirit/rpi_zram/blob/master/zram.sh
+
+case "$1" in
+  start)
+      CORES=$(nproc --all)
+      modprobe zram num_devices=$CORES || exit 1
+
+      swapoff -a
+
+      TOTALMEM=`free | grep -e "^Mem:" | awk '{print $2}'`
+      MEM=$(( ($TOTALMEM / $CORES)* 1024 ))
+
+      core=0
+      while [ $core -lt $CORES ]; do
+        echo $MEM > /sys/block/zram$core/disksize
+        mkswap /dev/zram$core
+        swapon -p 5 /dev/zram$core
+        let core=core+1
+      done
+      ;;
+
+  stop)
+      swapoff -a
+      rmmod zram
+      ;;
+  *)
+      echo "Usage: $0 {start|stop}" >&2
+      exit 1
+      ;;
+esac
+EOF
+chmod +x /usr/local/bin/ncp-zram
+}
+
+configure()
+{
+  [[ $ACTIVE_ != "yes" ]] && { 
+    systemctl stop    zram
+    systemctl disable zram
+    echo "ZRAM disabled"
+    return 0
+  }
+  systemctl start  zram
+  systemctl enable zram
+  echo "ZRAM enabled"
+}
+
+# License
+#
+# This script is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this script; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA  02111-1307  USA
+
diff --git a/update.sh b/update.sh
index 8fe1ecec..ac7f4884 100755
--- a/update.sh
+++ b/update.sh
@@ -124,7 +124,7 @@ done
 
   # update ncp-backup
   cd "$CONFDIR" &>/dev/null
-  install_script nc-backup.sh
+  install_script nc-backup.sh &>/dev/null
   cd - &>/dev/null
 
   # add ncp-config link