Skip to content

Change userland detection to reflect all item types #49

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

Merged
merged 2 commits into from
Dec 6, 2019

Conversation

MichalMMac
Copy link
Contributor

Possible solution for #48

Code responsible for sleeping is moved from package if/else branch to the function body.
Other userland items such as rootscript should not start before user is logged into the console.

@erikng
Copy link
Member

erikng commented Jun 21, 2019

Assuming you've tested this since and working in your environment? I forgot about this until just now.

@MichalMMac
Copy link
Contributor Author

Yes. I tested ths modification and deployed it.
Take a look at the code please and let me know what you think.

@erikng
Copy link
Member

erikng commented Dec 6, 2019

@MichalMMac please rebase of latest master for python3 and see if you can get this sorted. Sorry about not merging this prior.

@MichalMMac
Copy link
Contributor Author

Done.

@erikng
Copy link
Member

erikng commented Dec 6, 2019

and assumed it's tested?

if stage == 'userland':
if len(iajson['userland']) > 0:
while (getconsoleuser()[0] is None
or getconsoleuser()[0] == u'loginwindow'
Copy link
Member

Choose a reason for hiding this comment

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

don't think we need the unicode force on the string, considering it wasn't needed in my new postinstall

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Missed that during rebase. Thanks. -> fcd2778

@erikng erikng merged commit 78cda3d into macadmins:master Dec 6, 2019
@erikng
Copy link
Member

erikng commented Dec 6, 2019

Merged!

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

Successfully merging this pull request may close these issues.

2 participants