diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:22:01 -0700 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:22:01 -0700 |
| commit | 098d792ab2680aefd2d3a3d0a680b39e5a2787ba (patch) | |
| tree | cfff2cc9711395b9a96cfe44a77184022be7b845 /templates/show | |
| parent | e987d4d534ea2f1873658c08501fa21b4d3960bb (diff) | |
| parent | 78e41fb517a63c4a9cc225975e4714f84918149d (diff) | |
| download | vyatta-op-098d792ab2680aefd2d3a3d0a680b39e5a2787ba.tar.gz vyatta-op-098d792ab2680aefd2d3a3d0a680b39e5a2787ba.zip | |
Merge branch 'islavista' into jenner
Diffstat (limited to 'templates/show')
| -rw-r--r-- | templates/show/disk/node.tag/format/node.def | 4 | ||||
| -rw-r--r-- | templates/show/history/node.tag/node.def | 4 | ||||
| -rw-r--r-- | templates/show/raid/node.tag/node.def | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/templates/show/disk/node.tag/format/node.def b/templates/show/disk/node.tag/format/node.def index e05b4ad..e5829ca 100644 --- a/templates/show/disk/node.tag/format/node.def +++ b/templates/show/disk/node.tag/format/node.def @@ -7,6 +7,8 @@ run: if [ -z "$is_a_disk" ]; then echo "$disk_dev is not a disk device" + elif [ ! -r /dev/${disk_dev} ]; then + echo "Must be admin or root to display disk formating" else - fdisk -l /dev/${disk_dev} + /sbin/fdisk -l /dev/${disk_dev} fi diff --git a/templates/show/history/node.tag/node.def b/templates/show/history/node.tag/node.def index 2c77a35..a8c3755 100644 --- a/templates/show/history/node.tag/node.def +++ b/templates/show/history/node.tag/node.def @@ -1,3 +1,3 @@ -help: Display last commands in history +help: Display last N commands in history allowed: echo -n '<NUMBER>' -run: HISTTIMEFORMAT='%FT%T%z ' history +run: HISTTIMEFORMAT='%FT%T%z ' history $3 diff --git a/templates/show/raid/node.tag/node.def b/templates/show/raid/node.tag/node.def index bc83a73..4f9928d 100644 --- a/templates/show/raid/node.tag/node.def +++ b/templates/show/raid/node.tag/node.def @@ -12,5 +12,12 @@ run: if [ -z $valid_set ]; then echo "$raid_set_name is not a RAID set" else - mdadm --detail /dev/${raid_set_name} + if [ -r /dev/${raid_set_name} ]; then + # This should work without sudo because we have read + # access to the dev, but for some reason mdadm must be + # run as root in order to succeed. + sudo /sbin/mdadm --detail /dev/${raid_set_name} + else + echo "Must be administrator or root to display RAID status" + fi fi
\ No newline at end of file |