From 5dad6a777ea90fdb44360f771bdfd97e7f6f0422 Mon Sep 17 00:00:00 2001 From: fbt Date: Tue, 1 Sep 2015 13:02:18 +0300 Subject: [PATCH] default IFS, add tmp --- rc.conf | 16 +++++++++------- rc.in | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/rc.conf b/rc.conf index 802b334..a54ac8d 100644 --- a/rc.conf +++ b/rc.conf @@ -22,14 +22,16 @@ ctrlaltdel soft # Virtual filesystems cfg_mounts=( - 'proc:proc:/proc' - 'run:tmpfs:/run' - 'sys:sysfs:/sys' + 'run tmpfs /run' + 'tmp tmpfs /tmp' - 'dev:devtmpfs:/dev' - 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' - 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' - 'shm:tmpfs:/dev/shm:defaults,mode=0777' + 'proc proc /proc' + 'sys sysfs /sys' + + 'dev devtmpfs /dev' + 'pts devpts /dev/pts noexec,nosuid,gid=5,mode=0620' + 'mqueue mqueue /dev/mqueue noexec,nosuid,nodev' + 'shm tmpfs /dev/shm defaults,mode=0777' ) # Some temporary directories and files diff --git a/rc.in b/rc.in index 0050fe6..c0e2fe7 100644 --- a/rc.in +++ b/rc.in @@ -28,7 +28,7 @@ rc.tmpfiles() { rc.mount() { for fs in "${cfg_mounts[@]}"; do - echo "$fs" | while IFS=':' read device fs_type mountpoint mount_options; do + echo "$fs" | while read device fs_type mountpoint mount_options; do [[ "$mount_options" ]] || { mount_options='defaults'; }