diff options
| -rwxr-xr-x | contrib/init.d/rc.archlinux.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.gentoo.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.mandriva.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.redhat.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.slackware.asterisk | 2 | ||||
| -rwxr-xr-x | contrib/init.d/rc.suse.asterisk | 2 | ||||
| -rw-r--r-- | contrib/scripts/safe_asterisk | 2 | ||||
| -rw-r--r-- | main/asterisk.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/contrib/init.d/rc.archlinux.asterisk b/contrib/init.d/rc.archlinux.asterisk index ab6711448..9c840851c 100755 --- a/contrib/init.d/rc.archlinux.asterisk +++ b/contrib/init.d/rc.archlinux.asterisk @@ -33,7 +33,7 @@ case "$1" in if [ -x $DAEMON ]; then # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. - VERSION=`${DAEMON} -rx 'core show version'` + VERSION=`${DAEMON} -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 1 diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index f99aade20..211737fa9 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -66,7 +66,7 @@ case "$1" in start) # Check if Asterisk is already running. If it is, then bug out, because # starting up Asterisk when Asterisk is already running is very bad. - VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}` + VERSION=`${DAEMON} -rx 'core show version' 2>/dev/null || ${TRUE}` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 0 diff --git a/contrib/init.d/rc.gentoo.asterisk b/contrib/init.d/rc.gentoo.asterisk index ef54a0efa..04d1c7aab 100755 --- a/contrib/init.d/rc.gentoo.asterisk +++ b/contrib/init.d/rc.gentoo.asterisk @@ -20,7 +20,7 @@ depend() { start() { # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. - VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'` + VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 1 diff --git a/contrib/init.d/rc.mandriva.asterisk b/contrib/init.d/rc.mandriva.asterisk index 319ce3e4e..e095ccf75 100755 --- a/contrib/init.d/rc.mandriva.asterisk +++ b/contrib/init.d/rc.mandriva.asterisk @@ -135,7 +135,7 @@ case "$1" in start) # Check if Asterisk is already running. If it is, then bug out, because # starting Asterisk when Asterisk is already running is very bad. - VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'` + VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 1 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index 01ab86247..45ea9bccf 100755 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk @@ -71,7 +71,7 @@ RETVAL=0 start() { # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. - VERSION=`${AST_SBIN}/asterisk -rx 'core show version'` + VERSION=`${AST_SBIN}/asterisk -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running." exit 0 diff --git a/contrib/init.d/rc.slackware.asterisk b/contrib/init.d/rc.slackware.asterisk index bbe04b7fa..79c2b927f 100755 --- a/contrib/init.d/rc.slackware.asterisk +++ b/contrib/init.d/rc.slackware.asterisk @@ -24,7 +24,7 @@ asterisk_start() { if [ -x /usr/sbin/asterisk ]; then # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. - VERSION=`/usr/sbin/asterisk -rx 'core show version'` + VERSION=`/usr/sbin/asterisk -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 1 diff --git a/contrib/init.d/rc.suse.asterisk b/contrib/init.d/rc.suse.asterisk index ee70eea7a..16530968e 100755 --- a/contrib/init.d/rc.suse.asterisk +++ b/contrib/init.d/rc.suse.asterisk @@ -78,7 +78,7 @@ start() { # Check if Asterisk is already running. If it is, then bug out, because # starting Asterisk when Asterisk is already running is very bad. - VERSION=`/usr/sbin/asterisk -rx 'core show version'` + VERSION=`/usr/sbin/asterisk -rx 'core show version' 2>/dev/null` if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then echo "Asterisk is already running. $0 will exit now." exit 1 diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index c1f058aa0..2e661b476 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -49,7 +49,7 @@ message() { # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. -VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version'` +VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version' 2>/dev/null` if test "`echo $VERSION | cut -c 1-8`" = "Asterisk" ; then message "Asterisk is already running. $0 will exit now." exit 1 diff --git a/main/asterisk.c b/main/asterisk.c index 380a3d248..67d09ff66 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3560,7 +3560,7 @@ static void env_init(void) static void print_intro_message(const char *runuser, const char *rungroup) { - if (ast_opt_console || option_verbose) { + if (ast_opt_console || option_verbose || (ast_opt_remote && !ast_opt_exec)) { if (ast_register_verbose(console_verboser)) { fprintf(stderr, "Unable to register console verboser?\n"); return; |