diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
tree | da24c0099caede14445289dca8d76560c08de1d9 /templates/show/disk | |
parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip |
Merge branch 'current' into lithiumlithium
Conflicts:
Makefile.am
debian/changelog
templates/restart/dns/forwarding/node.def
templates/show/version/added/node.def
templates/show/version/all/node.def
templates/show/version/deleted/node.def
templates/show/version/downgraded/node.def
templates/show/version/node.def
templates/show/version/upgraded/node.def
Diffstat (limited to 'templates/show/disk')
-rw-r--r-- | templates/show/disk/node.def | 1 | ||||
-rw-r--r-- | templates/show/disk/node.tag/format/node.def | 7 | ||||
-rw-r--r-- | templates/show/disk/node.tag/node.def | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/templates/show/disk/node.def b/templates/show/disk/node.def deleted file mode 100644 index 8572a9f..0000000 --- a/templates/show/disk/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Show status of disk device diff --git a/templates/show/disk/node.tag/format/node.def b/templates/show/disk/node.tag/format/node.def deleted file mode 100644 index ad87cfc..0000000 --- a/templates/show/disk/node.tag/format/node.def +++ /dev/null @@ -1,7 +0,0 @@ -help: Show disk drive formatting -run: disk_dev="/dev/$3" - if [ ! -b "$disk_dev" ] - then echo "$3 is not a disk device" - exit 1 - fi - sudo /sbin/fdisk -l "$disk_dev" diff --git a/templates/show/disk/node.tag/node.def b/templates/show/disk/node.tag/node.def deleted file mode 100644 index 8690008..0000000 --- a/templates/show/disk/node.tag/node.def +++ /dev/null @@ -1,4 +0,0 @@ -help: Disk device name -allowed: awk 'NR > 2 && $4 !~ /[0-9]$/ { print $4 }' </proc/partitions - - |