Skip to content

Commit 10339e8

Browse files
committed
CL: CS-1200: Installer provides darwin_template for services which is incomplete and not needed anymore
1 parent c65e3bd commit 10339e8

File tree

3 files changed

+2
-107
lines changed

3 files changed

+2
-107
lines changed

source/dist/util/arch_variables

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ case $ARCH in
150150
darwin*)
151151
AWK=/usr/bin/awk
152152
ECHO=/bin/echo
153-
RC_FILE=SGE
154-
RC_DIR=SGE
153+
RC_FILE=darwin
154+
RC_DIR=darwin
155155
RC_PREFIX=/Library/StartupItems
156156
if [ -x /sw/bin/Eterm ]; then
157157
XTERM=/sw/bin/Eterm

source/dist/util/install_modules/inst_common.sh

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,46 +2275,6 @@ InstallRcScript()
22752275
elif [ "$RC_FILE" = "freebsd" ]; then
22762276
echo cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
22772277
Execute cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
2278-
elif [ "$RC_FILE" = "SGE" ]; then
2279-
RC_DIR="$RC_DIR.$SGE_CLUSTER_NAME"
2280-
echo mkdir -p "$RC_PREFIX/$RC_DIR"
2281-
Execute mkdir -p "$RC_PREFIX/$RC_DIR"
2282-
2283-
cat << PLIST > "$RC_PREFIX/$RC_DIR/StartupParameters.plist"
2284-
{
2285-
Description = "Cluster Scheduler";
2286-
Provides = ("SGE");
2287-
Requires = ("Disks", "NFS", "Resolver");
2288-
Uses = ("NetworkExtensions");
2289-
OrderPreference = "Late";
2290-
Messages =
2291-
{
2292-
start = "Starting Cluster Scheduler";
2293-
stop = "Stopping Cluster Scheduler";
2294-
restart = "Restarting Cluster Scheduler";
2295-
};
2296-
}
2297-
PLIST
2298-
2299-
if [ $hosttype = "master" ]; then
2300-
DARWIN_GEN_REPLACE="#GENMASTERRC"
2301-
elif [ $hosttype = "bdb" ]; then
2302-
DARWIN_GEN_REPLACE="#GENBDBRC"
2303-
else
2304-
DARWIN_GEN_REPLACE="#GENEXECDRC"
2305-
fi
2306-
2307-
if [ -f "$RC_PREFIX/$RC_DIR/$RC_FILE" ]; then
2308-
DARWIN_TEMPLATE="$RC_PREFIX/$RC_DIR/$RC_FILE"
2309-
else
2310-
DARWIN_TEMPLATE="util/rctemplates/darwin_template"
2311-
fi
2312-
2313-
Execute sed -e "s%${DARWIN_GEN_REPLACE}%${SGE_STARTUP_FILE}%g" \
2314-
"$DARWIN_TEMPLATE" > "$RC_PREFIX/$RC_DIR/$RC_FILE.$$"
2315-
Execute chmod a+x "$RC_PREFIX/$RC_DIR/$RC_FILE.$$"
2316-
Execute mv "$RC_PREFIX/$RC_DIR/$RC_FILE.$$" "$RC_PREFIX/$RC_DIR/$RC_FILE"
2317-
RC_DIR="SGE"
23182278
else
23192279
# if this is not System V we simple add the call to the
23202280
# startup script to RC_FILE

source/dist/util/rctemplates/darwin_template

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)