File tree 1 file changed +16
-3
lines changed
1 file changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ mergeOverlay () {
101
101
echo " overlay --lowerdir=$ZDIR$BIND_DIR --upperdir=$ZDIR$ZRAM_DEV /upper" >> ${ZLOG}
102
102
cd /usr/local/lib/zram-config/
103
103
./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
105
105
rm -v * .sh >> ${ZLOG} 2>&1 || return 1
106
106
107
107
}
@@ -117,7 +117,14 @@ removeZlog () {
117
117
if [ ! -z " $TARGET_DIR " ]
118
118
then
119
119
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
121
128
else
122
129
return 1
123
130
fi
@@ -150,7 +157,13 @@ removeZdir () {
150
157
DEV_NUM=$( echo " $ZRAM_DEV " | tr -dc ' 0-9' )
151
158
if [ ! -z " $TARGET_DIR " ]
152
159
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
154
167
else
155
168
return 1
156
169
fi
You can’t perform that action at this time.
0 commit comments