Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos.package
Commits
e36c8e95
Commit
e36c8e95
authored
Aug 01, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-configure: fix --password doesn't work
parent
d06e619c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+3
-5
No files found.
windows/scripts/slapos-include.sh
View file @
e36c8e95
...
...
@@ -233,8 +233,7 @@ slapos_check_and_create_privileged_user()
local
username
=
"
${
1
-slaproot
}
"
local
admingroup
local
dos_var_empty
local
_password
local
password_value
=
"
$2
"
local
_password
=
"
$2
"
local
passwd_has_expiry_flags
local
ret
=
0
local
username_in_admingroup
...
...
@@ -255,9 +254,8 @@ slapos_check_and_create_privileged_user()
dos_var_empty
=
$(
/usr/bin/cygpath
-w
${
LOCALSTATEDIR
}
/empty
)
while
[
"
${
username_in_sam
}
"
!=
"yes"
]
do
if
[
-z
"
${
password_value
}
"
]
if
[
-z
"
${
_password
}
"
]
then
_password
=
"
${
password_value
}
"
csih_inform
"Please enter a password for new user
${
username
}
. Please be sure"
csih_inform
"that this password matches the password rules given on your system."
csih_inform
"Entering no password will exit the configuration."
...
...
@@ -304,7 +302,7 @@ slapos_check_and_create_privileged_user()
else
# ${username} already exists. Use it, and make no changes.
# use passed-in value as first guess
csih_PRIVILEGED_PASSWORD
=
"
${
password_value
}
"
csih_PRIVILEGED_PASSWORD
=
"
${
_password
}
"
fi
# username did NOT previously exist, but has been successfully created.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment