Base-files: Updated for nylon.

diff --git a/recipes/base-files/base-files/mtx-1/fstab b/recipes/base-files/base-files/mtx-1/fstab
deleted file mode 100644 (file)
index 5c0e2b3..0000000
--- a/recipes/base-files/base-files/mtx-1/fstab
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/fstab: static file system information. mtx-1
-#
-# <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-1/profile b/recipes/base-files/base-files/mtx-1/profile
deleted file mode 100644 (file)
index bedf2fc..0000000
--- a/recipes/base-files/base-files/mtx-1/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-2/fstab b/recipes/base-files/base-files/mtx-2/fstab
deleted file mode 100644 (file)
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 (file)
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/nylon/fstab b/recipes/base-files/base-files/nylon/fstab
new file mode 100644 (file)
index 0000000..5c0e2b3
--- /dev/null
+++ b/recipes/base-files/base-files/nylon/fstab
@@ -0,0 +1,9 @@
+# /etc/fstab: static file system information. mtx-1
+#
+# <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/nylon/profile b/recipes/base-files/base-files/nylon/profile
new file mode 100644 (file)
index 0000000..04b6037
--- /dev/null
+++ b/recipes/base-files/base-files/nylon/profile
@@ -0,0 +1,34 @@
+# /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)
+   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
+  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"