Skip to content
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.

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

Update SSH_ROOT_PASSWORD in example.conf files #3088

Merged
merged 10 commits into from Nov 22, 2023

Conversation

jsmeix
Copy link
Member

@jsmeix jsmeix commented Nov 21, 2023

In example.conf files use

{ SSH_ROOT_PASSWORD='...' ; } 2>>/dev/$SECRET_OUTPUT_DEV

(i.e. with SECRET_OUTPUT_DEV)

In example.conf files use
{ SSH_ROOT_PASSWORD='...' ; } 2>>/dev/$SECRET_OUTPUT_DEV
(i.e. with SECRET_OUTPUT_DEV)
@jsmeix jsmeix added enhancement Adaptions and new features documentation labels Nov 21, 2023
@jsmeix jsmeix added this to the ReaR v2.8 milestone Nov 21, 2023
@jsmeix jsmeix self-assigned this Nov 21, 2023
@jsmeix jsmeix requested a review from a team November 21, 2023 12:50
@jsmeix
Copy link
Member Author

jsmeix commented Nov 21, 2023

@rear/contributors
unless there are objections
I would like to merge it tomorrow afternoon.

Typo fix "whithout" -> "without"
Typo fix "whithout" -> "without"
Typo fix "whithout" -> "without"
Typo fix "whithout" -> "without"
Typo fix "whithout" -> "without"
@jsmeix
Copy link
Member Author

jsmeix commented Nov 22, 2023

@pcahyna
thank you for your sharp-sighted review!

Copy link
Member

@pcahyna pcahyna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsmeix you are welcome! I suggest to squash your new commits with the respective original commits to reduce the number of commits in the history before merging.

@jsmeix
Copy link
Member Author

jsmeix commented Nov 22, 2023

@pcahyna
ah - yes - thank you for the hint about squashing commits.

I like to be able to see the history how things were developed
(and the overall result is visible in the merge commit)
so normally I don't like squashing commits so that
I am not used to think about squashing commits.

But in this case it would be better to squash them.

@jsmeix jsmeix merged commit 7c5c9bc into master Nov 22, 2023
21 checks passed
@jsmeix jsmeix deleted the jsmeix-SSH_ROOT_PASSWORD-examples branch November 22, 2023 16:07
@jsmeix
Copy link
Member Author

jsmeix commented Nov 22, 2023

This was my very first try to use "Squash and merge"
in the GitHub web frontend - let's see what the result is...

@jsmeix
Copy link
Member Author

jsmeix commented Nov 22, 2023

...ah!
7c5c9bc
shows me that I also have to manually squash the merge commit message.
Next time I (hopefully) remember that and do better.
...
And I did better:
fec92e2

@pcahyna
Copy link
Member

pcahyna commented Nov 23, 2023

...ah! 7c5c9bc shows me that I also have to manually squash the merge commit message. Next time I (hopefully) remember that and do better.

@jsmeix I usually squash only commits that I need manually using git rebase --interactive --autosquash and I force push. This allows me to squash only commits that I want to have squashed and adjust the commit messages. For example, in this case, I would have squashed both commits Update SLE11-SLE12-SAP-HANA-UEFI-example.conf together, both Update SLE12-SP1-btrfs-example.conf commits together etc. but maybe not all commits together.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants