|
49 | 49 | "$@" |
50 | 50 | rc=$? |
51 | 51 | if [ $rc -eq 0 ] ; then |
52 | | - log_success_msg $"$STRING " |
| 52 | + log_success_msg $"$STRING " |
53 | 53 | else |
54 | | - log_failure_msg $"$STRING " |
| 54 | + log_failure_msg $"$STRING " |
55 | 55 | fi |
56 | 56 | return $rc |
57 | 57 | } |
@@ -178,8 +178,8 @@ function remove_all_dp { |
178 | 178 |
|
179 | 179 | function insert_modules_if_required { |
180 | 180 | if test -e /sys/module/bridge; then |
181 | | - bridges=`echo /sys/class/net/*/bridge | sed 's,/sys/class/net/,,g;s,/bridge,,g'` |
182 | | - if test "$bridges" != "*"; then |
| 181 | + bridges=`echo /sys/class/net/*/bridge | sed 's,/sys/class/net/,,g;s,/bridge,,g'` |
| 182 | + if test "$bridges" != "*"; then |
183 | 183 | log_warning_msg "not removing bridge module because bridges exist ($bridges)" |
184 | 184 | else |
185 | 185 | action "removing bridge module" rmmod bridge |
@@ -354,13 +354,13 @@ function set_system_ids { |
354 | 354 | external-ids:system-id="$INSTALLATION_UUID" \ |
355 | 355 | external-ids:xs-system-uuid="$INSTALLATION_UUID" |
356 | 356 | else |
357 | | - if test -f /etc/openvswitch/install_uuid.conf; then |
| 357 | + if test -f /etc/openvswitch/install_uuid.conf; then |
358 | 358 | . /etc/openvswitch/install_uuid.conf |
359 | | - elif INSTALLATION_UUID=`uuidgen`; then |
360 | | - echo "INSTALLATION_UUID=$INSTALLATION_UUID" > /etc/openvswitch/install_uuid.conf |
361 | | - else |
362 | | - log_failure_msg "missing uuidgen, could not generate system UUID" |
363 | | - return |
| 359 | + elif INSTALLATION_UUID=`uuidgen`; then |
| 360 | + echo "INSTALLATION_UUID=$INSTALLATION_UUID" > /etc/openvswitch/install_uuid.conf |
| 361 | + else |
| 362 | + log_failure_msg "missing uuidgen, could not generate system UUID" |
| 363 | + return |
364 | 364 | fi |
365 | 365 | $vsctl --no-wait --timeout=5 set Open_vSwitch . \ |
366 | 366 | external-ids:system-id="$INSTALLATION_UUID" |
@@ -460,7 +460,7 @@ case "$1" in |
460 | 460 | # configuration up-to-date all the time. HUP ovs-external-ids so it |
461 | 461 | # re-runs. |
462 | 462 | hup_monitor_external_ids |
463 | | - ;; |
| 463 | + ;; |
464 | 464 | strace-vswitchd) |
465 | 465 | shift |
466 | 466 | strace -p $(cat "$VSWITCHD_PIDFILE") "$@" |
|
0 commit comments