On Wed, Mar 20, 2019 at 10:02:10PM -0400, Theodore Ts'o wrote:
> Not all systems will have the lvm2 package installed, so check for
> that. Pretty much all systems should have util-linux installed, but
> check for that as well.
>
> Of course, if lvm2 is installed we shouldn't find any LVM devices ---
> but eventually the Demon Murphy will find a way to make it happen. :-)
>
> Also, set the PATH so we don't have to worry about the script failing
> due to /sbin not being in the path.
>
> Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> scrub/e2scrub.in | 12 ++++++++++++
> scrub/e2scrub_all.in | 16 ++++++++++++++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in
> index e1965db4e..51a909373 100644
> --- a/scrub/e2scrub.in
> +++ b/scrub/e2scrub.in
> @@ -23,6 +23,8 @@
> # check filesystems in VGs that have at least 256MB (or so) of
> # free space.
>
> +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> +
> snap_size_mb=256
> fstrim=0
> reap=0
> @@ -82,6 +84,16 @@ if [ -z "${arg}" ]; then
> exitcode 1
> fi
>
> +if ! type lsblk >& /dev/null ; then
> + echo "e2scrub: can't find lsblk --- is util-linux installed?"
> + exitcode 1
> +fi
> +
> +if ! type lvcreate >& /dev/null ; then
> + echo "e2scrub: can't find lvcreate --- is lvm2 installed?"
> + exitcode 1
> +fi
> +
> # Find the device for a given mountpoint
> dev_from_mount() {
> local mountpt="$(realpath "$1")"
> diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
> index 23d122d25..d725a7f2e 100644
> --- a/scrub/e2scrub_all.in
> +++ b/scrub/e2scrub_all.in
> @@ -18,6 +18,8 @@
> # along with this program; if not, write the Free Software Foundation,
> # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
>
> +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> +
> scrub_all=0
> conffile="@root_sysconfdir@/e2scrub.conf"
>
> @@ -68,6 +70,20 @@ while getopts "ArV" opt; do
> done
> shift "$((OPTIND - 1))"
>
> +# If some prerequisite packages are not installed, exit with a code
> +# indicating success to avoid spamming the sysadmin with fail messages
> +# when e2scrub_all is run out of cron or a systemd timer.
> +
> +if ! type lsblk >& /dev/null ; then
> + echo "e2scrub_all: can't find lsblk --- is util-linux installed?"
> + exitcode 0
> +fi
> +
> +if ! type lvcreate >& /dev/null ; then
> + echo "e2scrub_all: can't find lvcreate --- is lvm2 installed?"
> + exitcode 0
> +fi
> +
> # Find scrub targets, make sure we only do this once.
> ls_scrub_targets() {
> lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n | while read vars; do
> --
> 2.19.1
>
