summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-01-10 15:39:39 +0000
committerChristian Heim <phreak@gentoo.org>2006-01-10 15:39:39 +0000
commitced906bbd71781d3e5766c470a18619f27386198 (patch)
tree96ed38ca2bbde50c4cc5f43d1e7eafa80144ccb3 /etc
parentImporting latest baselayout/trunk changes. This is a merge with revision 1768. (diff)
downloadbaselayout-vserver-ced906bbd71781d3e5766c470a18619f27386198.tar.gz
baselayout-vserver-ced906bbd71781d3e5766c470a18619f27386198.tar.bz2
baselayout-vserver-ced906bbd71781d3e5766c470a18619f27386198.zip
Importing latest baselayout/trunk changes. This merge is based upon revision 1797.
svn path=/baselayout-vserver/trunk/; revision=194
Diffstat (limited to 'etc')
-rw-r--r--etc/conf.d/domainname4
-rw-r--r--etc/profile14
2 files changed, 8 insertions, 10 deletions
diff --git a/etc/conf.d/domainname b/etc/conf.d/domainname
index 7d8374b..3a32173 100644
--- a/etc/conf.d/domainname
+++ b/etc/conf.d/domainname
@@ -11,10 +11,10 @@ OVERRIDE=1
#
# DNSDOMAIN merely sets the domain entry in /etc/resolv.conf, see
# the resolv.conf(5) manpage for more info.
-
+
DNSDOMAIN=""
# For information on setting up NIS, please see:
# http://www.linux-nis.org/nis-howto/HOWTO/
-
+
NISDOMAIN=""
diff --git a/etc/profile b/etc/profile
index 8655c73..f347430 100644
--- a/etc/profile
+++ b/etc/profile
@@ -57,11 +57,9 @@ else
PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
fi
-if [ -d /etc/profile.d ] ; then
- for sh in /etc/profile.d/*.sh ; do
- if [ -r "$sh" ] ; then
- . "$sh"
- fi
- done
- unset sh
-fi
+for sh in /etc/profile.d/*.sh ; do
+ if [ -r "$sh" ] ; then
+ . "$sh"
+ fi
+done
+unset sh