diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2013-12-01 19:25:01 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2013-12-02 02:08:40 -0600 |
| commit | 60d288a877a3671ea5b3483ed7c4612ec897b99a (patch) | |
| tree | f370853f0a2f70b1c7491e7107d21ec457a1704e /init.d | |
| parent | 1fccf91df12c3c7f7e68f9fa9a99a71e85d9b98e (diff) | |
| download | openrc-60d288a877a3671ea5b3483ed7c4612ec897b99a.tar.gz openrc-60d288a877a3671ea5b3483ed7c4612ec897b99a.tar.bz2 openrc-60d288a877a3671ea5b3483ed7c4612ec897b99a.tar.xz | |
remove type command
The posix equivalent of the type command is "command -v", so now we use
that. Thanks to Jonathan Callen <jcallen@gentoo.org> for informing me
wrt the fix.
Diffstat (limited to 'init.d')
| -rw-r--r-- | init.d/bootmisc.in | 2 | ||||
| -rw-r--r-- | init.d/hostid.in | 2 | ||||
| -rw-r--r-- | init.d/local.in | 4 | ||||
| -rw-r--r-- | init.d/loopback.in | 2 | ||||
| -rw-r--r-- | init.d/pf.in | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index 526ebff..1b35a0a 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -68,7 +68,7 @@ cleanup_var_run_dir() do # Clean stale sockets if [ -S "$x" ]; then - if type fuser >/dev/null 2>&1; then + if command -v fuser >/dev/null 2>&1; then fuser "$x" >/dev/null 2>&1 || rm -- "$x" else rm -- "$x" diff --git a/init.d/hostid.in b/init.d/hostid.in index e98ff91..ce5574b 100644 --- a/init.d/hostid.in +++ b/init.d/hostid.in @@ -40,7 +40,7 @@ reset() { local uuid= x="[0-9a-f]" y="$x$x$x$x" - if type kenv >/dev/null 2>&1; then + if command -v kenv >/dev/null 2>&1; then uuid=$(kenv smbios.system.uuid 2>/dev/null) fi case "$uuid" in diff --git a/init.d/local.in b/init.d/local.in index fb2f9b1..e82d3cc 100644 --- a/init.d/local.in +++ b/init.d/local.in @@ -19,7 +19,7 @@ start() [ -x "$file" ] && "$file" done - if type local_start >/dev/null 2>&1; then + if command -v local_start >/dev/null 2>&1; then ewarn "@SYSCONFDIR@/conf.d/local should be removed." ewarn "Please move the code from the local_start function" ewarn "to scripts with an .start extension" @@ -39,7 +39,7 @@ stop() [ -x "$file" ] && "$file" done - if type local_start >/dev/null 2>&1; then + if command -v local_stop >/dev/null 2>&1; then ewarn "@SYSCONFDIR@/conf.d/local should be removed." ewarn "Please move the code from the local_stop function" ewarn "to scripts with an .stop extension" diff --git a/init.d/loopback.in b/init.d/loopback.in index 0139b56..6267ec4 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -13,7 +13,7 @@ start() { if [ "$RC_UNAME" = Linux ]; then ebegin "Bringing up network interface lo" - if type ip > /dev/null 2>&1; then + if command -v ip > /dev/null 2>&1; then ip addr add 127.0.0.1/8 dev lo brd + scope host ip route add 127.0.0.0/8 dev lo scope host ip link set lo up diff --git a/init.d/pf.in b/init.d/pf.in index aed6539..a8b301d 100644 --- a/init.d/pf.in +++ b/init.d/pf.in @@ -17,7 +17,7 @@ depend() { start() { ebegin "Starting $name" - if type kldload >/dev/null 2>&1; then + if command -v kldload >/dev/null 2>&1; then kldload pf 2>/dev/null fi pfctl -q -F all |