Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
cfbf4857
Commit
cfbf4857
authored
9 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
Task #7522: Fixed init.d/qpidd to work with start-stop-daemon, and not rely on additional scripts
parent
a748d5c7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SubSystems/Online_Cobalt/install/init.d-qpidd.sh
+2
-2
2 additions, 2 deletions
SubSystems/Online_Cobalt/install/init.d-qpidd.sh
SubSystems/Online_Cobalt/install/postinstall_root.sh
+2
-2
2 additions, 2 deletions
SubSystems/Online_Cobalt/install/postinstall_root.sh
with
4 additions
and
4 deletions
SubSystems/Online_Cobalt/install/init.d-qpidd.sh
+
2
−
2
View file @
cfbf4857
...
@@ -57,7 +57,7 @@ do_start()
...
@@ -57,7 +57,7 @@ do_start()
# 0 if daemon has been started
# 0 if daemon has been started
# 1 if daemon was already running
# 1 if daemon was already running
# 2 if daemon could not be started
# 2 if daemon could not be started
$SUCMD
start-qpid
start-stop-daemon
--start
--quiet
--oknodo
--exec
$DAEMON
--chuid
qpid:qpid
--
-d
--pid-dir
/localhome/qpid
--data-dir
/localhome/qpid/.qpidd
--config
/opt/qpid/etc/qpid/qpidd.conf
--auth
no
--log-to-file
/localhome/qpid/qpid.log
return
"
$?
"
return
"
$?
"
# Add code here, if necessary, that waits for the process to be ready
# Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend
# to handle requests from services started subsequently which depend
...
@@ -74,7 +74,7 @@ do_stop()
...
@@ -74,7 +74,7 @@ do_stop()
# 1 if daemon was already stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# 2 if daemon could not be stopped
# other if a failure occurred
# other if a failure occurred
$SUCMD
stop-
qpid
start-stop-daemon
--stop
--quiet
--oknodo
--exec
$DAEMON
--user
qpid
RETVAL
=
"
$?
"
RETVAL
=
"
$?
"
[
"
$RETVAL
"
=
2
]
&&
return
2
[
"
$RETVAL
"
=
2
]
&&
return
2
# Wait for children to finish too if this is a daemon that forks
# Wait for children to finish too if this is a daemon that forks
...
...
This diff is collapsed.
Click to expand it.
SubSystems/Online_Cobalt/install/postinstall_root.sh
+
2
−
2
View file @
cfbf4857
...
@@ -17,8 +17,8 @@ ln -sfT /localhome /data
...
@@ -17,8 +17,8 @@ ln -sfT /localhome /data
echo
"Creating qpid user..."
echo
"Creating qpid user..."
adduser qpid
--system
--home
/localhome/qpid
--disabled-password
--disabled-login
adduser qpid
--system
--home
/localhome/qpid
--disabled-password
--disabled-login
#
mkdir -p /localhome/qpid
mkdir
-p
/localhome/qpid
#
chown qpid.qpid /localhome/qpid
chown
qpid.qpid /localhome/qpid
echo
"Installing /etc/init.d/qpidd..."
echo
"Installing /etc/init.d/qpidd..."
cp
init.d-qpidd.sh /etc/init.d/qpidd
cp
init.d-qpidd.sh /etc/init.d/qpidd
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment