Skip to content

Fix makemysql username check #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skybound0 wants to merge 2 commits into from
+3 −3
Closed

Fix makemysql username check #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac2322
change username retrieval to use ORIGINAL_USER env var
skybound0 Apr 29, 2026
478f84a
add ORIGINAL_USER env variable pass
skybound0 Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion makeservices/makemysql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ done
# makemysql-real will output the new password ONLY on the
# last line. The --quiet will also make sure it only output the password...

if ! PASS=$(sudo -u mysql /run/current-system/sw/bin/makemysql-real --quiet) ; then
if ! PASS=$(sudo -u mysql ORIGINAL_USER=$USER /run/current-system/sw/bin/makemysql-real --quiet) ; then
echo 'makemysql-real did not exit properly.'
echo 'Run "sudo -u mysql /run/current-system/sw/bin/makemysql-real" for a more verbose output.'
echo 'Additionally, you may contact staff members for help. This script will stop.'
Expand Down
4 changes: 2 additions & 2 deletions makeservices/makemysql-real
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ def main():
# Without this quiet below will be local variable
global quiet
try:
username = pwd.getpwuid(os.getuid()).pw_name
username = os.environ.get('ORIGINAL_USER')

if not username:
raise RuntimeError('Unable to read pwd.getpwuid(os.getuid()).pw_name.')
raise RuntimeError('Unable to read ORIGINAL_USER.')

# Read config file.
mysql_host, mysql_root_pw = read_config()
Expand Down