summaryrefslogtreecommitdiff
path: root/base-files
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-06-05 11:31:35 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-06-05 11:31:35 +0000
commit3a4356259928ada67e7fbd1cb4c5b89c7335ecdb (patch)
treee19369579afffaa791040e26515f206c4f3a0dfd /base-files
parentbf5a6cc4503b774ae77f405eac1ce3ec77f438c8 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/06/05 13:27:55+02:00 uni-frankfurt.de!mickeyl make ipkg run later (S98 instead of S35) BKrev: 40c1af17BZzeE2XK4KcV5n4mN5gOvA
Diffstat (limited to 'base-files')
-rw-r--r--base-files/base-files/etc/profile14
-rw-r--r--base-files/base-files/share/dot.profile10
2 files changed, 15 insertions, 9 deletions
diff --git a/base-files/base-files/etc/profile b/base-files/base-files/etc/profile
index a3932c974a..2e28fc777b 100644
--- a/base-files/base-files/etc/profile
+++ b/base-files/base-files/etc/profile
@@ -6,16 +6,12 @@ QPEDIR=/opt/QtPalmtop
QTDIR=/opt/QtPalmtop
PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
+if [ "`id -u`" -eq 0 ]; then
+ PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
if [ "$PS1" ]; then
- if [ "$BASH" ]; then
- PS1='\u@\h:\w\$ '
- else
- if [ "`id -u`" -eq 0 ]; then
- PS1='# '
- else
- PS1='$ '
- fi
- fi
+# works for bash and ash (no other shells known to be in use here)
+ PS1='\u@\h:\w\$ '
fi
export PATH PS1 OPIEDIR QPEDIR QTDIR
diff --git a/base-files/base-files/share/dot.profile b/base-files/base-files/share/dot.profile
index e69de29bb2..979793e8b5 100644
--- a/base-files/base-files/share/dot.profile
+++ b/base-files/base-files/share/dot.profile
@@ -0,0 +1,10 @@
+# ~/.profile: executed by Bourne-compatible login shells.
+
+if [ -f ~/.bashrc ]; then
+ . ~/.bashrc
+fi
+
+# path set by /etc/profile
+# export PATH
+
+mesg n