Spark/spark-rc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use an indexed array for mount definitions

Browse Source
This commit is contained in:
Jack L. Frost
2015-08-26 14:44:08 +03:00
parent f93cfc9056
commit c0364011e0
5 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rc.in
View File

@@ -1,15 +1,16 @@
#!/bin/bash
#!@BASH_PATH@
declare -A cfg_mounts
# Default virtual mounts for linux systems
cfg_mounts+=( 'proc:proc:/proc:' )
cfg_mounts+=( 'run:tmpfs:/run:' )
cfg_mounts+=( 'sys:sysfs:/sys:' )
cfg_mounts[proc]='proc:/proc'
cfg_mounts[run]='tmpfs:/run'
cfg_mounts[sys]='sysfs:/sys'
# devfs and its children
cfg_mounts+=( 'dev:devtmpfs:/dev:' )
cfg_mounts+=( 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' )
cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' )
cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
cfg_mounts[dev]='devtmpfs:/dev'
cfg_mounts[pts]='devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620'
cfg_mounts[mqueue]='mqueue:/dev/mqueue:noexec,nosuid,nodev'
cfg_mounts[shm]='tmpfs:/dev/shm:defaults,mode=0777'
# Some temporary directories
cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
@@ -52,8 +53,8 @@ rc.tmpfiles() {
}
rc.mount_misc() {
for m in "${cfg_mounts[@]}"; do
echo "$m" | while IFS=':' read fs fs_type mountpoint mount_options; do
for fs in "${!cfg_mounts[@]}"; do
echo "$fs" | while IFS=':' read fs_type mountpoint mount_options; do
[[ "$mount_options" ]] || { mount_options='defaults'; }
mountpoint -q "$mountpoint" || {