From 59580f28a142c77830333817767d9eefdb750363 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 31 Aug 2009 14:54:13 +0200 Subject: [PATCH] dracut-functions: do not try to clear logfile, if not writable --- dracut-functions | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dracut-functions b/dracut-functions index 7544fc6b..6009ace0 100755 --- a/dracut-functions +++ b/dracut-functions @@ -29,8 +29,10 @@ if ! [[ $dracutlogfile ]]; then [[ $dsrc = /usr/share/dracut ]] && \ dracutlogfile=/var/log/dracut.log || \ dracutlogfile=/tmp/dracut.log - [[ -w $dracutlogfile ]] || dracutlogfile=/tmp/dracut.log - >"$dracutlogfile" +# [[ -w $dracutlogfile ]] || dracutlogfile=/tmp/dracut.log + if [[ -w $dracutlogfile ]]; then + >"$dracutlogfile" + fi fi dwarning() { @@ -114,11 +116,11 @@ check_vol_slaves() { for i in /dev/mapper/*; do lv=$(get_numeric_dev $i) 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 vg=$(echo $vg) 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 check_block_and_slaves $1 $(get_numeric_dev $pv) \ && return 0