dracut-functions: do not try to clear logfile, if not writable
parent
533d7dc4ab
commit
59580f28a1
|
@ -29,8 +29,10 @@ if ! [[ $dracutlogfile ]]; then
|
||||||
[[ $dsrc = /usr/share/dracut ]] && \
|
[[ $dsrc = /usr/share/dracut ]] && \
|
||||||
dracutlogfile=/var/log/dracut.log || \
|
dracutlogfile=/var/log/dracut.log || \
|
||||||
dracutlogfile=/tmp/dracut.log
|
dracutlogfile=/tmp/dracut.log
|
||||||
[[ -w $dracutlogfile ]] || dracutlogfile=/tmp/dracut.log
|
# [[ -w $dracutlogfile ]] || dracutlogfile=/tmp/dracut.log
|
||||||
>"$dracutlogfile"
|
if [[ -w $dracutlogfile ]]; then
|
||||||
|
>"$dracutlogfile"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dwarning() {
|
dwarning() {
|
||||||
|
@ -114,11 +116,11 @@ check_vol_slaves() {
|
||||||
for i in /dev/mapper/*; do
|
for i in /dev/mapper/*; do
|
||||||
lv=$(get_numeric_dev $i)
|
lv=$(get_numeric_dev $i)
|
||||||
if [[ $lv = $2 ]]; then
|
if [[ $lv = $2 ]]; then
|
||||||
vg=$(lvs --noheadings -o vg_name $i 2>/dev/null)
|
vg=$(lvm lvs --noheadings -o vg_name $i 2>/dev/null)
|
||||||
# strip space
|
# strip space
|
||||||
vg=$(echo $vg)
|
vg=$(echo $vg)
|
||||||
if [[ $vg ]]; then
|
if [[ $vg ]]; then
|
||||||
for pv in $(vgs --noheadings -o pv_name "$vg" 2>/dev/null); \
|
for pv in $(lvm vgs --noheadings -o pv_name "$vg" 2>/dev/null); \
|
||||||
do
|
do
|
||||||
check_block_and_slaves $1 $(get_numeric_dev $pv) \
|
check_block_and_slaves $1 $(get_numeric_dev $pv) \
|
||||||
&& return 0
|
&& return 0
|
||||||
|
|
Loading…
Reference in New Issue