dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mkdir -> install -d

Browse Source 
Fixes #38421.
This commit is contained in:
Eelco Dolstra 2018-04-04 13:01:29 +02:00
parent b39afd41db
commit 0236a947d0
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/misc/nix-daemon.nix
View File

@ -439,17 +439,18 @@ in
services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers;
# FIXME: use systemd-tmpfiles to create Nix directories.
system.activationScripts.nix = stringAfter [ "etc" "users" ]
''
# Nix initialisation.
mkdir -m 0755 -p \
install -m 0755 -d \
/nix/var/nix/gcroots \
/nix/var/nix/temproots \
/nix/var/nix/userpool \
/nix/var/nix/profiles \
/nix/var/nix/db \
/nix/var/log/nix/drvs
mkdir -m 1777 -p \
install -m 1777 -d \
/nix/var/nix/gcroots/per-user \
/nix/var/nix/profiles/per-user \
/nix/var/nix/gcroots/tmp

8
nixos/modules/system/boot/stage-2-init.sh
View File

@ -43,7 +43,7 @@ if [ ! -e /proc/1 ]; then
local options="$3"
local fsType="$4"
mkdir -m 0755 -p "$mountPoint"
install -m 0755 -d "$mountPoint"
mount -n -t "$fsType" -o "$options" "$device" "$mountPoint"
}
source @earlyMountScript@
@ -71,7 +71,7 @@ fi
# Provide a /etc/mtab.
mkdir -m 0755 -p /etc
install -m 0755 -d /etc
test -e /etc/fstab || touch /etc/fstab # to shut up mount
rm -f /etc/mtab* # not that we care about stale locks
ln -s /proc/mounts /etc/mtab
@ -79,8 +79,8 @@ ln -s /proc/mounts /etc/mtab
# More special file systems, initialise required directories.
[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
mkdir -m 01777 -p /tmp
mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \
install -m 01777 -d /tmp
install -m 0755 -d /var/{log,lib,db} /nix/var /etc/nixos/ \
/run/lock /home /bin # for the /bin/sh symlink