File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ get_option () {
12
12
local section=$1
13
13
local option=$2
14
14
local default=$3
15
- ret=$( /usr/bin/my_print_defaults $section | grep ' ^--' ${option} ' =' | cut -d= -f2-)
15
+ ret=$( /usr/bin/my_print_defaults $section | grep ' ^--' ${option} ' =' | cut -d= -f2- | tail -n 1 )
16
16
[ -z " $ret " ] && ret=$default
17
17
echo $ret
18
18
}
Original file line number Diff line number Diff line change @@ -626,7 +626,7 @@ rm -r $(readlink var) var
626
626
-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
627
627
628
628
%post server
629
- datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
629
+ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1 )
630
630
/bin/chmod 0755 "$datadir"
631
631
/bin/touch /var/log/mysqld.log
632
632
%if 0%{?systemd}
Original file line number Diff line number Diff line change 10
10
11
11
install_db () {
12
12
# Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
13
- datadir=$( /usr/bin/my_print_defaults server mysqld | grep ' ^--datadir=' | sed -n ' s/--datadir=//p' )
13
+ datadir=$( /usr/bin/my_print_defaults server mysqld | grep ' ^--datadir=' | sed -n ' s/--datadir=//p' | tail -n 1 )
14
14
15
15
# Restore log, dir, perms and SELinux contexts
16
16
[ -d " $datadir " ] || install -d -m 0755 -omysql -gmysql " $datadir " || exit 1
Original file line number Diff line number Diff line change @@ -489,7 +489,7 @@ rm -r $(readlink var) var
489
489
-c "MySQL Server" -u 60 mysql >/dev/null 2>&1 || :
490
490
491
491
%post server
492
- datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
492
+ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1 )
493
493
/bin/chmod 0755 "$datadir"
494
494
/bin/touch /var/log/mysql/mysqld.log
495
495
%if 0%{?systemd}
You can’t perform that action at this time.
0 commit comments