Skip to content

Commit cf4045c

Browse files
2nd umount -l
1 parent 7b8b68c commit cf4045c

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

zram-config

+16-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ mergeOverlay () {
101101
echo "overlay --lowerdir=$ZDIR$BIND_DIR --upperdir=$ZDIR$ZRAM_DEV/upper" >>${ZLOG}
102102
cd /usr/local/lib/zram-config/
103103
./overlay merge -l "${ZDIR}${BIND_DIR}" -u "${ZDIR}${ZRAM_DEV}/upper" >>${ZLOG} 2>&1 || return 1
104-
sh *.sh >>${ZLOG} 2>&1 || return 1
104+
sh -x *.sh >>${ZLOG} 2>&1 || return 1
105105
rm -v *.sh >>${ZLOG} 2>&1 || return 1
106106

107107
}
@@ -117,7 +117,14 @@ removeZlog () {
117117
if [ ! -z "$TARGET_DIR" ]
118118
then
119119
invoke-rc.d rsyslog stop >>${ZLOG} 2>&1 || return 1
120-
umount --verbose ${TARGET_DIR}/ >>${ZLOG} 2>&1 || return 1
120+
if umount --verbose ${TARGET_DIR}/
121+
then
122+
echo "umount ${TARGET_DIR}/" >>${ZLOG}
123+
else
124+
sleep .1
125+
invoke-rc.d rsyslog stop
126+
umount --verbose -l ${TARGET_DIR}/ >>${ZLOG} 2>&1 || return 1
127+
fi
121128
else
122129
return 1
123130
fi
@@ -150,7 +157,13 @@ removeZdir () {
150157
DEV_NUM=$(echo "$ZRAM_DEV" | tr -dc '0-9')
151158
if [ ! -z "$TARGET_DIR" ]
152159
then
153-
umount --verbose ${TARGET_DIR}/ >>${ZLOG} 2>&1 || return 1
160+
if umount --verbose ${TARGET_DIR}/
161+
then
162+
echo "umount ${TARGET_DIR}/" >>${ZLOG}
163+
else
164+
sleep .1
165+
umount --verbose -l ${TARGET_DIR}/ >>${ZLOG} 2>&1 || return 1
166+
fi
154167
else
155168
return 1
156169
fi

0 commit comments

Comments
 (0)