Skip to content

Commit 0196348

Browse files
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents ac8a430 + f437f70 commit 0196348

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

bin/v-list-sys-services

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,7 @@ if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then
160160
for db in ${DB_SYSTEM//,/ }; do
161161
service="$db"
162162
if [ "$service" == 'mysql' ]; then
163-
if [ ! -e "/etc/init.d/$service" ]; then
164-
service='mysqld'
165-
fi
166-
if [ ! -e "/etc/redhat-release" ]; then
167-
db_proc_name='mysqld'
168-
fi
163+
db_proc_name='mysqld'
169164
fi
170165
if [ "$service" == 'pgsql' ]; then
171166
service='postgresql'

bin/v-update-sys-ip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ is_object_valid 'user' 'USER' "$user" "$user"
3636
#----------------------------------------------------------#
3737

3838
# Get list of ip addresses
39-
ip_list=$(/sbin/ip addr |grep "inet "|grep -v "host lo" |awk '{print $2}')
39+
ip_list=$(/sbin/ip addr|grep 'inet '|grep global|awk '{print $2}')
4040
ip_list=$(echo "$ip_list"|cut -f 1 -d /)
4141
ip_num=$(echo "$ip_list" | wc -l)
4242

0 commit comments

Comments
 (0)