From 5a2b4355e48d099a21a73b29d30b90fcc4a7fba1 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 17 Sep 2012 17:15:56 +0000
Subject: [PATCH] [package] base-files: add uci-defaults script to migrate
 sysctl.conf (#12196)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33448 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/Makefile                             |  2 +-
 .../base-files/files/etc/uci-defaults/migrate-sysctl    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 package/base-files/files/etc/uci-defaults/migrate-sysctl

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 50ad7d4a0c..13927528c0 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=115
+PKG_RELEASE:=116
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/uci-defaults/migrate-sysctl b/package/base-files/files/etc/uci-defaults/migrate-sysctl
new file mode 100644
index 0000000000..2250c57802
--- /dev/null
+++ b/package/base-files/files/etc/uci-defaults/migrate-sysctl
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ ! -f "/rom/etc/sysctl.conf" ] || cmp "/rom/etc/sysctl.conf" "/etc/sysctl.conf"; then
+	exit 0
+fi
+
+fingerprint="$(md5sum /etc/sysctl.conf)"
+fingerprint="${fingerprint%% *}"
+
+if [ "$fingerprint" = "1b05ebb41f72cb84e5510573cd4aca26" ] || \
+   [ "$fingerprint" = "62deb895be1a7f496040187b7c930e4e" ]; then
+	logger -t migrate-sysctl "Updating sysctl.conf to use current defaults"
+	cp "/rom/etc/sysctl.conf" "/etc/sysctl.conf"
+fi
+
+exit 0
+
-- 
2.11.0