diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-10-28 10:44:00 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-10-28 10:44:00 -0400 |
| commit | 12cabd751919122551b6eb73850b35fbe565c679 (patch) | |
| tree | 4b70a8d650b7b2b7937bd10623acff8d6ee07ff8 /systemd/fedora-configure | |
| parent | 96bf02f67020374327528b6e0ec742499b516aba (diff) | |
| download | initscripts-12cabd751919122551b6eb73850b35fbe565c679.tar initscripts-12cabd751919122551b6eb73850b35fbe565c679.tar.gz initscripts-12cabd751919122551b6eb73850b35fbe565c679.tar.bz2 initscripts-12cabd751919122551b6eb73850b35fbe565c679.tar.xz initscripts-12cabd751919122551b6eb73850b35fbe565c679.zip | |
Simplify some things with ConditionPathExists.
Diffstat (limited to 'systemd/fedora-configure')
| -rwxr-xr-x | systemd/fedora-configure | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/systemd/fedora-configure b/systemd/fedora-configure index 3a8c6dc4..63e6e4c7 100755 --- a/systemd/fedora-configure +++ b/systemd/fedora-configure @@ -4,22 +4,18 @@ . /etc/init.d/functions -if [ -f /.unconfigured ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit - fi +if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then + /usr/bin/rhgb-client --quit +fi - if [ -x /usr/sbin/firstboot ]; then - /usr/sbin/firstboot - fi - - # Reread in network configuration data. - if [ -f /etc/sysconfig/network ]; then - . /etc/sysconfig/network +if [ -x /usr/sbin/firstboot ]; then + /usr/sbin/firstboot +fi - # Reset the hostname. - action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} - fi +# Reread in network configuration data. +if [ -f /etc/sysconfig/network ]; then + . /etc/sysconfig/network - rm -f /.unconfigured + # Reset the hostname. + action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} fi |