diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-19 19:58:07 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-19 19:58:07 +0000 |
| commit | f3aa8f589504f7a700039d8287658936953bafbb (patch) | |
| tree | b3991f45e0aa660c043a9e880b54c22750fcd64f | |
| parent | 2e0e79b882a5a526927852b73df9df92516443e3 (diff) | |
made HOME=/root global instead of x86 specific
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8845 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 1 | ||||
| -rw-r--r-- | package/base-files/files/etc/passwd | 2 | ||||
| -rw-r--r-- | package/base-files/files/etc/profile | 2 | ||||
| -rw-r--r-- | target/linux/x86/base-files.mk | 5 | ||||
| -rw-r--r-- | target/linux/x86/base-files/default/etc/passwd | 2 | ||||
| -rw-r--r-- | target/linux/x86/base-files/default/etc/profile | 14 |
6 files changed, 3 insertions, 23 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 313710187..c639df838 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -156,6 +156,7 @@ define Package/base-files$(TARGET)/install mkdir -p $(1)/usr/bin mkdir -p $(1)/sys mkdir -p $(1)/www + mkdir -p $(1)/root ln -sf /proc/mounts $(1)/etc/mtab rm -f $(1)/var ln -sf /tmp $(1)/var diff --git a/package/base-files/files/etc/passwd b/package/base-files/files/etc/passwd index 3b660a0d4..6fe6ab5ad 100644 --- a/package/base-files/files/etc/passwd +++ b/package/base-files/files/etc/passwd @@ -1,2 +1,2 @@ -root:!:0:0:root:/tmp:/bin/ash +root:!:0:0:root:/root:/bin/ash nobody:*:65534:65534:nobody:/var:/bin/false diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile index 5cb83c935..e82408ff8 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/files/etc/profile @@ -2,7 +2,7 @@ [ -f /etc/banner ] && cat /etc/banner export PATH=/bin:/sbin:/usr/bin:/usr/sbin -export HOME=/tmp +export HOME=/root export PS1='\u@\h:\w\$ ' [ -x /bin/more ] || alias more=less diff --git a/target/linux/x86/base-files.mk b/target/linux/x86/base-files.mk deleted file mode 100644 index d77ab55b8..000000000 --- a/target/linux/x86/base-files.mk +++ /dev/null @@ -1,5 +0,0 @@ -define Package/base-files/install-target - mkdir -p $(1)/root -endef - - diff --git a/target/linux/x86/base-files/default/etc/passwd b/target/linux/x86/base-files/default/etc/passwd deleted file mode 100644 index 6fe6ab5ad..000000000 --- a/target/linux/x86/base-files/default/etc/passwd +++ /dev/null @@ -1,2 +0,0 @@ -root:!:0:0:root:/root:/bin/ash -nobody:*:65534:65534:nobody:/var:/bin/false diff --git a/target/linux/x86/base-files/default/etc/profile b/target/linux/x86/base-files/default/etc/profile deleted file mode 100644 index e82408ff8..000000000 --- a/target/linux/x86/base-files/default/etc/profile +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -[ -f /etc/banner ] && cat /etc/banner - -export PATH=/bin:/sbin:/usr/bin:/usr/sbin -export HOME=/root -export PS1='\u@\h:\w\$ ' - -[ -x /bin/more ] || alias more=less -[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi - -[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc - -[ -x /sbin/arp ] || arp() { cat /proc/net/arp; } -[ -z /bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } |