Remove zramsync service (#7)

Signed-off-by: Ethan Dye <[email protected]>

Author: ecdye

README.md

@@ -1,42 +1,38 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+if [[ "$(id -u)" -ne 0 ]]; then
+  echo "ERROR: You need to be ROOT (sudo can be used)."
+  exit 1
+fi
+if [[ $(systemctl is-active zram-config.service) == "active" ]]; then
+  echo "ERROR: zram-config service is still running. Please run \"sudo systemctl stop zram-config.service\" to stop it and then uninstall before running this."
+  exit 1
+fi
+if [[ -f /usr/local/sbin/zram-config ]]; then
+  echo "ERROR: zram-config is already installed, uninstall first."
+  exit 1
+fi
+
+if ! dpkg -s 'make' 'libattr1-dev' &> /dev/null; then
+  apt-get install --yes make libattr1-dev || exit 1
+fi
 
-source /etc/openhabian.conf
-
-
-systemctl -q is-active zram-config  && { echo "ERROR: zram-config service is still running. Please run \"sudo service zram-config stop\" to stop it and uninstall"; exit 1; }
-[ "$(id -u)" -eq 0 ] || { echo "You need to be ROOT (sudo can be used)"; exit 1; }
-[ -d /usr/local/bin/zram-config ] && { echo "zram-config is already installed, uninstall first"; exit 1; }
-
-apt-get -y install libattr1-dev
-
-#if grep -q "buster" /etc/os-release
-#then
-#  git clone https://github.com/StuartIanNaylor/overlayfs-tools -b Arch
-#else
-#  git clone https://github.com/StuartIanNaylor/overlayfs-tools
-#fi
-
-# buster compile fixed in origin
 git clone https://github.com/kmxz/overlayfs-tools
-cd overlayfs-tools
+cd overlayfs-tools || exit 1
 make
 cd ..
 
-sed -i "s|%STORAGE|${storagedir:-/storage}|g" zram-config.service
-# zram-config install
 install -m 755 zram-config /usr/local/sbin/
-install -m 755 zramsync /usr/local/sbin/
 install -m 644 zram-config.service /etc/systemd/system/zram-config.service
 install -m 644 ztab /etc/ztab
-mkdir -p /usr/local/share/zram-config
 mkdir -p /usr/local/share/zram-config/log
 install -m 644 uninstall.sh /usr/local/share/zram-config/uninstall.sh
 install -m 644 ro-root.sh /usr/local/share/zram-config/ro-root.sh
 install -m 644 zram-config.logrotate /etc/logrotate.d/zram-config
 mkdir -p /usr/local/lib/zram-config/
-
 install -m 755 overlayfs-tools/overlay /usr/local/lib/zram-config/overlay
-systemctl enable zram-config
+systemctl daemon-reload
+systemctl enable zram-config.service
 
-#echo "#####          Reboot to activate zram-config         #####"
-#echo "#####       edit /etc/ztab to configure options       #####"
+echo "#####          Reboot to activate zram-config         #####"
+echo "#####       edit /etc/ztab to configure options       #####"

install.sh

@@ -1,18 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [ "$(id -u)" -eq 0 ]
-then
-	service zram-config stop
-	systemctl disable zram-config
-	rm /etc/systemd/system/zram-config.service
-	rm /usr/local/bin/zram-config
-	rm /etc/ztab
-	rm /etc/logrotate.d/zram-config
-
-	echo "zram-config is uninstalled, removing the uninstaller in progress"
-	rm -rf /usr/local/share/zram-config
-	rm -rf /usr/local/lib/zram-config
-	echo "##### Reboot isn't needed #####"
-else
-	echo "You need to be ROOT (sudo can be used)"
+if [[ "$(id -u)" -ne 0 ]]; then
+  echo "ERROR: You need to be ROOT (sudo can be used)."
+  exit 1
 fi
+
+systemctl disable --now zram-config.service
+rm -f /etc/systemd/system/zram-config.service
+rm -f /usr/local/bin/zram-config
+rm -f /etc/logrotate.d/zram-config
+rm -f /etc/ztab
+rm -rf /usr/local/lib/zram-config
+rm -rf /usr/local/share/zram-config
+
+echo "##### Reboot isn't needed #####"

uninstall.sh

@@ -108,17 +108,17 @@ createZdir() {
 }
 
 createZlog() {
-	if [[ $(dpkg -s 'nginx') ]] && [[ $(systemctl is-active nginx.service) ]]; then
+	if dpkg -s 'nginx' &> /dev/null && [[ $(systemctl is-active nginx.service) == "active" ]]; then
 		systemctl stop nginx.service >> "$ZLOG" 2>&1 || return 1
 	fi
-	if [[ $(systemctl is-active rsyslog.service) ]]; then
+	if [[ $(systemctl is-active rsyslog.service) == "active" ]]; then
 		systemctl stop rsyslog.service >> "$ZLOG" 2>&1 || return 1
 	fi
 
 	createZdir
 
 	systemctl restart rsyslog.service >> "$ZLOG" 2>&1 || return 1
-	if [[ $(dpkg -s 'nginx') ]]; then
+	if dpkg -s 'nginx' &> /dev/null; then
 		systemctl restart nginx.service >> "$ZLOG" 2>&1 || return 1
 	fi
 
@@ -146,13 +146,14 @@ removeZlog() {
 	fi
 
 	echo "$ZRAM_DEV" >> "$ZLOG"
-	local DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
+	local DEV_NUM
+	DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
 
 	if [[ -n $TARGET_DIR ]]; then
-		if [[ $(dpkg -s 'nginx') ]] && [[ $(systemctl is-active nginx.service) ]]; then
+		if dpkg -s 'nginx' &> /dev/null && [[ $(systemctl is-active nginx.service) == "active" ]]; then
 			systemctl stop nginx.service >> "$ZLOG" 2>&1 || return 1
 		fi
-		if [[ $(systemctl is-active rsyslog.service) ]]; then
+		if [[ $(systemctl is-active rsyslog.service) == "active" ]]; then
 			systemctl stop rsyslog.service >> "$ZLOG" 2>&1 || return 1
 		fi
 
@@ -180,18 +181,18 @@ removeZlog() {
 		return 1
 	fi
 
-	if [[ $(dpkg -s 'nginx') ]] && [[ $(systemctl is-active nginx.service) ]]; then
+	if dpkg -s 'nginx' &> /dev/null && [[ $(systemctl is-active nginx.service) == "active" ]]; then
 		systemctl stop nginx.service >> "$ZLOG" 2>&1 || return 1
 	fi
-	if [[ $(systemctl is-active rsyslog.service) ]]; then
+	if [[ $(systemctl is-active rsyslog.service) == "active" ]]; then
 		systemctl stop rsyslog.service >> "$ZLOG" 2>&1 || return 1
 	fi
 
 	echo "$DEV_NUM" > /sys/class/zram-control/hot_remove
 	zramctl -r "/dev${ZRAM_DEV}" >> "$ZLOG" 2>&1 || return 1
 
 	systemctl restart rsyslog.service >> "$ZLOG" 2>&1 || return 1
-	if [[ $(dpkg -s 'nginx') ]]; then
+	if dpkg -s 'nginx' &> /dev/null; then
 		systemctl restart nginx.service >> "$ZLOG" 2>&1 || return 1
 	fi
 
@@ -201,7 +202,8 @@ removeZlog() {
 
 removeZdir() {
 	echo "$ZRAM_DEV" >> "$ZLOG"
-	local DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
+	local DEV_NUM
+	DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
 
 	if [[ -n "$TARGET_DIR" ]]; then
 		if ! (umount --verbose "${TARGET_DIR}/" >> "$ZLOG" 2>&1); then
@@ -234,7 +236,8 @@ removeZdir() {
 }
 
 removeZswap() {
-	local DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
+	local DEV_NUM
+	DEV_NUM="$(echo "$ZRAM_DEV" | tr -dc '0-9')"
 
 	swapoff "/dev${ZRAM_DEV}" >> "$ZLOG" 2>&1 || return 1
 	echo "$DEV_NUM" > /sys/class/zram-control/hot_remove
@@ -415,42 +418,8 @@ case "$1" in
 		disableZephemeral
 		;;
 
-	sync)
-		echo "zram-config sync $(date +%Y-%m-%d-%H:%M:%S)" >> "$ZLOG"
-		tac "${TMPDIR}"/zram-device-list > "${TMPDIR}"/zram-device-list.rev
-		file="${TMPDIR}/zram-device-list.rev"
-		while read -r line; do
-			case "$line" in
-				"#"*)
-					# Skip comment line
-					continue
-					;;
-
-				"")
-					# Skip empty line
-					continue
-					;;
-
-				*)
-					set -- $line
-					echo "ztab sync ${1} ${2} ${3} ${4}" >> "$ZLOG"
-					case "$1" in
-						dir|log)
-							ZTYPE="$1"
-							ZRAM_DEV="$2"
-							TARGET_DIR="$3"
-							BIND_DIR="$4"
-							mergeOverlay
-							;;
-					esac
-					;;
-			esac
-		done < "$file"
-		rm -fv "${TMPDIR}"/zram-device-list.rev >> "$ZLOG"
-		;;
-
 	*)
-		echo "Usage: zram-config {start|stop|sync|enable-ephemeral|disable-ephemeral}" > 2
+		echo "Usage: zram-config {start|stop|enable-ephemeral|disable-ephemeral}" > 2
 		exit 1
 		;;
 esac

zram-config

@@ -1,14 +1,14 @@
 [Unit]
 Description=zram-config
 After=local-fs.target
-Before=openhab2.service smbd.service
+Before=reboot.target halt.target shutdown.target poweroff.target openhab2.service smbd.service
 
 [Service]
 Type=oneshot
 TimeoutSec=300
 RemainAfterExit=yes
-ExecStartPre=-/usr/local/sbin/zramsync "recover" "%STORAGE/zram"
 ExecStart=/usr/local/sbin/zram-config "start"
+ExecStart=/usr/local/sbin/zram-config "stop"
 
 [Install]
 WantedBy=basic.target

zram-config.service

@@ -1,18 +1,42 @@
-# To comment out any line Add new drives with the first collumn providing the drive type and then drive details seperated by tab
-# All algorithm in /proc/crypto are supported but only lzo/lz4 have zramctl text strings.
-# lz4 is the fastest whilst deflate(zlib) has much better text compression.
-# mem_limit is compressed memory limit and will set a hard memory limit for sys admin.
-# disk_size is virtual uncompressed size approx 220-450% of mem allocated depending on algorithm and input file.
-# Much higher than the compression alg is capable will waste mem as there is an approx 0.1% mem overhead even when empty.
-# swap_priority set zram over alternative swap devices.
-# page-cluster 0 means tuning to singular pages rather than default 3 which caches 8 for HDD tuning, which can lower latency.
-# swappiness 80 due to improved performance of zram allows more usage without effect of raising from default 60.
-# Can be up to 100 but will increase process queue on intense load such as boot.
-# zram_dir is the directory you wish to hold in zram, the original is moved to a bind mount bind_dir and is synchronised on start/stop and write commands.
-# bind_dir is a directory where the original dir will be mounted for sync purposes. Usually in /opt or /var, name optional.
-# oldlog_dir will enable logrotation to an off device directory whilst retaining only live logs in zram. Usually in /opt or /var, name optional.
-# If you need multiple zram swaps or zram dirs just create another entry in /ect/ztab.
-# Stop the service sudo service zram-config stop edit /etc/ztab sudo nano /etc/ztab start the service sudo service zram-config start
+# Use '#' to comment out any line, add new drives with the first column
+# providing the drive type and then drive details separated by tab characters.
+#
+# All algorithms in '/proc/crypto' are supported but only lzo and lz4 have
+# zramctl text strings; lz4 is the fastest with deflate(zlib) having much better
+# text compression.
+#
+# mem_limit is the compressed memory limit and will set a hard memory limit for
+# the system admin.
+#
+# disk_size is the virtual uncompressed size approx. 220-450% of memory
+# allocated depending on the algorithm and input file. Don't make it much higher
+# than the compression algorithm is capable of as it will waste memory because
+# there is a ~0.1% memory overhead when empty
+#
+# swap_priority will set ZRAM over alternative swap devices.
+#
+# page-cluster 0 means tuning to singular pages rather than the default 3 which
+# caches 8 for HDD tuning, which can lower latency.
+#
+# swappiness 80 because the improved performance of ZRAM allows more usage
+# without any adverse affects from the default of 60. It can be raised up to 100
+# but that will increase process queue on intense loads such as boot time.
+#
+# target_dir is the directory you wish to hold in ZRAM, and the original will be
+# moved to a bind mount 'bind_dir' and is synchronized on start, stop, and write
+# commands.
+#
+# bind_dir is the directory where the original directory will be mounted for
+# sync purposes. Usually in '/opt' or '/var', name optional.
+#
+# oldlog_dir will enable log-rotation to an off device directory while retaining
+# only live logs in ZRAM. Usually in '/opt' or '/var', name optional.
+#
+# If you need multiple ZRAM swaps or ZRAM directories, just create another entry
+# in this file.
+# To do this safely, first stop ZRAM using 'systemctl stop zram-config.service',
+# then edit this file.
+# Once finished, restart ZRAM using 'systemctl restart zram-config.service'.
 
 # swap	alg	mem_limit	disk_size	swap_priority	page-cluster	swappiness
 swap	lz4	250M		750M		75		0		80