Skip to content

Commit adcd339

Browse files
committed
Bug#24688682 PREFER COREUTILS INSTALL OVER CHMOD/CHOWN
1 parent b3004d1 commit adcd339

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

packaging/deb-in/extra/mysql-systemd-start

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ sanity () {
6565

6666
if [ ! "$(ls -A ${MYSQLDATA}/mysql)" ];
6767
then
68-
SQL=$(mktemp --tmpdir=/var/lib/mysql-files/)
69-
touch ${SQL}
70-
chmod 600 ${SQL}
71-
chown mysql:mysql ${SQL}
72-
68+
SQL=$(mktemp -u ${MYSQLFILES}/XXXXXXXXXX)
69+
install /dev/null -m0600 -omysql -gmysql "${SQL}"
7370
cat << EOF > ${SQL}
7471
USE mysql;
7572
INSTALL PLUGIN auth_socket SONAME 'auth_socket.so';
@@ -91,9 +88,7 @@ EOF
9188
mkdir ${MYSQLLOG}
9289
chown mysql:adm ${MYSQLLOG}
9390
chmod 750 ${MYSQLLOG}
94-
touch ${MYSQLLOG}/error.log
95-
chmod 640 ${MYSQLLOG}/error.log
96-
chown mysql:adm ${MYSQLLOG}/error.log
91+
install /dev/null -m0640 -omysql -gadm ${MYSQLLOG}/error.log
9792
fi
9893

9994
@DEB_INIT_APPARMOR@

packaging/deb-in/mysql-packagesource-server.mysql.init.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ case "$1" in
174174
mkdir ${MYSQLLOG}
175175
chown mysql:adm ${MYSQLLOG}
176176
chmod 750 ${MYSQLLOG}
177-
touch ${MYSQLLOG}/error.log
178-
chmod 640 ${MYSQLLOG}/error.log
179-
chown mysql:adm ${MYSQLLOG}/error.log
177+
install /dev/null -m0640 -omysql -gadm ${MYSQLLOG}/error.log
180178
fi
181179

182180
if [ ! -d "${MYSQLRUN}" -a ! -L "${MYSQLRUN}" ];

packaging/deb-in/mysql-packagesource-server.postinst.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ case "$1" in
7979
db_get mysql-@DEB_PRODUCTNAME@-server/root-pass && PASSWD=${RET}
8080
db_set mysql-@DEB_PRODUCTNAME@-server/root-pass ""
8181
db_set mysql-@DEB_PRODUCTNAME@-server/re-root-pass ""
82-
SQL=$(mktemp --tmpdir=/var/lib/mysql-files/)
83-
touch ${SQL}
84-
chmod 600 ${SQL}
85-
chown mysql:mysql ${SQL}
82+
SQL=$(mktemp -u ${MYSQLFILES}/XXXXXXXXXX)
83+
install /dev/null -m0600 -omysql -gmysql "${SQL}"
8684
if [ ! -z "${PASSWD}" ];
8785
then
8886
PASSWD=$(printf %q "${PASSWD}")

0 commit comments

Comments
 (0)