andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace /dev/stderr with >&2 in mount scripts

Browse Source 
/dev/stderr is not available on boot in CentOS 7 and thus
mounting anything from /etc/fstab at boot time fails.

Instead of using /dev/stderr, the standard error redirection ">&2" is being used.

Change-Id: I15d07cd49e6b0392331047edb441925f48047b2b
BUG: 1199545
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
Reviewed-on: http://review.gluster.org/9824
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Nico Schottelius 2015-03-06 16:25:33 +01:00 committed by Vijay Bellur
parent 3d9423354a
commit adef0c8860
2 changed files with 12 additions and 9 deletions
xlators/mount/fuse/utils
mount.glusterfs.inmount_glusterfs.in

10
xlators/mount/fuse/utils/mount.glusterfs.in

@ -1,6 +1,8 @@
#!/bin/sh
#
# Copyright (c) 2013 Red Hat, Inc. <http://www.redhat.com>
# Copyright (c) 2015 ungleich GmbH <http://www.ungleich.ch>
#
# This file is part of GlusterFS.
#
# This file is licensed to you under your choice of the GNU Lesser
@ -10,7 +12,7 @@
warn ()
{
echo "$@" >/dev/stderr
echo "$@" >&2
}
_init ()
@ -591,7 +593,7 @@ main ()
}
[ -z "$volume_id" -o -z "$server_ip" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: Server name/volume name unspecified cannot proceed further..
Please specify correct format
Usage:
@ -602,7 +604,7 @@ EOF
grep_ret=$(echo ${mount_point} | grep '^\-o');
[ "x" != "x${grep_ret}" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: -o options cannot be specified in either first two arguments..
Please specify correct style
Usage:
@ -614,7 +616,7 @@ EOF
# No need to do a ! -d test, it is taken care while initializing the
# variable mount_point
[ -z "$mount_point" -o ! -d "$mount_point" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: Mount point does not exist
Please specify a mount point
Usage:

11
xlators/mount/fuse/utils/mount_glusterfs.in

@ -1,5 +1,6 @@
#!/bin/sh
# (C) 2014 Red Hat Inc. <http://www.redhat.com>
# (C) 2015 ungleich GmbH <http://www.ungleich.ch>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@ -19,7 +20,7 @@
warn ()
{
echo "$@" >/dev/stderr
echo "$@" >&2
}
_init ()
@ -301,7 +302,7 @@ start_glusterfs ()
print_usage ()
{
cat << EOF >/dev/stderr
cat << EOF >&2
Usage: $0 <volumeserver>:<volumeid/volumeport> -o<options> <mountpoint>
Options:
man 8 $0
@ -502,7 +503,7 @@ main ()
}
[ -z "$volume_id" -o -z "$server_ip" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: Server name/volume name unspecified cannot proceed further..
Please specify correct format
Usage:
@ -513,7 +514,7 @@ EOF
grep_ret=$(echo ${mount_point} | grep '^\-o');
[ "x" != "x${grep_ret}" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: -o options cannot be specified in either first two arguments..
Please specify correct style
Usage:
@ -525,7 +526,7 @@ EOF
# No need to do a ! -d test, it is taken care while initializing the
# variable mount_point
[ -z "$mount_point" -o ! -d "$mount_point" ] && {
cat <<EOF >/dev/stderr
cat <<EOF >&2
ERROR: Mount point does not exist
Please specify a mount point
Usage: