Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Commit 77bfc29

Browse files
author
Dan Kelleher
committed
The SysV scripts should now call the /usr/sbin executable instead
of executing the scripts them self.
1 parent ea6ad53 commit 77bfc29

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

base_deb/etc/init.d/vmcontext

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,7 @@ function execute_scripts {
5252

5353
case "$1" in
5454
"start")
55-
CONTEXT_DEV=`blkid -l -t LABEL="CONTEXT" -o device`
56-
if [ -e "$CONTEXT_DEV" ]; then
57-
mount -t iso9660 -L CONTEXT -o ro /mnt
58-
if [ -f /mnt/context.sh ]; then
59-
export_rc_vars /mnt/context.sh
60-
fi
61-
62-
execute_scripts
63-
64-
umount /mnt
65-
else
66-
if type vmtoolsd ; then
67-
vmtoolsd --cmd 'info-get guestinfo.opennebula.context' | openssl base64 -d > /tmp/context.sh
68-
export_rc_vars /tmp/context.sh
69-
fi
70-
71-
execute_scripts
72-
fi
73-
;;
55+
/usr/sbin/one-contextd start
7456

7557
esac
7658

base_rpm/etc/init.d/vmcontext

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,7 @@ function execute_scripts {
5252

5353
case "$1" in
5454
"start")
55-
CONTEXT_DEV=`blkid -l -t LABEL="CONTEXT" -o device`
56-
if [ -e "$CONTEXT_DEV" ]; then
57-
mount -t iso9660 -L CONTEXT -o ro /mnt
58-
if [ -f /mnt/context.sh ]; then
59-
export_rc_vars /mnt/context.sh
60-
fi
61-
62-
execute_scripts
63-
64-
umount /mnt
65-
else
66-
if type vmtoolsd ; then
67-
vmtoolsd --cmd 'info-get guestinfo.opennebula.context' | openssl base64 -d > /tmp/context.sh
68-
export_rc_vars /tmp/context.sh
69-
fi
70-
71-
execute_scripts
72-
fi
73-
;;
55+
/usr/sbin/one-contextd start
7456

7557
esac
7658

0 commit comments

Comments
 (0)