aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-09-27 01:23:23 +0000
committerBill Nottingham <notting@redhat.com>2006-09-27 01:23:23 +0000
commit710e7219c2c227b01296f42a716b0608534e9122 (patch)
tree6751347b36014c108ad6bb43a22ccf260d1de684 /rc.d/rc.sysinit
parent515a5bb5b841bf0c6c9af1f4257033e42e14ec7f (diff)
downloadinitscripts-710e7219c2c227b01296f42a716b0608534e9122.tar
initscripts-710e7219c2c227b01296f42a716b0608534e9122.tar.gz
initscripts-710e7219c2c227b01296f42a716b0608534e9122.tar.bz2
initscripts-710e7219c2c227b01296f42a716b0608534e9122.tar.xz
initscripts-710e7219c2c227b01296f42a716b0608534e9122.zip
* rc.sysinit: Also check for localhost.localdomain when resetting
the hostname for stateless clients. Remove explicit mount of $STATE_MOUNT/.files. Copy the puppet CA's certificate from the r/o image into $STATE_MOUNT. (#206331, <law@redhat.com>)
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d257e128..f2b70a40 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -559,7 +559,7 @@ if [ "$READONLY" = "yes" ]; then
# Use the network address to set the hostname of the client. This
# must be done even if we have local storage.
ipaddr=
- if [ "$HOSTNAME" = "localhost" ]; then
+ if [ "$HOSTNAME" = "localhost" -o "$HOSTNAME" = "localhost.localdomain" ]; then
ipaddr=$(ip addr show to 0/0 scope global | awk '/[[:space:]]inet / { print gensub("/.*","","g",$2) }')
if [ -n "$ipaddr" ]; then
eval $(ipcalc -h $ipaddr 2>/dev/null)