summaryrefslogtreecommitdiffstats
path: root/xlators/mount
diff options
context:
space:
mode:
authorNico Schottelius <nico@freiheit.schottelius.org>2015-03-06 16:25:33 +0100
committerVijay Bellur <vbellur@redhat.com>2015-03-06 19:46:41 -0800
commitadef0c8860f57c8137382d848244009e9a584497 (patch)
tree40c6b86c4dc729c7a87ffad9202062755b845ace /xlators/mount
parent3d9423354a2d688c3609258883b1c03422996978 (diff)
Replace /dev/stderr with >&2 in mount scripts
/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>
Diffstat (limited to 'xlators/mount')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in10
-rwxr-xr-xxlators/mount/fuse/utils/mount_glusterfs.in11
2 files changed, 12 insertions, 9 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 68d452c142e..4348533b1a2 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/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:
diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in
index dc326b4528f..50a301c26a8 100755
--- a/xlators/mount/fuse/utils/mount_glusterfs.in
+++ b/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: