From: Mike Baker <mbm@openwrt.org>
Date: Mon, 6 Mar 2006 08:35:46 +0000 (+0000)
Subject: move S50cron's mkdir out of runtime; create the directories as part of the package
X-Git-Tag: whiterussian_rc5~94
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=27d9663f023663577a68ba2213784a01eb59a22e;p=openwrt%2Fsvn-archive%2Fopenwrt.git

move S50cron's mkdir out of runtime; create the directories as part of the package

SVN-Revision: 3317
---

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 69fa8e7597..18423ef775 100644
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -40,22 +40,21 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_BASE):
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
 	cp -a ./default/* $(IDIR_BASE)
-	mkdir -p $(IDIR_BASE)/jffs
 	mkdir -p $(IDIR_BASE)/dev
+	mkdir -p $(IDIR_BASE)/etc/crontabs
+	mkdir -p $(IDIR_BASE)/jffs
+	mkdir -p $(IDIR_BASE)/lib
+	mkdir -p $(IDIR_BASE)/mnt
 	mkdir -p $(IDIR_BASE)/proc
 	mkdir -p $(IDIR_BASE)/tmp
-	mkdir -p $(IDIR_BASE)/lib
 	mkdir -p $(IDIR_BASE)/usr/lib
 	mkdir -p $(IDIR_BASE)/usr/bin
-	mkdir -p $(IDIR_BASE)/mnt
 	mkdir -p $(IDIR_BASE)/www
 	ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf
-	rm -rf $(IDIR_BASE)/var
 	ln -sf /tmp $(IDIR_BASE)/var
 	-find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
 	-find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
 	-find $(IDIR_BASE) -name '.#*' | xargs rm -f
-	mkdir -p $(IDIR_BASE)/etc
 	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
 	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
diff --git a/openwrt/package/base-files/default/etc/init.d/S60cron b/openwrt/package/base-files/default/etc/init.d/S60cron
index 6069b8177e..1752734267 100755
--- a/openwrt/package/base-files/default/etc/init.d/S60cron
+++ b/openwrt/package/base-files/default/etc/init.d/S60cron
@@ -1,6 +1,4 @@
 #!/bin/sh
-[ -d /etc/crontabs ] || mkdir -p /etc/crontabs
-[ -e /var/spool/cron/crontabs ] || {
-        mkdir -p /var/spool/cron
-        ln -s /etc/crontabs /var/spool/cron/crontabs
-} && crond -c /etc/crontabs
+mkdir -p /var/spool/cron
+ln -s /etc/crontabs /var/spool/cron/crontabs
+crond -c /etc/crontabs