summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2013-12-05 17:24:48 +0100
committerSimon Rettberg2013-12-05 17:24:48 +0100
commit997cac4dca6e4b89aec71ab857b2c41a2f2b73d3 (patch)
tree09555109694735136e5469ca401fa7f6ec5b66f4 /remote/rootfs
parent[rfs-stage32] Fix zram swap creation for > 32 CPUs (diff)
parent[xorg] add xprintidle to REQUIRED_INSTALLED_PACKAGES, as it is not (diff)
downloadtm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.tar.gz
tm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.tar.xz
tm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.zip
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-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