finetune systemd/sysv integration, use /var tmpfs mountpoint

7 files changed, 14 insertions, 10 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 1c8a33d3f..9ab3c83d6 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -126,6 +126,10 @@ POSTCONFIG=		-@\
 			cleandir=1;\
 			rebuild=1;\
 		fi; \
+		if [ "$$(grep ^ADK_RUNTIME_INIT_ .config|md5sum)" != "$$(grep ^ADK_RUNTIME_BASE_ .config.old|md5sum)" ];then \
+			cleandir=1;\
+			rebuild=1;\
+		fi; \
 		if [ "$$(grep ^ADK_RUNTIME_BASE_ .config|md5sum)" != "$$(grep ^ADK_RUNTIME_BASE_ .config.old|md5sum)" ];then \
 			cleandir=1;\
 			rebuild=1;\
diff --git a/mk/image.mk b/mk/image.mk
index 272c21709..3485b43b6 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -78,8 +78,6 @@ ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),y)
 	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt
 	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff
 	ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot
-	ln -fs ../../../lib/systemd/system/multi-user.target \
-		$(TARGET_DIR)/etc/systemd/system/default.target
 endif
 	test -z $(GIT) || \
 	     $(GIT) log -1|head -1|sed -e 's#commit ##' \
diff --git a/mk/package.mk b/mk/package.mk
index 5510cf445..40a791616 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -229,9 +229,10 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y)
 endif
 ifeq (${ADK_RUNTIME_INIT_SYSTEMD},y)
 	@for file in $$$$(ls ./files/*.service 2>/dev/null); do \
-		mkdir -p $$(IDIR_$(1))/usr/lib/systemd/system && cp $$$$file $$(IDIR_$(1))/usr/lib/systemd/system; \
+		fname=$$$$(echo $$$$file| sed -e "s#.*/##"); \
+		mkdir -p $$(IDIR_$(1))/usr/lib/systemd/system && cp $$$$file $$(IDIR_$(1))/usr/lib/systemd/system/$$$$fname; \
 		mkdir -p $$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \
-		ln -sf ../../../../usr/lib/systemd/system/$$$$file \
+		ln -sf ../../../../usr/lib/systemd/system/$$$$fname \
 			$$(IDIR_$(1))/etc/systemd/system/multi-user.target.wants; \
 	done
 endif
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9c9ef9395..ebfe9c1ee 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.1
-PKG_RELEASE:=		23
+PKG_RELEASE:=		24
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -23,19 +23,18 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	$(CP) ./src/* $(IDIR_BASE_FILES)
-	mkdir -p $(IDIR_BASE_FILES)/{etc,dev,boot,root,sys,proc,tmp,run,mnt,media}
+	mkdir -p $(IDIR_BASE_FILES)/{etc,dev,boot,root,sys,proc,tmp,run,var,mnt,media}
 	mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin,sbin}
-	mkdir -p $(IDIR_BASE_FILES)/var/{log,lib}
 	ln -sf ../run $(IDIR_BASE_FILES)/var/run
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	chmod 1777 ${IDIR_BASE_FILES}/tmp
 ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),)
+	echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs
 	mkdir -p $(IDIR_BASE_FILES)/etc/init.d
 	cp ./files/init.d/* $(IDIR_BASE_FILES)/etc/init.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d}
-	ln -sf ../tmp $(IDIR_BASE_FILES)/var/tmp
-	echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs
 	cp ./files/fstab $(IDIR_BASE_FILES)/etc
+	cp ./files/modules $(IDIR_BASE_FILES)/etc
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 ifeq ($(ADK_TARGET_WITH_NETDEVICE),y)
 	cp ./files/interfaces-dhcp $(IDIR_BASE_FILES)/etc/network/interfaces
diff --git a/package/base-files/files/fstab b/package/base-files/files/fstab
index 06f19d9b6..6ceedf30f 100644
--- a/package/base-files/files/fstab
+++ b/package/base-files/files/fstab
@@ -5,6 +5,7 @@ devpts	/dev/pts	devpts	defaults,gid=5,mode=620	0	0
 tmpfs	/dev/shm	tmpfs	mode=0777	0	0
 tmpfs	/tmp		tmpfs	mode=1777	0	0
 tmpfs	/run		tmpfs	mode=777	0	0
+tmpfs	/var		tmpfs	mode=755	0	0
 sysfs	/sys		sysfs	defaults	0	0
 tmpfs	/media		tmpfs	defaults	0	0
 # example for cifs
diff --git a/package/base-files/src/etc/modules b/package/base-files/files/modules
index 014f40f2b..014f40f2b 100644
--- a/package/base-files/src/etc/modules
+++ b/package/base-files/files/modules
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 458ba5e88..9d0b90649 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		232
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880
 PKG_DESCR:=		system and service manager
 PKG_SECTION:=		base/apps
@@ -96,5 +96,6 @@ systemd-install:
 		$(IDIR_SYSTEMD)/usr/share
 	$(CP) ./files/*.network \
 		$(IDIR_SYSTEMD)/etc/systemd/network
+	(cd $(IDIR_SYSTEMD)/usr/lib/systemd/system && ln -sf multi-user.target default.target)
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk