Clean garbage after merge

libremesh · Oct 26, 2014 · 54ca776 · 54ca776
1 parent 3008610
commit 54ca776
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 54 deletions.
diff --git a/packages/lime-system/Makefile b/packages/lime-system/Makefile
@@ -53,9 +53,10 @@ LIME_VERSION_SED:=$(SED)   's,%LIME_ID%,$(LIME_ID),g' \
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/lime/
 	$(LIME_VERSION_SED) \
-		$(1)/etc/lime_release \
-		$(1)/etc/uci-defaults/90_lime-banner
+		$(1)/etc/lime/release \
+		$(1)/etc/uci-defaults/90-lime-banner
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/packages/lime-system/files/etc/init.d/lime b/packages/lime-system/files/etc/init.d/lime
diff --git a/packages/lime-system/files/etc/lime-defaults/10-lime_config b/packages/lime-system/files/etc/lime-defaults/10-lime_config
diff --git a/packages/lime-system/files/etc/lime_release → packages/lime-system/files/etc/lime/release b/packages/lime-system/files/etc/lime_release → packages/lime-system/files/etc/lime/release
diff --git a/...tem/files/etc/uci-defaults/90_lime-banner → ...tem/files/etc/uci-defaults/90-lime-banner b/...tem/files/etc/uci-defaults/90_lime-banner → ...tem/files/etc/uci-defaults/90-lime-banner
diff --git a/packages/lime-system/files/etc/uci-defaults/99-lime-config b/packages/lime-system/files/etc/uci-defaults/99-lime-config
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sleep 5s
+cp -r /etc/config /etc/lime/config.original
+lua /usr/bin/lime-config && uci commit