Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Resolved conflicts (renaming fault 1006 to 1008)

Conflicts:
	util/faults/en_US/1006.xml
	util/faults/en_US/2000.xml
	util/misc.c
	util/misc.h
  • Loading branch information...
commit cafbf39539c4a9c4a0c8c231b8f8ea6fd98dac2f 1 parent 8c412f8
Dmitrii Zagorodnov authored
Showing with 46 additions and 2 deletions.
  1. +2 −2 tools/eucalyptus-nc.in
  2. +44 −0 util/faults/en_US/1008.xml
View
4 tools/eucalyptus-nc.in
@@ -148,9 +148,9 @@ do_start() {
if [ ! `pgrep -n ntp` ]; then
# write fault to stdout
echo
- $EUCALYPTUS/usr/sbin/euca-generate-fault 1006 daemon ntp
+ $EUCALYPTUS/usr/sbin/euca-generate-fault 1008 daemon ntp
# and to NC's fault log
- $EUCALYPTUS/usr/sbin/euca-generate-fault -c nc 1006 daemon ntp
+ $EUCALYPTUS/usr/sbin/euca-generate-fault -c nc 1008 daemon ntp
fi
# fixes #469984
View
44 util/faults/en_US/1008.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2012 Eucalyptus Systems, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+
+ Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
+ CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
+ additional information or have any questions.
+ -->
+<eucafaults version="1" description="Templates for the fault subsystem">
+ <fault
+ id="1008"
+ message="${daemon} is not running">
+
+ <condition
+ message="can't find running ${daemon} process"/>
+
+ <cause/> <!-- since 'message' is not set, default value, $unknown, will be used -->
+
+ <initiator
+ message="eucalyptus"/>
+
+ <location
+ message="${daemon} daemon on localhost"/>
+
+ <resolution>
+ <message>
+ 1) install ${daemon}
+ 2) run ${daemon}
+ </message>
+ </resolution>
+ </fault>
+</eucafaults>
Please sign in to comment.
Something went wrong with that request. Please try again.