- cst/hd2: fix profile.local and rc.local

make/target-files.mk

@@ -57,9 +57,8 @@ $(TARGET_sysconfdir)/profile:
 $(TARGET_sysconfdir)/profile.local:
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local-var $(TARGET_localstatedir)/etc/profile.local
-else
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local $(@)
 endif
+	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local $(@)
 
 $(TARGET_sysconfdir)/profile.d:
 	$(foreach p,$(wildcard $(TARGET_FILES)/files-etc/profile.d/*.sh),\

make/target-scripts.mk

@@ -73,6 +73,9 @@ $(TARGET_sysconfdir)/init.d/rc.local:
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/rc.local.init $(@)
 	$(UPDATE-RC.D) $(@F) start 99 2 3 4 5 .
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/rc.local $(TARGET_sysconfdir)/rc.local
+ifeq ($(PERSISTENT_VAR_PARTITION),yes)
+	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/rc.local-var $(TARGET_localstatedir)/etc/rc.local
+endif
 
 $(TARGET_sysconfdir)/init.d/resizerootfs:
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61))

skel-root/general/files-etc/rc.local

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# rc.local
+# /etc/rc.local
 #
 # This script is executed at the end of each multiuser runlevel.
 # Make sure that the script will "exit 0" on success or any other

skel-root/general/files-etc/rc.local-var

@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# /var/etc/rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+ 
+exit 0

skel-root/general/scripts/rc.local.init

@@ -4,7 +4,11 @@
 
 case $1 in
 	start)
+		if [ -e /var/etc/rc.local ]; then
+			/var/etc/rc.local
+		elif [ -e /etc/rc.local ]; then
 			/etc/rc.local
+		fi
 	;;
 	*)
 		echo "[${BASENAME}] Usage: $0 {start}"