|
Line
Link Here
|
| 0 |
-- /etc/init.d/localmount |
0 |
++ /etc/init.d/localmount |
|
Lines 23-29
Link Here
|
| 23 |
if [ "$RC_UNAME" = Linux ]; then |
23 |
if [ "$RC_UNAME" = Linux ]; then |
| 24 |
no_netdev="-O no_netdev" |
24 |
no_netdev="-O no_netdev" |
| 25 |
if mountinfo -q /usr; then |
25 |
if mountinfo -q /usr; then |
| 26 |
touch $RC_SVCDIR/usr_premounted |
26 |
touch "$RC_SVCDIR"/usr_premounted |
| 27 |
fi |
27 |
fi |
| 28 |
fi |
28 |
fi |
| 29 |
ebegin "Mounting local filesystems" |
29 |
ebegin "Mounting local filesystems" |
|
Lines 40-46
Link Here
|
| 40 |
# We never unmount / or /dev or $RC_SVCDIR |
40 |
# We never unmount / or /dev or $RC_SVCDIR |
| 41 |
|
41 |
|
| 42 |
# Bug 381783 |
42 |
# Bug 381783 |
| 43 |
local rc_svcdir=$(echo $RC_SVCDIR | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g') |
43 |
local rc_svcdir=$(printf '%s\n' "$RC_SVCDIR" | sed 's:/lib\(32\|64\)\?/:/lib(32|64)?/:g') |
| 44 |
|
44 |
|
| 45 |
local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}" |
45 |
local x= no_umounts_r="/|/dev|/dev/.*|${rc_svcdir}" |
| 46 |
no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec" |
46 |
no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib(32|64)?|/libexec" |
|
Lines 52-58
Link Here
|
| 52 |
|
52 |
|
| 53 |
if [ "$RC_UNAME" = Linux ]; then |
53 |
if [ "$RC_UNAME" = Linux ]; then |
| 54 |
no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" |
54 |
no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" |
| 55 |
if [ -e $rc_svcdir/usr_premounted ]; then |
55 |
if [ -e "$rc_svcdir"/usr_premounted ]; then |
| 56 |
no_umounts_r="$no_umounts_r|/usr" |
56 |
no_umounts_r="$no_umounts_r|/usr" |
| 57 |
fi |
57 |
fi |
| 58 |
fi |
58 |
fi |
