Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e88f28965a7d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc0caac098b5
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 5, 2018

  1. modprobe activation: Order after specialfs 

    It requires the existence of /proc.
    @edolstra
    edolstra committed Feb 5, 2018
    Copy the full SHA
    1346923 View commit details

  2. nixos-enter: Don't mount special filesystems 

    The activation script already does this.
    @edolstra
    edolstra committed Feb 5, 2018
    Copy the full SHA
    f9e64db View commit details

  3. Move creation of /root to the activation script 

    ...so it appears in a new installation before rebooting the system.
    @edolstra
    edolstra committed Feb 5, 2018
    Copy the full SHA
    cc0caac View commit details
2 changes: 2 additions & 0 deletions nixos/modules/config/users-groups.nix
View file
Original file line number Diff line number Diff line change
@@ -533,6 +533,8 @@ in {
-I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
-I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \
${./update-users-groups.pl} ${spec}
install -m 0700 -d /root
'';

# for backwards compatibility
6 changes: 1 addition & 5 deletions nixos/modules/installer/tools/nixos-enter.sh
View file
Original file line number Diff line number Diff line change
@@ -45,12 +45,8 @@ while [ "$#" -gt 0 ]; do
esac
done

# Set up some bind mounts we'll want regardless of chroot or not
mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" "$mountPoint/run"
mkdir -m 0755 -p "$mountPoint/dev"
mount --rbind /dev "$mountPoint/dev"
mount -t proc none "$mountPoint/proc"
mount -t sysfs none "$mountPoint/sys"
mount -t tmpfs none "$mountPoint/run"

# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/modprobe.nix
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ with lib;

environment.systemPackages = [ pkgs.kmod ];

system.activationScripts.modprobe =
system.activationScripts.modprobe = stringAfter ["specialfs"]
''
# Allow the kernel to find our wrapped modprobe (which searches
# in the right location in the Nix store for kernel modules).
1 change: 0 additions & 1 deletion nixos/modules/system/boot/stage-2-init.sh
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@ ln -s /proc/mounts /etc/mtab
mkdir -m 01777 -p /tmp
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


# Miscellaneous boot time cleanup.