fix passwd change via initial openhabian.conf #1983
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Markus Storm <[email protected]>
Signed-off-by: Markus Storm <[email protected]>
ecdye
requested changes
Feb 26, 2025
build-image/first-boot.bash
Outdated
| @@ -70,17 +70,23 @@ if is_raspbian || is_raspios; then | |||
| rm -f "/etc/sudoers.d/010_pi-nopasswd" | |||
| fi | |||
|
|
|||
| echo -n "$(timestamp) [openHABian] Changing default username and password... " | |||
| echo -n "$(timestamp) [openHABian] Changing default username ... " | |||
| # shellcheck disable=SC2154 | |||
| if [[ -v ${userName} ]] || ! id "$defaultUserAndGroup" &> /dev/null || id "$userName" &> /dev/null; then | |||
There was a problem hiding this comment.
OK, so I understand the changes you are making but I think there might be an issue from older versions.
What does the -v flag do? I can't find it in the bash manual, I believe the -v instances should be replaced with -n right?
There was a problem hiding this comment.
right, changed that
build-image/first-boot.bash
Outdated
| echo "OK" | ||
| fi | ||
| echo -n "$(timestamp) [openHABian] Changing default password... " | ||
| # shellcheck disable=SC2154 | ||
| if [[ -v ${userpw} ]]; then |
ecdye
requested changes
Feb 26, 2025
build-image/first-boot.bash
Outdated
| # shellcheck disable=SC2154 | ||
| if [[ -v ${userName} ]] || ! id "$defaultUserAndGroup" &> /dev/null || id "$userName" &> /dev/null; then | ||
| if [[ -n ${userName} ]] || ! id "$defaultUserAndGroup" &> /dev/null || id "$userName" &> /dev/null; then |
There was a problem hiding this comment.
Now that I think about it, I think in this context we should probably be using -Z because we want to check that it's not set, right?
Sorry for the confusion the first time around.
build-image/first-boot.bash
Outdated
| echo "OK" | ||
| fi | ||
| echo -n "$(timestamp) [openHABian] Changing default password... " | ||
| # shellcheck disable=SC2154 | ||
| if [[ -n ${userpw} ]]; then |
Signed-off-by: Markus Storm <[email protected]>
|
right, changed that |
ecdye
approved these changes
Feb 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #1982