Alon Bar-Lev has posted comments on this change.
Change subject: Removing libvirt_configure from pre-start and ask for manual run
......................................................................
Patch Set 2:
(2 comments)
....................................................
File init/sysvinit/vdsmd.init.in
Line 140: -0 /dev/null -1 /dev/null -2 /dev/null --syslog
"@VDSMDIR@/respawn" --minlifetime 10 \
Line 141: --daemon --masterpid "${RESPAWNPIDFILE}"
"${VDSM_BIN}" --pidfile "${PIDFILE}"
Line 142: RETVAL=$?
Line 143: [ "$RETVAL" = 0 ] && touch "${LOCK_FILE}"
Line 144: return "$RETVAL"
using this retval is the ugliest approach :))))
local RETVAL=1
if "${VDSMD_INIT_COMMON}" --pre-start; then
echo $"Starting up vdsm daemon: "
if NICELEVEL="${NICE_LOWEST}" daemon --user=vdsm
"@VDSMDIR@/daemonAdapter" \
...; then
touch "${LOCK_FILE}"
RETVAL=0
fi
return "${RETVAL}"
or... use the "|| return 1" structure...
Line 145: }
Line 146:
Line 147: stop() {
Line 148: echo $"Shutting down vdsm daemon: "
....................................................
File init/vdsmd_init_common.sh.in
Line 207: run_tasks " \
Line 208: run_init_hooks gencerts check_libvirt_configure \
Line 209: reconfigure_sanlock syslog_available nwfilter dummybr \
Line 210: load_needed_modules tune_system mkdirs test_space test_lo \
Line 211: test_conflicting_conf"
please move closing quotes to new line as well to allow adding last.
Line 212: ;;
Line 213: --post-stop)
Line 214: run_tasks "run_final_hooks"
Line 215: ;;
--
To view, visit
http://gerrit.ovirt.org/19737
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icf70a749454ea341d5b52220e16e9567b90431a0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes