From 60d288a877a3671ea5b3483ed7c4612ec897b99a Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 1 Dec 2013 19:25:01 -0600 Subject: remove type command The posix equivalent of the type command is "command -v", so now we use that. Thanks to Jonathan Callen for informing me wrt the fix. --- sh/init-early.sh.Linux.in | 2 +- sh/rc-mount.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sh') diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index 9270e7f9..a4116fc8 100644 --- a/sh/init-early.sh.Linux.in +++ b/sh/init-early.sh.Linux.in @@ -31,7 +31,7 @@ if service_present "$RC_DEFAULTLEVEL" consolefont || service_present "$RC_BOOTLEVEL" consolefont; then printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null if [ -r "$RC_LIBEXECDIR"/console/font ] && \ - type setfont > /dev/null 2>&1; then + command -v setfont > /dev/null 2>&1; then [ -c "$CONSOLE" ] && cons="-C $CONSOLE" setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null fi diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index 454f9f92..cd5d0f78 100644 --- a/sh/rc-mount.sh +++ b/sh/rc-mount.sh @@ -40,7 +40,7 @@ do_unmount() retry=4 # Effectively TERM, sleep 1, TERM, sleep 1, KILL, sleep 1 while ! LC_ALL=C $cmd "$mnt" 2>/dev/null; do - if type fuser >/dev/null 2>&1; then + if command -v fuser >/dev/null 2>&1; then pids="$(timeout -k 10 -s KILL "${rc_fuser_timeout:-60}" \ fuser $f_opts "$mnt" 2>/dev/null)" fi -- cgit v1.2.3