7025850 /etc/skel/.bashrc missing after fresh install, system/install/config:default goes into maintenance
authorStefan Teleman <stefan.teleman@oracle.com>
Thu, 10 Mar 2011 07:40:29 -0800
changeset 122 0ea89372af96
parent 121 9fa779e01c00
child 123 882fa2ea841b
7025850 /etc/skel/.bashrc missing after fresh install, system/install/config:default goes into maintenance
components/bash/Makefile
components/bash/Solaris/etc.skel.bashrc
components/bash/bash.p5m
--- a/components/bash/Makefile	Wed Mar 09 17:45:12 2011 -0800
+++ b/components/bash/Makefile	Thu Mar 10 07:40:29 2011 -0800
@@ -128,6 +128,9 @@
 	    $(PROTO_DIR)/etc/bash/inputrc.example ; \
 	    cp -p $(COMPONENT_DIR)/Solaris/rbash.1 \
 	    $(PROTOUSRSHAREMAN1DIR)/ )
+	( mkdir -p $(PROTO_DIR)/etc/skel ; \
+	    cp -p $(COMPONENT_DIR)/Solaris/etc.skel.bashrc \
+	    $(PROTO_DIR)/etc/skel/.bashrc )
 	( cd $(PROTOUSRSHAREDIR)/locale ; \
 	    cp -Rp "[email protected]" en ; \
 	    cp -Rp "[email protected]" en_CA ; \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/Solaris/etc.skel.bashrc	Thu Mar 10 07:40:29 2011 -0800
@@ -0,0 +1,7 @@
+#
+# Define default prompt to <username>@<hostname>:<path><"($|#) ">
+# and print '#' for user "root" and '$' for normal users.
+#
+PS1='${LOGNAME}@$(/usr/bin/hostname):$(
+    [[ "${LOGNAME}" == "root" ]] && printf "%s" "${PWD/${HOME}/~}# " ||
+    printf "%s" "${PWD/${HOME}/~}\$ ")'
--- a/components/bash/bash.p5m	Wed Mar 09 17:45:12 2011 -0800
+++ b/components/bash/bash.p5m	Thu Mar 10 07:40:29 2011 -0800
@@ -31,6 +31,7 @@
 dir path=etc
 dir path=etc/bash
 dir path=etc/bash/bash_completion.d
+dir path=etc/skel
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -97,6 +98,7 @@
 file path=etc/bash/bashrc.example
 file path=etc/bash/bash_completion.example
 file path=etc/bash/inputrc.example
+file path=etc/skel/.bashrc
 file path=usr/bin/bash
 file path=usr/share/bash/alias
 file path=usr/share/bash/arith