mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
merge initcpio init changes
This commit is contained in:
parent
838b8fc4ca
commit
a17be8f978
1 changed files with 2 additions and 2 deletions
|
@ -115,7 +115,7 @@ else
|
|||
${mount_handler} /new_root
|
||||
|
||||
[ -z "${init}" ] && init="/sbin/init"
|
||||
if [ "$(stat -f -c %i /)" = "$(stat -f -c %i /new_root)" ]; then
|
||||
if [ "$(stat -c %D /)" = "$(stat -c %D /new_root)" ]; then
|
||||
# Nothing got mounted on /new_root. This is the end, we don't know what to do anymore
|
||||
# We fall back into a shell, but the shell has now PID 1
|
||||
# This way, manual recovery is still possible.
|
||||
|
@ -123,7 +123,7 @@ else
|
|||
echo "Bailing out, you are on your own. Good luck."
|
||||
echo
|
||||
launch_interactive_shell --exec
|
||||
elif [ ! -f "/new_root${init}" ]; then
|
||||
elif [ ! -x "/new_root${init}" ]; then
|
||||
# Successfully mounted /new_root, but ${init} is missing
|
||||
# The same logic as above applies
|
||||
err "Root device mounted successfully, but ${init} does not exist."
|
||||
|
|
Loading…
Reference in a new issue