Merge from trunk of 20937-20944 and later for same files.

2 files changed, 41 insertions, 0 deletions

diff --git a/Completion/Linux/Command/_acpi b/Completion/Linux/Command/_acpi
new file mode 100644
index 000000000..850687506
--- /dev/null
+++ b/Completion/Linux/Command/_acpi
@@ -0,0 +1,18 @@
+#compdef acpi
+
+_arguments -s \
+    '(-b --battery)'{-b,--battery}'[battery information]' \
+    '(-B --without-battery)'{-B,--without-battery}'[suppress battery information]' \
+    '(-t --thermal)'{-t,--thermal}'[thermal information]' \
+    '(-T --without-thermal)'{-T,--without-thermal}'[suppress thermal information]' \
+    '(-a --ac-adapter)'{-a,--ac-adapter}'[ac adapter information]' \
+    '(-A --without-ac-adapter)'{-A,--without-ac-adapter}'[suppress ac-adapter information]' \
+    '(-V --everything)'{-V,--everything}'[show every device, overrides above options]' \
+    '(-s --show-empty)'{-s,--show-empty}'[show non-operational devices]' \
+    '(-S --hide-empty)'{-S,--hide-empty}'[hide non-operational devices]' \
+    '(-c --celsius -f --fahrenheit -k --kelvin)'{-c,--celsius}'[use Celsius as the temperature scale]' \
+    '(-c --celsius -f --fahrenheit -k --kelvin)'{-f,--fahrenheit}'[use Fahrenheit as the temperature scale]' \
+    '(-c --celsius -f --fahrenheit -k --kelvin)'{-k,--kelvin}'[use Kelvin as the temperature scale]' \
+    '(-d --directory)'{-d,--directory}'[path to ACPI info (/proc/acpi)]:directory:_files -/' \
+    '(-h --help)'{-h,--help}'[display this help and exit]' \
+    '(-v --version)'{-v,--version}'[output version information and exit]'
diff --git a/Completion/Linux/Command/_tune2fs b/Completion/Linux/Command/_tune2fs
new file mode 100644
index 000000000..73ce2dd12
--- /dev/null
+++ b/Completion/Linux/Command/_tune2fs
@@ -0,0 +1,23 @@
+#compdef tune2fs
+
+_arguments \
+  '-c[set max mounts between checks]:number of mounts' \
+  '-C[set mount count]:number of mounts' \
+  '-e[set error behavior]:error behavior:(continue remount-ro panic)' \
+  '-f[force tune2fs to complete even in the face of errors]' \
+  '-g[set the group which can use reserved filesystem blocks]:group:_groups' \
+  '-i[interval between checks]:duration' \
+  '-j[add an ext3 journal to the filesystem]' \
+  '-J[journal options]: :_values -s , option "size[specify journal size]\:size" "device[use external journal]\:block device\:_files"' \
+  '-l[list the contents of the filesystem superblock]' \
+  '-L[set the volume label of the filesystem]:label' \
+  '-m[set the percentage of reserved filesystem blocks]:percentage' \
+  '-M[set the last-mounted directory for the filesystem]:directory:_files -/' \
+  '-o[mount options]:options:_values -s , debug bsdgroups user_xattr acl uid16 journal_data journal_data_ordered journal_data_writeback' \
+  '-O[set or clear filesystem features]: :_values -s , feature dir_index filetype has_journal sparse_super' \
+  '-r[set the number of reserved filesystem blocks]:number' \
+  '-s[set sparse super feature]:state:((0\:off 1\:on))' \
+  '-T[set time last checked]:time specifier' \
+  '-u[set user who can use reserved filesystem blocks]:user:_users' \
+  '-U[set filesystem UUID]:UUID or special:(clear random time)' \
+  ':device:_files'