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

fix: fix handling of resolv.conf file #226

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Conversation

KwadFan
Copy link
Contributor

@KwadFan KwadFan commented Aug 6, 2024

Includes changes if resolv.conf is a symbolic link

Mostly affected are armbian based images.

If you want to go through whole logs of build please see:

https://github.com/KwadFan/MainsailOS-dev/actions/runs/10264062537

As earlier said on discord:

What it does:

  1. Checking if resolv.conf is a symlink, if yes store target location in a temporary file on /
  2. Altering resolv.conf, based on setup either your desired default or based on BASE_USE_ALT_DNS
  3. After all desired modules, running end_chroot and restore either link or backuped resolv.conf(depending if temporary file exist)

I think this is less invasive as PR #224
Regards Kwad

Includes changes if resolv.conf is a symbolic link

Mostly affected are armbian based images

Signed-off-by: Stephan Wendel <me@stephanwe.de>
KwadFan added a commit to KwadFan/MainsailOS-dev that referenced this pull request Aug 6, 2024
This run is to proof function of guysoft/CustomPiOS#226

Signed-off-by: Stephan Wendel <me@stephanwe.de>
@guysoft
Copy link
Owner

guysoft commented Aug 6, 2024

Ok looks good - did you test it?

@guysoft
Copy link
Owner

guysoft commented Aug 18, 2024

@KwadFan Is this ready to be merged?

@KwadFan
Copy link
Contributor Author

KwadFan commented Aug 18, 2024

@KwadFan Is this ready to be merged?

You wanted it to test, so, did you test?
From my side, we are in LGTM state ;)

@guysoft
Copy link
Owner

guysoft commented Aug 18, 2024

Ah, yes I did, will do when I have time.

@guysoft
Copy link
Owner

guysoft commented Aug 23, 2024

Not getting to it, people are reporting that its needed, merging

@guysoft guysoft merged commit 4526f28 into guysoft:devel Aug 23, 2024
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