summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2013-12-05 16:23:48 +0100
committerJonathan Bauer2013-12-05 16:23:48 +0100
commitfdeade1ce624840142b6d479526dce6b5093dcdd (patch)
tree2b112ae6e15a9691c69b9b895a562555fe9372ba /remote
parent[xorg] add xprintdle (diff)
parent[rootfs.stage32] data/etc/profile: Now sourcing profile.local (diff)
downloadtm-scripts-fdeade1ce624840142b6d479526dce6b5093dcdd.tar.gz
tm-scripts-fdeade1ce624840142b6d479526dce6b5093dcdd.tar.xz
tm-scripts-fdeade1ce624840142b6d479526dce6b5093dcdd.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/profile4
1 files changed, 4 insertions, 0 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile
index 23e7373c..36ebb4c4 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32/data/etc/profile
@@ -47,6 +47,10 @@ for i in /etc/profile.d/*.sh ; do
fi
done
+# Sourcing /etc/profile.local - please add custom stuff to profile.local
+# as /etc/profile may be overwritten by system updates
+test -s /etc/profile.local && . /etc/profile.local
+
if [ -s "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi