diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/base-files | |
parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) |
resolve conflict
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 2 | ||||
-rw-r--r-- | package/base-files/src/etc/profile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index dee9fd9a4..3744ceb53 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:= 43 +PKG_RELEASE:= 44 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index ff808b707..c326f87c2 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -1,5 +1,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin export TERM=linux +export EDITOR=/bin/vi if [[ $(id -u) = 0 ]]; then export PS1='`whoami`@`hostname`:`pwd` # ' else |