dracut.sh: reorder things to let "--print-cmdline" work

master
Harald Hoyer 2013-09-09 16:52:19 +02:00
parent 12beb05a73
commit 540a5169b9
1 changed files with 14 additions and 14 deletions

View File

@ -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}"