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

Stage-2 cleanup #24645

Merged
merged 5 commits into from Apr 8, 2017
Merged

Stage-2 cleanup #24645

merged 5 commits into from Apr 8, 2017

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Apr 5, 2017

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@Mic92, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @fpletz and @rickynils to be potential reviewers.

@@ -71,22 +71,17 @@ fi


# Provide a /etc/mtab.
mkdir -m 0755 -p /etc
test -e /etc/fstab || touch /etc/fstab # to shut up mount
test -e /etc/fstab || install -D /dev/null /etc/fstab # to shut up mount
Copy link
Contributor

Choose a reason for hiding this comment

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

this is bad IMO. Better be explicit in creating /etc, it isn't used only for /etc/fstab

Copy link
Member Author

Choose a reason for hiding this comment

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

reverted.

mkdir -m 0755 -p /etc/nixos
mkdir -m 0755 -p /var{,log,lib,db} /nix/var /etc/nixos/ \
/run/lock /home /bin # for the /bin/sh symlink
install -m 0700 -d /root
Copy link
Contributor

Choose a reason for hiding this comment

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

any reason of using install over chmod here?

Copy link
Member Author

@Mic92 Mic92 Apr 5, 2017

Choose a reason for hiding this comment

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

because it will both create a directory or chown existing an one.

mkdir -m 0755 -p /etc/nixos
mkdir -m 0755 -p /var{,log,lib,db} /nix/var /etc/nixos/ \
/run/lock /home /bin # for the /bin/sh symlink
install -m 0700 -d /root
Copy link
Member

Choose a reason for hiding this comment

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

Why install instead of mkdir?

Copy link
Member Author

@Mic92 Mic92 Apr 5, 2017

Choose a reason for hiding this comment

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

Because it will both create a directory or chown existing an one.

@Mic92
Copy link
Member Author

Mic92 commented Apr 8, 2017

I would merge this soon, if there are no more concerns.

@Mic92 Mic92 merged commit b4820d4 into NixOS:master Apr 8, 2017
@Mic92 Mic92 deleted the stage-2 branch April 8, 2017 19:52
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.

None yet

4 participants