From 99d4b0292e01f4ee87c69fafee71652c84020cb5 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 19 Aug 2014 00:26:22 +0000 Subject: [PATCH] A tiny change, that should impact almost nobody, this is included as 2.2.0, I changed the order that runit/sysvinit are tested for, a test case showed up where runit had been installed as a dependency but was not the init system, so that was wrong output. Moved runit after sysvinit case in tests. --- inxi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index bafe201..56ae949 100755 --- a/inxi +++ b/inxi @@ -5933,11 +5933,6 @@ get_init_data() init_type='launchd' # / launchd/ version.plist /etc/launchd.conf # init_version=$( get_program_version 'Launchd' '^Launchd' '4' ) - # missing data: - # http://smarden.org/runit/sv.8.html - elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then - init_type='runit' # lower case - # no data on version yet elif [[ -f /etc/inittab ]];then init_type='SysVinit' if type -p strings &>/dev/null;then @@ -5946,6 +5941,11 @@ get_init_data() if [[ -n $strings_init_version ]];then init_version=$( gawk '{print $2}' <<< "$strings_init_version" ) fi + # missing data: + # http://smarden.org/runit/sv.8.html + elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then + init_type='runit' # lower case + # no data on version yet # freebsd at least elif [[ -f /etc/ttys ]];then init_type='init (bsd)'