public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df

Browse Source
This commit is contained in:
Eelco Dolstra 2014-06-05 13:10:35 +02:00
parent b43421221f
commit 906aa9ccb1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,12 +60,12 @@ touch /etc/fstab # to shut up mount
touch /etc/mtab # to shut up mke2fs touch /etc/mtab # to shut up mke2fs
touch /etc/initrd-release touch /etc/initrd-release
mkdir -p /proc mkdir -p /proc
mount -t proc none /proc mount -t proc proc /proc
mkdir -p /sys mkdir -p /sys
mount -t sysfs none /sys mount -t sysfs sysfs /sys
mount -t devtmpfs -o "size=@devSize@" none /dev mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
mkdir -p /run mkdir -p /run
mount -t tmpfs -o "mode=0755,size=@runSize@" none /run mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
# Process the kernel command line. # Process the kernel command line.

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

@ -36,9 +36,9 @@ mount -n -o remount,rw /
# stage 1, we need to do that here. # stage 1, we need to do that here.
if [ ! -e /proc/1 ]; then if [ ! -e /proc/1 ]; then
mkdir -m 0755 -p /proc mkdir -m 0755 -p /proc
mount -n -t proc none /proc mount -n -t proc proc /proc
mkdir -m 0755 -p /dev mkdir -m 0755 -p /dev
mount -t devtmpfs none /dev mount -t devtmpfs devtmpfs /dev
fi fi
@ -82,9 +82,9 @@ done
# More special file systems, initialise required directories. # More special file systems, initialise required directories.
mkdir -m 0755 /dev/shm mkdir -m 0755 /dev/shm
mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" none /dev/shm mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
mkdir -m 0755 -p /dev/pts mkdir -m 0755 -p /dev/pts
[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default [ -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 01777 -p /tmp
mkdir -m 0755 -p /var /var/log /var/lib /var/db mkdir -m 0755 -p /var /var/log /var/lib /var/db
mkdir -m 0755 -p /nix/var mkdir -m 0755 -p /nix/var
@ -114,7 +114,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
if ! mountpoint -q /run; then if ! mountpoint -q /run; then
rm -rf /run rm -rf /run
mkdir -m 0755 -p /run mkdir -m 0755 -p /run
mount -t tmpfs -o "mode=0755,size=@runSize@" none /run mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
fi fi
# Create a ramfs on /run/keys to hold secrets that shouldn't be # Create a ramfs on /run/keys to hold secrets that shouldn't be
@ -122,7 +122,7 @@ fi
if ! mountpoint -q /run/keys; then if ! mountpoint -q /run/keys; then
rm -rf /run/keys rm -rf /run/keys
mkdir /run/keys mkdir /run/keys
mount -t ramfs none /run/keys mount -t ramfs ramfs /run/keys
chown 0:96 /run/keys chown 0:96 /run/keys
chmod 0750 /run/keys chmod 0750 /run/keys
fi fi
@ -153,7 +153,7 @@ fi
# Create /var/setuid-wrappers as a tmpfs. # Create /var/setuid-wrappers as a tmpfs.
rm -rf /var/setuid-wrappers rm -rf /var/setuid-wrappers
mkdir -m 0755 -p /var/setuid-wrappers mkdir -m 0755 -p /var/setuid-wrappers
mount -t tmpfs -o "mode=0755" none /var/setuid-wrappers mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
# Run the script that performs all configuration activation that does # Run the script that performs all configuration activation that does