[oe-commits] Martin Dietze : Base-files: Updated for nylon.
GIT User account
git at amethyst.openembedded.net
Wed May 20 08:19:59 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6f393268e4b5d687bc2ca50d63e0bb25050d8439
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6f393268e4b5d687bc2ca50d63e0bb25050d8439
Author: Martin Dietze <di at fh-wedel.de>
Date: Wed May 20 00:38:39 2009 +0200
Base-files: Updated for nylon.
---
recipes/base-files/base-files/mtx-2/fstab | 9 -------
recipes/base-files/base-files/mtx-2/profile | 25 --------------------
.../base-files/base-files/{mtx-1 => nylon}/fstab | 0
.../base-files/base-files/{mtx-1 => nylon}/profile | 13 ++++++++-
4 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/recipes/base-files/base-files/mtx-2/fstab b/recipes/base-files/base-files/mtx-2/fstab
deleted file mode 100644
index 8b9ad0f..0000000
--- a/recipes/base-files/base-files/mtx-2/fstab
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/fstab: static file system information. mtx-2
-#
-# <file system> <mount pt> <type> <options> <dump> <pass>
-rootfs / auto defaults 1 1
-tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0
-proc /proc proc defaults 0 0
-devpts /dev/pts devpts mode=0620,gid=5 0 0
-tmpfs /dev/shm tmpfs mode=0777 0 0
-usbdevfs /proc/bus/usb usbdevfs noauto 0 0
diff --git a/recipes/base-files/base-files/mtx-2/profile b/recipes/base-files/base-files/mtx-2/profile
deleted file mode 100644
index bedf2fc..0000000
--- a/recipes/base-files/base-files/mtx-2/profile
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
-# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-
-PATH="/usr/local/bin:/usr/bin:/bin"
-
-if [ "`id -u`" -eq 0 ]; then
- PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
-fi
-if [ "$PS1" ]; then
-# works for bash and ash (no other shells known to be in use here)
- PS1='\u@\h:\w\$ '
-fi
-
-if [ -d /etc/profile.d ]; then
- for i in `ls /etc/profile.d/`; do
- . /etc/profile.d/$i
- done
- unset i
-fi
-
-export PATH PS1
-
-umask 022
-
-alias ll="ls -lah"
\ No newline at end of file
diff --git a/recipes/base-files/base-files/mtx-1/fstab b/recipes/base-files/base-files/nylon/fstab
similarity index 100%
rename from recipes/base-files/base-files/mtx-1/fstab
rename to recipes/base-files/base-files/nylon/fstab
diff --git a/recipes/base-files/base-files/mtx-1/profile b/recipes/base-files/base-files/nylon/profile
similarity index 72%
rename from recipes/base-files/base-files/mtx-1/profile
rename to recipes/base-files/base-files/nylon/profile
index bedf2fc..04b6037 100644
--- a/recipes/base-files/base-files/mtx-1/profile
+++ b/recipes/base-files/base-files/nylon/profile
@@ -8,7 +8,16 @@ if [ "`id -u`" -eq 0 ]; then
fi
if [ "$PS1" ]; then
# works for bash and ash (no other shells known to be in use here)
- PS1='\u@\h:\w\$ '
+ if [ "$UID" = "0" -o "$USER" = "root" ]; then
+ B='# '
+ else
+ B='$ '
+ fi
+ if [ -n "$BASH" ]; then
+ PS1="\u@\h:\w\$B"
+ else
+ PS1="$B"
+ fi
fi
if [ -d /etc/profile.d ]; then
@@ -22,4 +31,4 @@ export PATH PS1
umask 022
-alias ll="ls -lah"
\ No newline at end of file
+alias ll="ls -lah"
More information about the Openembedded-commits
mailing list