From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Mon, 7 Jan 2013 12:01:11 +0000 (+0000)
Subject: zram-swap: Install init script with 0755 mode
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c86485210ba6136bc90fc2708611ae5a609b6bf1;p=openwrt%2Fstaging%2Fstintel.git

zram-swap: Install init script with 0755 mode

SVN-Revision: 35033
---

diff --git a/package/zram-swap/Makefile b/package/zram-swap/Makefile
index 59a55c4776..bded5f3808 100644
--- a/package/zram-swap/Makefile
+++ b/package/zram-swap/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zram-swap
 PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
@@ -39,8 +39,8 @@ define Build/Compile
 endef
 
 define Package/zram-swap/install
-	$(INSTALL_DIR) $(1)
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/zram.init $(1)/etc/init.d/zram
 endef
 
 $(eval $(call BuildPackage,zram-swap))
diff --git a/package/zram-swap/files/etc/init.d/zram b/package/zram-swap/files/etc/init.d/zram
deleted file mode 100755
index 23de915c8f..0000000000
--- a/package/zram-swap/files/etc/init.d/zram
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=15
-
-ram_size()
-{
-	local line
-
-	while read line; do case "$line" in MemTotal:*) set $line; echo "$2"; break ;; esac; done </proc/meminfo
-}
-
-zram_size()	# in megabytes
-{
-	local zram_size="$( uci -q get system.@system[0].zram_size_mb )"
-	local ram_size="$( ram_size )"
-
-	if [ -z "$zram_size" ]; then
-		# e.g. 6mb for 16mb-routers or 61mb for 128mb-routers
-		echo $(( $ram_size / 2048 ))
-	else
-		echo "$zram_size"
-	fi
-}
-
-zram_applicable()
-{
-	local zram_dev="$1"
-
-	grep -sq ^"$zram_dev " /proc/swaps && {
-		logger -s -t zram_applicable -p daemon.notice "[OK] '$zram_dev' already active"
-		return 1
-	}
-
-	[ -e "$zram_dev" ] || {
-		logger -s -t zram_applicable -p daemon.crit "[ERROR] device '$zram_dev' not found"
-		return 1
-	}
-
-	which mkswap >/dev/null || {
-		logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed"
-		return 1
-	}
-
-	which swapon >/dev/null || {
-		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed"
-		return 1
-	}
-
-	which swapoff >/dev/null || {
-		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed"
-		return 1
-	}
-}
-
-zram_dev()
-{
-	local core="$1"
-
-	echo "/dev/zram${core:-0}"
-}
-
-zram_reset()
-{
-	local dev="$1"
-	local message="$2"
-	local proc_entry="/sys/block/$( basename "$dev" )/reset"
-
-	logger -s -t zram_reset -p daemon.debug "$message via $proc_entry"
-	echo "1" >"$proc_entry"
-}
-
-list_cpu_idx()
-{
-	local line i=0
-
-	while read line; do {
-		case "$line" in
-			[Pp]rocessor*)
-				echo $i
-				i=$(( $i + 1 ))
-			;;
-		esac
-	} done <"/proc/cpuinfo"
-}
-
-start()
-{
-	# http://shmilyxbq-compcache.googlecode.com/hg/README
-	# if >1 cpu_core, reinit kmodule with e.g. num_devices=4
-
-	local zram_size="$( zram_size )"
-	local zram_dev core
-
-	for core in $( list_cpu_idx ); do {
-		zram_dev="$( zram_dev "$core" )"
-		zram_applicable "$zram_dev" || return 1
-
-		logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)"
-
-		zram_reset "$zram_dev" "enforcing defaults"
-		echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename $zram_dev )/disksize"
-		mkswap "$zram_dev"
-		swapon "$zram_dev"
-	} done
-}
-
-stop()
-{
-	local zram_dev proc_entry
-
-	for core in $( list_cpu_idx ); do {
-		zram_dev="$( zram_dev "$core" )"
-		proc_entry="/sys/block/$( basename "$zram_dev" )/reset"
-
-		grep -sq ^"$zram_dev " /proc/swaps && {
-			logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
-			swapoff "$zram_dev"
-		}
-
-		zram_reset "$zram_dev" "claiming memory back"
-	} done
-}
-
diff --git a/package/zram-swap/files/zram.init b/package/zram-swap/files/zram.init
new file mode 100644
index 0000000000..23de915c8f
--- /dev/null
+++ b/package/zram-swap/files/zram.init
@@ -0,0 +1,123 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+
+ram_size()
+{
+	local line
+
+	while read line; do case "$line" in MemTotal:*) set $line; echo "$2"; break ;; esac; done </proc/meminfo
+}
+
+zram_size()	# in megabytes
+{
+	local zram_size="$( uci -q get system.@system[0].zram_size_mb )"
+	local ram_size="$( ram_size )"
+
+	if [ -z "$zram_size" ]; then
+		# e.g. 6mb for 16mb-routers or 61mb for 128mb-routers
+		echo $(( $ram_size / 2048 ))
+	else
+		echo "$zram_size"
+	fi
+}
+
+zram_applicable()
+{
+	local zram_dev="$1"
+
+	grep -sq ^"$zram_dev " /proc/swaps && {
+		logger -s -t zram_applicable -p daemon.notice "[OK] '$zram_dev' already active"
+		return 1
+	}
+
+	[ -e "$zram_dev" ] || {
+		logger -s -t zram_applicable -p daemon.crit "[ERROR] device '$zram_dev' not found"
+		return 1
+	}
+
+	which mkswap >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed"
+		return 1
+	}
+
+	which swapon >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed"
+		return 1
+	}
+
+	which swapoff >/dev/null || {
+		logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed"
+		return 1
+	}
+}
+
+zram_dev()
+{
+	local core="$1"
+
+	echo "/dev/zram${core:-0}"
+}
+
+zram_reset()
+{
+	local dev="$1"
+	local message="$2"
+	local proc_entry="/sys/block/$( basename "$dev" )/reset"
+
+	logger -s -t zram_reset -p daemon.debug "$message via $proc_entry"
+	echo "1" >"$proc_entry"
+}
+
+list_cpu_idx()
+{
+	local line i=0
+
+	while read line; do {
+		case "$line" in
+			[Pp]rocessor*)
+				echo $i
+				i=$(( $i + 1 ))
+			;;
+		esac
+	} done <"/proc/cpuinfo"
+}
+
+start()
+{
+	# http://shmilyxbq-compcache.googlecode.com/hg/README
+	# if >1 cpu_core, reinit kmodule with e.g. num_devices=4
+
+	local zram_size="$( zram_size )"
+	local zram_dev core
+
+	for core in $( list_cpu_idx ); do {
+		zram_dev="$( zram_dev "$core" )"
+		zram_applicable "$zram_dev" || return 1
+
+		logger -s -t zram_start -p daemon.debug "activating '$zram_dev' for swapping ($zram_size MegaBytes)"
+
+		zram_reset "$zram_dev" "enforcing defaults"
+		echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename $zram_dev )/disksize"
+		mkswap "$zram_dev"
+		swapon "$zram_dev"
+	} done
+}
+
+stop()
+{
+	local zram_dev proc_entry
+
+	for core in $( list_cpu_idx ); do {
+		zram_dev="$( zram_dev "$core" )"
+		proc_entry="/sys/block/$( basename "$zram_dev" )/reset"
+
+		grep -sq ^"$zram_dev " /proc/swaps && {
+			logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev"
+			swapoff "$zram_dev"
+		}
+
+		zram_reset "$zram_dev" "claiming memory back"
+	} done
+}
+