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 () {
1212 local section=$1
1313 local option=$2
1414 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 )
1616 [ -z " $ret " ] && ret=$default
1717 echo $ret
1818}
Original file line number Diff line number Diff line change @@ -626,7 +626,7 @@ rm -r $(readlink var) var
626626 -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
627627
628628%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 )
630630/bin/chmod 0755 "$datadir"
631631/bin/touch /var/log/mysqld.log
632632%if 0%{?systemd}
Original file line number Diff line number Diff line change 1010
1111install_db () {
1212 # 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 )
1414
1515 # Restore log, dir, perms and SELinux contexts
1616 [ -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
489489 -c "MySQL Server" -u 60 mysql >/dev/null 2>&1 || :
490490
491491%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 )
493493/bin/chmod 0755 "$datadir"
494494/bin/touch /var/log/mysql/mysqld.log
495495%if 0%{?systemd}
You can’t perform that action at this time.
0 commit comments