Use @HOSTNAME@ instead of hardcoded /bin/hostname. (621c7db2) · Commits · Software / OSDI20 Artifacts / mariadb

scripts/mysql_install_db.sh

+2 −4

Original line number	Diff line number	Diff line
		@@ -77,9 +77,7 @@ then
		fi
		fi

		# On IRIX hostname is in /usr/bsd so add this to the path
		PATH=$PATH:/usr/bsd
		hostname=`hostname` # Install this too in the user table
		hostname=`@HOSTNAME@` # Install this too in the user table

		# Check if hostname is valid
		if test "$IN_RPM" -eq 0 -a $force -eq 0
		@@ -287,7 +285,7 @@ then
		echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
		echo "This is done with:"
		echo "$bindir/mysqladmin -u root -p password 'new-password'"
		echo "$bindir/mysqladmin -u root -h `hostname` -p password 'new-password'"
		echo "$bindir/mysqladmin -u root -h $hostname -p password 'new-password'"
		echo "See the manual for more instructions."
		#
		# Print message about upgrading unless we have created a new db table.

+5 −4

Original line number	Diff line number	Diff line
		@@ -30,10 +30,11 @@ else
		ledir=/usr/local/mysql/libexec
		fi

		pidfile=$DATADIR/`/bin/hostname`.pid
		log=$DATADIR/`/bin/hostname`.log
		err=$DATADIR/`/bin/hostname`.err
		lockfile=$DATADIR/`/bin/hostname`.lock
		hostname=`@HOSTNAME@`
		pidfile=$DATADIR/$hostname.pid
		log=$DATADIR/$hostname.log
		err=$DATADIR/$hostname.err
		lockfile=$DATADIR/$hostname.lock

		#
		# If there exists an old pid file, check if the demon is already running

+3 −3

Original line number	Diff line number	Diff line
		@@ -56,11 +56,11 @@ else
		ledir=@libexecdir@
		fi

		pid_file=$DATADIR/`/bin/hostname`.pid
		pid_file=$DATADIR/`@HOSTNAME@`.pid
		MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@
		MYSQL_TCP_PORT=@MYSQL_TCP_PORT@
		log=$DATADIR/`/bin/hostname`.log
		err_log=$DATADIR/`/bin/hostname`.err
		log=$DATADIR/`@HOSTNAME@`.log
		err_log=$DATADIR/`@HOSTNAME@`.err
		user=@MYSQLD_USER@

		# Get first arguments from the my.cfg file, groups [mysqld] and [safe_mysqld]