aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-12-10 11:18:08 -0500
committerBill Nottingham <notting@redhat.com>2012-12-10 11:18:08 -0500
commit88857e147b92ec4062b5c8ee22aca253f08c1bd0 (patch)
tree5ba73e4b3be6e23fed3370add4115e7e255245ca
parent65173d72f1a662a8596aa0e14232556ba40e452f (diff)
downloadinitscripts-88857e147b92ec4062b5c8ee22aca253f08c1bd0.tar
initscripts-88857e147b92ec4062b5c8ee22aca253f08c1bd0.tar.gz
initscripts-88857e147b92ec4062b5c8ee22aca253f08c1bd0.tar.bz2
initscripts-88857e147b92ec4062b5c8ee22aca253f08c1bd0.tar.xz
initscripts-88857e147b92ec4062b5c8ee22aca253f08c1bd0.zip
Migrate even further away from /etc/sysconfig/network for hostname, and /etc/sysconfig/i18n.
-rwxr-xr-xlang.csh2
-rwxr-xr-xlang.sh2
-rwxr-xr-xsystemd/fedora-configure6
3 files changed, 4 insertions, 6 deletions
diff --git a/lang.csh b/lang.csh
index 3a65c64b..c6a44664 100755
--- a/lang.csh
+++ b/lang.csh
@@ -11,7 +11,7 @@ if ($?LANG) then
setenv LANG $saved_lang
unset saved_lang
else
- foreach file (/etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n")
+ foreach file (/etc/locale.conf "$HOME/.i18n")
if ( -f $file ) then
eval `sed -ne 's|^[[:blank:]]*\([^#=]\{1,\}\)=\([^=]*\)|setenv \1 \2;|p' $file`
set sourced=1
diff --git a/lang.sh b/lang.sh
index 9ad5e847..4a759f53 100755
--- a/lang.sh
+++ b/lang.sh
@@ -8,7 +8,7 @@ if [ -n "$LANG" ]; then
LANG="$saved_lang"
unset saved_lang
else
- for langfile in /etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n" ; do
+ for langfile in /etc/locale.conf "$HOME/.i18n" ; do
[ -f $langfile ] && . $langfile && sourced=1
done
fi
diff --git a/systemd/fedora-configure b/systemd/fedora-configure
index 43f17ca3..64f535f6 100755
--- a/systemd/fedora-configure
+++ b/systemd/fedora-configure
@@ -13,10 +13,8 @@ if [ -x /usr/sbin/firstboot ]; then
fi
# Reread in network configuration data.
-if [ -f /etc/sysconfig/network ]; then
- . /etc/sysconfig/network
- [ -r /etc/hostname ] && HOSTNAME=$(cat /etc/hostname)
-
+if [ -r /etc/hostname ]; then
+ HOSTNAME=$(cat /etc/hostname)
# Reset the hostname.
action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
fi