initcpio hook: replace invalid 'die' command with 'err' + 'exit 1'

pull/254/head
Jan Houben 7 years ago
parent a21ecd4c8a
commit d7c670fd6f
No known key found for this signature in database
GPG Key ID: 6866AADB974DD983
  1. 2
      conf.sh
  2. 6
      src/zfs-utils/zfs-utils.initcpio.hook

@ -10,7 +10,7 @@ zfs_src_hash="f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a"
zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
zfs_initcpio_install_hash="335e309ebf5b74fd8956f5e8805939c37d4008b0bcc3b00be6e7ef1d5b7c1669"
zfs_initcpio_hook_hash="60ca3ce382c404c1c97873d6a352d0e99b28e948fde4e3f67d92e05f6eb216f0"
zfs_initcpio_hook_hash="e056e00a5805d383587606da115b9de3a4507300e19dcf6ef95afd83610c7501"
# Notification address
email="jeezusjr@gmail.com"

@ -60,7 +60,8 @@ zfs_mount_handler () {
# Lets import everything and try again
zpool import ${ZPOOL_IMPORT_FLAGS} -N -a ${ZPOOL_FORCE}
if ! zfs_get_bootfs ; then
die "ZFS: Cannot find bootfs."
err "ZFS: Cannot find bootfs."
exit 1
fi
fi
fi
@ -77,7 +78,8 @@ zfs_mount_handler () {
fi
if ! zpool import ${ZPOOL_IMPORT_FLAGS} -N "${pool}" ${ZPOOL_FORCE} ; then
die "ZFS: Unable to import pool ${pool}."
err "ZFS: Unable to import pool ${pool}."
exit 1
fi
fi

Loading…
Cancel
Save