diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-04-04 13:01:29 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-04-04 13:04:35 +0200 |
| commit | 0236a947d09d0c273125eb62deb918010d8b4fd7 (patch) | |
| tree | 330ee82322141aec836f330b6b5de28b8d958ed0 /nixos/modules/system/boot/stage-2-init.sh | |
| parent | b39afd41db345583768bfd7a825404d07b174dbb (diff) | |
| download | nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar.gz nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar.bz2 nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar.lz nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar.xz nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.tar.zst nixpkgs-0236a947d09d0c273125eb62deb918010d8b4fd7.zip | |
mkdir -> install -d
Fixes #38421.
Diffstat (limited to 'nixos/modules/system/boot/stage-2-init.sh')
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 9d2c580d62a..b83012dfda7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -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 |