All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit b5f26869 authored by Mike Hibler's avatar Mike Hibler

Uniformly treat rc.ipod as a standalone script.

I.e., exec it, don't source it.
parent 2dc5d9ee
......@@ -553,8 +553,8 @@ if [ -x /usr/sbin/ntpdate ]; then
fi
# Enable IPoD
if [ -r $BINDIR/rc.ipod ]; then
. $BINDIR/rc.ipod
if [ -x $BINDIR/rc.ipod ]; then
$BINDIR/rc.ipod
fi
#
......
#! /bin/sh
#
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -112,4 +112,4 @@ if [ x"$IPODINFO" != x ]; then
else
echo "*** WARNING: no IPOD info, not enabled"
fi
exit 0
#!/bin/sh
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -530,8 +530,8 @@ if [ -x /usr/sbin/ntpdate ]; then
fi
# Enable IPoD
if [ -r $BINDIR/rc.ipod ]; then
. $BINDIR/rc.ipod
if [ -x $BINDIR/rc.ipod ]; then
$BINDIR/rc.ipod
fi
#
......
#!/bin/sh
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -528,8 +528,8 @@ if [ -x /usr/sbin/ntpdate ]; then
fi
# Enable IPoD
if [ -r $BINDIR/rc/rc.ipod ]; then
. $BINDIR/rc/rc.ipod
if [ -x $BINDIR/rc/rc.ipod ]; then
$BINDIR/rc/rc.ipod
fi
# Try to map disks to BIOS drive numbers via EDD
......
#! /bin/sh
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -79,3 +79,4 @@ fi
sysctl -w net.ipv4.icmp_ipod_enabled=1 >/dev/null
echo "$str IPOD enabled from $IPOD_HOST_IP/$IPOD_MASK_IP"
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment