Skip to content

Commit 9bbdd92

Browse files
add verbose and lower rsyslog restart
1 parent 98989b7 commit 9bbdd92

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

zram-config

+8-8
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ createZdir () {
3636
mkdir -p /opt/zram$RAM_DEV 2>&1 | tee -a $ZLOG
3737
mount --verbose --types ext4 -o nosuid,noexec,nodev /dev/zram$RAM_DEV /opt/zram$RAM_DEV/ 2>&1 | tee -a $ZLOG
3838
mkdir -p /opt/zram$RAM_DEV/upper /opt/zram$RAM_DEV/workdir $ZRAM_DIR 2>&1 | tee -a $ZLOG
39-
mount -t overlay -o lowerdir=$BIND_DIR,upperdir=/opt/zram$RAM_DEV/upper,workdir=/opt/zram$RAM_DEV/workdir overlay $ZRAM_DIR 2>&1 | tee -a $ZLOG
39+
mount --verbose --types overlay -o lowerdir=$BIND_DIR,upperdir=/opt/zram$RAM_DEV/upper,workdir=/opt/zram$RAM_DEV/workdir overlay $ZRAM_DIR 2>&1 | tee -a $ZLOG
4040
#syncFromDisk
4141
else
4242
echo "No mount dir in ztab" | tee -a $ZLOG
@@ -125,21 +125,21 @@ removeZlog () {
125125
if [ ! -z "$ZRAM_DIR" ]
126126
then
127127
invoke-rc.d rsyslog stop 2>&1 | tee -a $ZLOG
128-
umount $ZRAM_DIR/ 2>&1 | tee -a $ZLOG
129-
umount /opt/$ZRAM_DEV 2>&1 | tee -a $ZLOG
128+
umount --verbose $ZRAM_DIR/ 2>&1 | tee -a $ZLOG
129+
umount --verbose /opt/$ZRAM_DEV 2>&1 | tee -a $ZLOG
130130
else
131131
return 1
132132
fi
133133
if [ ! -z "$BIND_DIR" ]
134134
then
135-
umount $BIND_DIR/ 2>&1 | tee -a $ZLOG
135+
umount --verbose $BIND_DIR/ 2>&1 | tee -a $ZLOG
136136
rm -rf $BIND_DIR 2>&1 | tee -a $ZLOG
137-
invoke-rc.d rsyslog restart 2>&1 | tee -a $ZLOG
138-
journalctl --flush 2>&1 | tee -a $ZLOG
139137
else
140138
return 1
141139
fi
142140
echo "$DEV_NUM" > /sys/class/zram-control/hot_remove 2>&1 | tee -a $ZLOG
141+
invoke-rc.d rsyslog restart 2>&1 | tee -a $ZLOG
142+
journalctl --flush 2>&1 | tee -a $ZLOG
143143
echo "$ZRAM_DEV removed" 2>&1 | tee -a $ZLOG
144144
}
145145

@@ -149,13 +149,13 @@ removeZdir () {
149149
DEV_NUM=$(echo "$ZRAM_DEV" | tr -dc '0-9')
150150
if [ ! -z "$ZRAM_DIR" ]
151151
then
152-
umount $ZRAM_DIR/ 2>&1 | tee -a $ZLOG
152+
umount --verbose $ZRAM_DIR/ 2>&1 | tee -a $ZLOG
153153
else
154154
return 1
155155
fi
156156
if [ ! -z "$BIND_DIR" ]
157157
then
158-
umount $BIND_DIR/ 2>&1 | tee -a $ZLOG
158+
umount --verbose $BIND_DIR/ 2>&1 | tee -a $ZLOG
159159
rm -rf $BIND_DIR 2>&1 | tee -a $ZLOG
160160
else
161161
return 1

0 commit comments

Comments
 (0)