From b5506431d14514b08f6b6497421dd062d2fe3bb6 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Fri, 26 Apr 2013 12:15:40 +0000 Subject: [PATCH] simplify vfs mounts --- scripts/functions.rc | 3 +-- scripts/rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/functions.rc b/scripts/functions.rc index 031eaa1..fb2b6d9 100644 --- a/scripts/functions.rc +++ b/scripts/functions.rc @@ -19,6 +19,5 @@ status_fail() { } status_check() { - local r=$1 - test ${r:=$?} -eq 0 && status_ok || status_fail + test $? -eq 0 && status_ok || status_fail } diff --git a/scripts/rc.sysinit b/scripts/rc.sysinit index 52ddc70..ae87e9d 100644 --- a/scripts/rc.sysinit +++ b/scripts/rc.sysinit @@ -27,7 +27,7 @@ mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev mountpoint -q /var/run || mount -t tmpfs run /var/run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid -mkdir -p /dev/{pts,shm} +mkdir /dev/pts /dev/shm mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev # and make sure they all passed -- 2.40.0