setup /etc/hostname only if file is missing or empty

http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2015-June/024391.html

diff --git a/systemd.spec b/systemd.spec
index 7f2c20a11d90fe8fb644e22c61ad2b444413bac6..de0f9708fb126d82df45860cdd47483ada9cd667 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -934,13 +934,14 @@ if [ $1 -eq 1 ]; then
        # And symlink what we found to the new-style default.target
        ln -s "$target" %{_sysconfdir}/systemd/system/default.target || :
 
-       # Setup hostname
-       HOSTNAME=
-       [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
-       if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then
-               [ -f /etc/hostname ] && mv -f /etc/hostname /etc/hostname.rpmsave
-               echo $HOSTNAME > /etc/hostname
-               chmod 644 /etc/hostname
+       # Setup hostname if not yet done so
+       if [ ! -f /etc/hostname ] || [ ! -s /etc/hostname ]; then
+               HOSTNAME=
+               [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
+               if [ -n "$HOSTNAME" -a "$HOSTNAME" != "pldmachine" ]; then
+                       echo $HOSTNAME > /etc/hostname
+                       chmod 644 /etc/hostname
+               fi
        fi
 
        # Enable the services we install by default.