1
1
mirror of https://pagure.io/fedora-kickstarts.git synced 2024-12-25 12:33:09 +00:00

livesys: continue instead of return in cmdline do loops.

return is an improper exit command for do loops.
From dracut.cmdline(7):
"The last value in the kernel command line is the value .. honored."
This commit is contained in:
Frederick Grose 2018-08-31 19:47:01 -04:00
parent d33a56133a
commit 8cfe4eb1aa

View File

@ -95,11 +95,10 @@ livedir="LiveOS"
for arg in \`cat /proc/cmdline\` ; do for arg in \`cat /proc/cmdline\` ; do
if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
livedir=\${arg##rd.live.dir=} livedir=\${arg##rd.live.dir=}
return continue
fi fi
if [ "\${arg##live_dir=}" != "\${arg}" ]; then if [ "\${arg##live_dir=}" != "\${arg}" ]; then
livedir=\${arg##live_dir=} livedir=\${arg##live_dir=}
return
fi fi
done done
@ -154,7 +153,6 @@ findPersistentHome() {
for arg in \`cat /proc/cmdline\` ; do for arg in \`cat /proc/cmdline\` ; do
if [ "\${arg##persistenthome=}" != "\${arg}" ]; then if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
homedev=\${arg##persistenthome=} homedev=\${arg##persistenthome=}
return
fi fi
done done
} }