From faea8af5b347966602684deb02339733a708856d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 1 Apr 2015 21:55:11 +0100
Subject: Add essential-files/etc/profile

Also source /etc/bash.bashrc so bash will work properly
if we use it for login

Change-Id: I4a4b238f84c44858904b0a208ef8737a859c355d
---
 essential-files/etc/profile          | 9 +++++++++
 essential-files/manifest             | 1 +
 strata/build-essential/busybox.morph | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 essential-files/etc/profile

diff --git a/essential-files/etc/profile b/essential-files/etc/profile
new file mode 100644
index 00000000..c5bddd0d
--- /dev/null
+++ b/essential-files/etc/profile
@@ -0,0 +1,9 @@
+# /etc/profile
+
+# Source global bash config
+if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
+        . /etc/bash.bashrc
+fi
+
+# Set default pager to less
+export MANPAGER='less -R'
diff --git a/essential-files/manifest b/essential-files/manifest
index 504f9cbb..1294534f 100644
--- a/essential-files/manifest
+++ b/essential-files/manifest
@@ -1,2 +1,3 @@
 0040755 0 0 /etc
 overwrite 0100644 0 0 /etc/os-release
+overwrite 0100644 0 0 /etc/profile
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index 85327648..b5418bc0 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -67,11 +67,6 @@ install-commands:
 
 # Set up man environment variables
 - mkdir -p "$DESTDIR"/etc
-- |
-  cat << EOF > "$DESTDIR/etc/profile"
-  # Set default pager to less
-  export MANPAGER='less -R'
-  EOF
 - |
   cat << EOF > "$DESTDIR/etc/man.conf"
   # This file is used by man to provide a manpath for those without one by
-- 
cgit v1.2.1