From d47894abb5304cf3bb30b3669e596d648b5277ba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Nov 2016 22:18:32 +0100 Subject: finetune systemd/sysv integration, use /var tmpfs mountpoint --- package/base-files/Makefile | 9 ++++----- package/base-files/files/fstab | 1 + package/base-files/files/modules | 1 + package/base-files/src/etc/modules | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 package/base-files/files/modules delete mode 100644 package/base-files/src/etc/modules (limited to 'package/base-files') 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/files/modules b/package/base-files/files/modules new file mode 100644 index 000000000..014f40f2b --- /dev/null +++ b/package/base-files/files/modules @@ -0,0 +1 @@ +# add modules to load on startup here diff --git a/package/base-files/src/etc/modules b/package/base-files/src/etc/modules deleted file mode 100644 index 014f40f2b..000000000 --- a/package/base-files/src/etc/modules +++ /dev/null @@ -1 +0,0 @@ -# add modules to load on startup here -- cgit v1.2.3