summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile12
-rw-r--r--package/base-files/files/base-files.conffiles5
-rw-r--r--package/base-files/src/etc/mdev.conf15
3 files changed, 19 insertions, 13 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 14a884bcf..e0cadbf9a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 34
+PKG_RELEASE:= 36
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
@@ -26,7 +26,7 @@ do-install:
# allow this to fail, as there might be no target-specific files to copy
-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
- @-rm $(IDIR_BASE_FILES)/etc/network/interfaces
+ @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces
endif
$(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
$(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
@@ -43,18 +43,12 @@ endif
ifneq (${ADK_PACKAGE_ZSH},)
echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
endif
- mkdir -p $(IDIR_BASE_FILES)/dev
- mkdir -p $(IDIR_BASE_FILES)/boot
- mkdir -p $(IDIR_BASE_FILES)/root
- mkdir -p $(IDIR_BASE_FILES)/sys
+ mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
mkdir -p $(IDIR_BASE_FILES)/etc/crontabs
mkdir -p $(IDIR_BASE_FILES)/etc/network/if-pre-up.d
mkdir -p $(IDIR_BASE_FILES)/etc/network/if-up.d
mkdir -p $(IDIR_BASE_FILES)/etc/network/if-down.d
mkdir -p $(IDIR_BASE_FILES)/etc/network/if-post-down.d
- mkdir -p $(IDIR_BASE_FILES)/mnt
- mkdir -p $(IDIR_BASE_FILES)/proc
- mkdir -p $(IDIR_BASE_FILES)/tmp
mkdir -p $(IDIR_BASE_FILES)/usr/lib
mkdir -p $(IDIR_BASE_FILES)/usr/bin
chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles
index b2f9597a8..59ed2f02b 100644
--- a/package/base-files/files/base-files.conffiles
+++ b/package/base-files/files/base-files.conffiles
@@ -1,6 +1,9 @@
+/etc/mdev.conf
+/etc/inittab
/etc/banner
/etc/group
/etc/hosts
+/etc/hostname
/etc/ipkg.conf
/etc/modules
/etc/passwd
@@ -10,3 +13,5 @@
/etc/rc.conf
/etc/sysctl.conf
/etc/shadow
+/etc/shells
+/etc/network/interfaces
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 99c910d0b..69d9c0079 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -1,11 +1,18 @@
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @mkdir /dev/mapper
tun 0:0 660 >net/tun
null 0:0 777
zero 0:0 666
+u?random 0:0 644
console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
ptmx 0:0 666
-tty 0:0 0666
+tty 0:0 666
ttyS* 0:0 640
+audio root:audio 660 >snd/audio
+dsp root:audio 660 >snd/dsp
+timer root:audio 660 >snd/timer
+controlC0 root:audio 660 >snd/controlC0
+pcmC0D0c root:audio 660 >snd/pcmC0D0c
+pcmC0D0p root:audio 660 >snd/pcmC0D0p
+msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
.* 0:0 644 @/lib/mdev/init