From: Harald Hoyer Date: Mon, 9 Sep 2013 14:52:19 +0000 (+0200) Subject: dracut.sh: reorder things to let "--print-cmdline" work X-Git-Tag: 033~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=540a5169b9df2e2828f17f89ce89cd914270398f;p=thirdparty%2Fdracut.git dracut.sh: reorder things to let "--print-cmdline" work --- diff --git a/dracut.sh b/dracut.sh index 7ad9d1eff..fcc489e43 100755 --- a/dracut.sh +++ b/dracut.sh @@ -821,20 +821,6 @@ if [[ -f $outfile && ! $force && ! $print_cmdline ]]; then exit 1 fi -outdir=${outfile%/*} -[[ $outdir ]] || outdir="/" - -if [[ ! -d "$outdir" ]]; then - dfatal "Can't write to $outdir: Directory $outdir does not exist or is not accessible." - exit 1 -elif [[ ! -w "$outdir" ]]; then - dfatal "No permission to write to $outdir." - exit 1 -elif [[ -f "$outfile" && ! -w "$outfile" ]]; then - dfatal "No permission to write $outfile." - exit 1 -fi - # Need to be able to have non-root users read stuff (rpcbind etc) chmod 755 "$initdir" @@ -1025,6 +1011,20 @@ if [[ $print_cmdline ]]; then exit 0 fi +outdir=${outfile%/*} +[[ $outdir ]] || outdir="/" + +if [[ ! -d "$outdir" ]]; then + dfatal "Can't write to $outdir: Directory $outdir does not exist or is not accessible." + exit 1 +elif [[ ! -w "$outdir" ]]; then + dfatal "No permission to write to $outdir." + exit 1 +elif [[ -f "$outfile" && ! -w "$outfile" ]]; then + dfatal "No permission to write $outfile." + exit 1 +fi + # Create some directory structure first [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"