From: Martin Dietze <di@fh-wedel.de>
Date: Tue, 19 May 2009 22:38:39 +0000 (+0200)
Subject: Base-files: Updated for nylon.
X-Git-Tag: Release-2010-05/1~3471
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f393268e4b5d687bc2ca50d63e0bb25050d8439;p=openembedded.git

Base-files: Updated for nylon.
---

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 8b9ad0f308..0000000000
--- 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 bedf2fc7d8..0000000000
--- 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 bedf2fc7d8..04b6037ccf 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"