Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph

Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield

50 files changed, 237 insertions, 16 deletions

diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index c3791e71a..aaf2737d3 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -92,7 +92,7 @@ dist_bashcompletion_DATA += \
 	bash-completion/chfn \
 	bash-completion/chsh
 endif
-if BUILD_LAST
+if BUILD_DEPRECATED_LAST
 dist_bashcompletion_DATA += \
 	bash-completion/last
 endif
diff --git a/bash-completion/blkid b/bash-completion/blkid
index b43932858..9f97dd94e 100644
--- a/bash-completion/blkid
+++ b/bash-completion/blkid
@@ -6,6 +6,7 @@ _blkid_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-c')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/cfdisk b/bash-completion/cfdisk
index 6cd9d6f7e..6d900706a 100644
--- a/bash-completion/cfdisk
+++ b/bash-completion/cfdisk
@@ -5,25 +5,37 @@ _cfdisk_module()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
-		'-c')
+		'-c'|'--cylinders')
 			COMPREPLY=( $(compgen -W "cylinders" -- $cur) )
 			return 0
 			;;
-		'-h')
+		'-h'|'--heads')
 			COMPREPLY=( $(compgen -W "heads" -- $cur) )
 			return 0
 			;;
-		'-s')
+		'-s'|'--sectors')
 			COMPREPLY=( $(compgen -W "sectors" -- $cur) )
 			return 0
 			;;
-		'-v')
+		'-P'|'--print')
+			COMPREPLY=( $(compgen -W "r s t" -- $cur) )
+			return 0
+			;;
+		'-v'|'-V'|'--version'|'--help')
 			return 0
 			;;
 	esac
 	case $cur in
 		-*)
-			OPTS="-a -z -c -h -s"
+			OPTS="	--cylinders
+				--heads
+				--sectors
+				--guess
+				--print
+				--zero
+				--arrow
+				--help
+				--version"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
 			;;
@@ -31,7 +43,7 @@ _cfdisk_module()
 	local DEV TYPE DEVICES=''
 	while read DEV TYPE; do
 		[ $TYPE = 'disk' ] && DEVICES+="$DEV "
-	done < <(lsblk -pnro name,type)
+	done < <(lsblk -pnro "name,type")
 	COMPREPLY=( $(compgen -W "$DEVICES" -- $cur) )
 	return 0
 }
diff --git a/bash-completion/colcrt b/bash-completion/colcrt
index f9e4c333f..c66d7e6d6 100644
--- a/bash-completion/colcrt
+++ b/bash-completion/colcrt
@@ -19,6 +19,7 @@ _colcrt_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/column b/bash-completion/column
index f5cb86b9c..3af8e736a 100644
--- a/bash-completion/column
+++ b/bash-completion/column
@@ -30,6 +30,7 @@ _column_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/cytune b/bash-completion/cytune
index 4f4283805..f685c88ee 100644
--- a/bash-completion/cytune
+++ b/bash-completion/cytune
@@ -33,6 +33,7 @@ _cytune_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- ${cur:-"/dev/tty"}) )
 	return 0
diff --git a/bash-completion/dmesg b/bash-completion/dmesg
index 60ecc1af6..eab41ba08 100644
--- a/bash-completion/dmesg
+++ b/bash-completion/dmesg
@@ -6,6 +6,7 @@ _dmesg_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-F'|'--file')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/fallocate b/bash-completion/fallocate
index 5007b605e..2c6e4cbae 100644
--- a/bash-completion/fallocate
+++ b/bash-completion/fallocate
@@ -20,6 +20,7 @@ _fallocate_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/findmnt b/bash-completion/findmnt
index 9386d8f5a..3ed331ac0 100644
--- a/bash-completion/findmnt
+++ b/bash-completion/findmnt
@@ -18,6 +18,7 @@ _findmnt_module()
 			return 0
 			;;
 		'-F'|'--tab-file')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/flock b/bash-completion/flock
index 8cd60d33e..8e7f8b859 100644
--- a/bash-completion/flock
+++ b/bash-completion/flock
@@ -38,6 +38,7 @@ _flock_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- ${cur:-"/"}) )
 	return 0
diff --git a/bash-completion/fsck.cramfs b/bash-completion/fsck.cramfs
index 84f6f31b4..acf656411 100644
--- a/bash-completion/fsck.cramfs
+++ b/bash-completion/fsck.cramfs
@@ -6,6 +6,7 @@ _fsck.cramfs_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-x'|'--destination')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
 			return 0
diff --git a/bash-completion/hexdump b/bash-completion/hexdump
index 0c91187f1..9dc274076 100644
--- a/bash-completion/hexdump
+++ b/bash-completion/hexdump
@@ -5,29 +5,42 @@ _hexdump_module()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
-		'-e')
+		'-e'|'--format')
 			COMPREPLY=( $(compgen -W "format" -- $cur) )
 			return 0
 			;;
-		'-n')
+		'-n'|'--length')
 			COMPREPLY=( $(compgen -W "length" -- $cur) )
 			return 0
 			;;
-		'-s')
+		'-s'|'--skip')
 			COMPREPLY=( $(compgen -W "offset" -- $cur) )
 			return 0
 			;;
-		'-V')
+		'-V'|'--version'|'-h'|'--help')
 			return 0
 			;;
 	esac
 	case $cur in
 		-*)
-			OPTS="-b -c -C -d -o -x -e -f -n -s -v -V"
+			OPTS="	--one-byte-octal
+				--one-byte-char
+				--canonical
+				--two-bytes-decimal
+				--two-bytes-octal
+				--two-bytes-hex
+				--format
+				--format-file
+				--length
+				--skip
+				--no-squeezing
+				--version
+				--help"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/hwclock b/bash-completion/hwclock
index 0c4ebafc1..de1ac20f3 100644
--- a/bash-completion/hwclock
+++ b/bash-completion/hwclock
@@ -6,6 +6,7 @@ _hwclock_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-f'|'--rtc'|'--adjfile')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/ionice b/bash-completion/ionice
index 3a01c5125..1b1c5fe0a 100644
--- a/bash-completion/ionice
+++ b/bash-completion/ionice
@@ -30,6 +30,7 @@ _ionice_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/last b/bash-completion/last
index 493051e64..c93be3d43 100644
--- a/bash-completion/last
+++ b/bash-completion/last
@@ -6,6 +6,7 @@ _last_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-f')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/ldattach b/bash-completion/ldattach
index 830142d23..0b9d26034 100644
--- a/bash-completion/ldattach
+++ b/bash-completion/ldattach
@@ -42,6 +42,7 @@ _ldattach_module()
 			return 0
 			;;
 		/*)
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/logger b/bash-completion/logger
index f46be8ad0..963abc704 100644
--- a/bash-completion/logger
+++ b/bash-completion/logger
@@ -6,6 +6,7 @@ _logger_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-f'|'--file')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/look b/bash-completion/look
index e8676bae4..303a7565a 100644
--- a/bash-completion/look
+++ b/bash-completion/look
@@ -20,6 +20,7 @@ _look_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/losetup b/bash-completion/losetup
index 75240b8c9..874c549ae 100644
--- a/bash-completion/losetup
+++ b/bash-completion/losetup
@@ -60,6 +60,7 @@ _losetup_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/lscpu b/bash-completion/lscpu
index bce07c412..7e189eee6 100644
--- a/bash-completion/lscpu
+++ b/bash-completion/lscpu
@@ -17,7 +17,8 @@ _lscpu_module()
 				POLARIZATION,
 				ADDRESS,
 				CONFIGURED,
-				ONLINE,"
+				ONLINE,
+				MMHZ"
 			compopt -o nospace
 			COMPREPLY=( $(compgen -W "$OPTS" -- $cur) )
 			return 0
@@ -41,6 +42,7 @@ _lscpu_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/lslocks b/bash-completion/lslocks
index 337d07e04..c9cff2c6b 100644
--- a/bash-completion/lslocks
+++ b/bash-completion/lslocks
@@ -38,6 +38,7 @@ _lslocks_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/mcookie b/bash-completion/mcookie
index eb3f54b5f..4345b6e6c 100644
--- a/bash-completion/mcookie
+++ b/bash-completion/mcookie
@@ -6,6 +6,7 @@ _mcookie_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-f'|'--file')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/mkfs.bfs b/bash-completion/mkfs.bfs
index 8adbc6084..4f2923d4f 100644
--- a/bash-completion/mkfs.bfs
+++ b/bash-completion/mkfs.bfs
@@ -1,4 +1,4 @@
-_bfs_module()
+_mkfs.bfs_module()
 {
 	local cur prev OPTS DEVS
 	COMPREPLY=()
@@ -28,4 +28,4 @@ _bfs_module()
 	COMPREPLY=( $(compgen -W "$DEVS /path/to/file" -- $cur) )
 	return 0
 }
-complete -F _bfs_module bfs
+complete -F _mkfs.bfs_module mkfs.bfs
diff --git a/bash-completion/mkfs.cramfs b/bash-completion/mkfs.cramfs
index 38ab3b65f..af74e1212 100644
--- a/bash-completion/mkfs.cramfs
+++ b/bash-completion/mkfs.cramfs
@@ -36,6 +36,7 @@ _mkfs.cramfs_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/mkswap b/bash-completion/mkswap
index c411b3005..b72efafd9 100644
--- a/bash-completion/mkswap
+++ b/bash-completion/mkswap
@@ -28,6 +28,7 @@ _mkswap_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/more b/bash-completion/more
index 945c7b341..809cea2b3 100644
--- a/bash-completion/more
+++ b/bash-completion/more
@@ -21,6 +21,8 @@ _more_module()
 			return 0
 			;;
 	esac
+
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/mount b/bash-completion/mount
new file mode 100644
index 000000000..db97a918a
--- /dev/null
+++ b/bash-completion/mount
@@ -0,0 +1,88 @@
+_mount_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-t'|'--types')
+			local TYPES
+			TYPES="
+adfs	  noadfs	hfsplus	  nohfsplus	smbfs	  nosmbfs
+affs	  noaffs	hpfs	  nohpfs	squashfs  nosquashfs
+autofs	  noautofs	iso9660	  noiso9660	sysv	  nosysv
+cifs	  nocifs	jfs	  nojfs		tmpfs	  notmpfs
+coda	  nocoda	minix	  nominix	ubifs	  noubifs
+coherent  nocoherent	msdos	  nomsdos	udf	  noudf
+cramfs	  nocramfs	ncpfs	  noncpfs	ufs	  noufs
+debugfs	  nodebugfs	nfs	  nonfs		umsdos	  noumsdos
+devpts	  nodevpts	nfs4	  nonfs4	usbfs	  nousbfs
+efs	  noefs		ntfs	  nontfs	vfat	  novfat
+ext	  noext		proc	  noproc	xenix	  noxenix
+ext2	  noext2	qnx4	  noqnx4	xfs	  noxfs
+ext3	  noext3	ramfs	  noramfs	xiafs	  noxiafs
+ext4	  noext4	reiserfs  noreiserfs
+hfs	  nohfs		romfs	  noromfs
+"
+			COMPREPLY=( $(compgen -W "$TYPES" -- $cur) )
+			return 0
+			;;
+		'-L'|'--label')
+			local LABELS
+			LABELS="$(lsblk -o LABEL -nr)"
+			COMPREPLY=( $(compgen -W "$LABELS" -- $cur) )
+			return 0
+			;;
+		'-U'|'--uuid')
+			local UUIDS
+			UUIDS="$(lsblk -o UUID -nr)"
+			COMPREPLY=( $(compgen -W "$UUIDS" -- $cur) )
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="	--all
+				--no-canonicalize
+				--fake
+				--fork
+				--fstab
+				--help
+				--internal-only
+				--show-labels
+				--no-mtab
+				--options
+				--test-opts
+				--read-only
+				--types
+				--source
+				--target
+				--verbose
+				--version
+				--read-write
+				--label
+				--uuid
+				--bind
+				--move
+				--rbind
+				--make-shared
+				--make-slave
+				--make-private
+				--make-unbindable
+				--make-rshared
+				--make-rslave
+				--make-rprivate
+				--make-runbindable"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+	esac
+	local IFS=$'\n'
+	compopt -o filenames
+	COMPREPLY=( $(compgen -f -- $cur) )
+	return 0
+}
+complete -F _mount_module mount
diff --git a/bash-completion/mountpoint b/bash-completion/mountpoint
index 8fe27b813..f74efc9cc 100644
--- a/bash-completion/mountpoint
+++ b/bash-completion/mountpoint
@@ -20,6 +20,7 @@ _mountpoint_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- ${cur:-"/"}) )
 	return 0
diff --git a/bash-completion/namei b/bash-completion/namei
index 63fb37ac1..640273500 100644
--- a/bash-completion/namei
+++ b/bash-completion/namei
@@ -16,6 +16,7 @@ _namei_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/nsenter b/bash-completion/nsenter
index 2970b8d5e..268f3782c 100644
--- a/bash-completion/nsenter
+++ b/bash-completion/nsenter
@@ -40,6 +40,7 @@ _nsenter_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/pg b/bash-completion/pg
index 9b1bad930..8fce1302a 100644
--- a/bash-completion/pg
+++ b/bash-completion/pg
@@ -25,6 +25,7 @@ _pg_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/pivot_root b/bash-completion/pivot_root
index 961c88374..95df4b4d2 100644
--- a/bash-completion/pivot_root
+++ b/bash-completion/pivot_root
@@ -11,6 +11,7 @@ _pivot_root_module()
 	esac
 	case $COMP_CWORD in
 		1|2)
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
 			;;
diff --git a/bash-completion/readprofile b/bash-completion/readprofile
index a5f45f564..bd265a69a 100644
--- a/bash-completion/readprofile
+++ b/bash-completion/readprofile
@@ -6,6 +6,7 @@ _readprofile_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-m'|'--mapfile'|'-p'|'--profile')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/rename b/bash-completion/rename
index 3842c4d14..81365a5b2 100644
--- a/bash-completion/rename
+++ b/bash-completion/rename
@@ -24,6 +24,7 @@ _rename_module()
 			COMPREPLY=( $(compgen -W "replacement" -- $cur) )
 			;;
 		*)
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			;;
diff --git a/bash-completion/rev b/bash-completion/rev
index 619c5c4f6..e5397d5d8 100644
--- a/bash-completion/rev
+++ b/bash-completion/rev
@@ -16,6 +16,7 @@ _rev_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/script b/bash-completion/script
index 329fc482f..d7efd7e7c 100644
--- a/bash-completion/script
+++ b/bash-completion/script
@@ -32,6 +32,7 @@ _script_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/scriptreplay b/bash-completion/scriptreplay
index 2ad7b118c..a4aa8a08d 100644
--- a/bash-completion/scriptreplay
+++ b/bash-completion/scriptreplay
@@ -24,6 +24,7 @@ _scriptreplay_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/setterm b/bash-completion/setterm
index 7fa0a4e45..a7ef6ebed 100644
--- a/bash-completion/setterm
+++ b/bash-completion/setterm
@@ -45,6 +45,7 @@ _setterm_module()
 			return 0
 			;;
 		'-file')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/sfdisk b/bash-completion/sfdisk
index 0226b0483..609104ca3 100644
--- a/bash-completion/sfdisk
+++ b/bash-completion/sfdisk
@@ -14,6 +14,7 @@ _sfdisk_module()
 			return 0
 			;;
 		'-O'|'-I')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
diff --git a/bash-completion/su b/bash-completion/su
index e739b56d9..dad1b5f04 100644
--- a/bash-completion/su
+++ b/bash-completion/su
@@ -38,6 +38,7 @@ _su_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/swaplabel b/bash-completion/swaplabel
index 093169e06..08aa9cd79 100644
--- a/bash-completion/swaplabel
+++ b/bash-completion/swaplabel
@@ -24,6 +24,7 @@ _swaplabel_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/tailf b/bash-completion/tailf
index e3dd295b1..0d4c869c0 100644
--- a/bash-completion/tailf
+++ b/bash-completion/tailf
@@ -20,6 +20,7 @@ _tailf_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/tunelp b/bash-completion/tunelp
index 614b2354f..bd2cce2aa 100644
--- a/bash-completion/tunelp
+++ b/bash-completion/tunelp
@@ -44,6 +44,7 @@ _tunelp_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- ${cur:-"/dev/lp"}) )
 	return 0
diff --git a/bash-completion/ul b/bash-completion/ul
index c00e510f6..449cbe054 100644
--- a/bash-completion/ul
+++ b/bash-completion/ul
@@ -25,6 +25,7 @@ _ul_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/umount b/bash-completion/umount
new file mode 100644
index 000000000..f178bd772
--- /dev/null
+++ b/bash-completion/umount
@@ -0,0 +1,60 @@
+_umount_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-t'|'--types')
+			local TYPES
+			TYPES="
+adfs	  noadfs	hfsplus	  nohfsplus	smbfs	  nosmbfs
+affs	  noaffs	hpfs	  nohpfs	squashfs  nosquashfs
+autofs	  noautofs	iso9660	  noiso9660	sysv	  nosysv
+cifs	  nocifs	jfs	  nojfs		tmpfs	  notmpfs
+coda	  nocoda	minix	  nominix	ubifs	  noubifs
+coherent  nocoherent	msdos	  nomsdos	udf	  noudf
+cramfs	  nocramfs	ncpfs	  noncpfs	ufs	  noufs
+debugfs	  nodebugfs	nfs	  nonfs		umsdos	  noumsdos
+devpts	  nodevpts	nfs4	  nonfs4	usbfs	  nousbfs
+efs	  noefs		ntfs	  nontfs	vfat	  novfat
+ext	  noext		proc	  noproc	xenix	  noxenix
+ext2	  noext2	qnx4	  noqnx4	xfs	  noxfs
+ext3	  noext3	ramfs	  noramfs	xiafs	  noxiafs
+ext4	  noext4	reiserfs  noreiserfs
+"
+			COMPREPLY=( $(compgen -W "$TYPES" -- $cur) )
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="	--all
+				--all-targets
+				--no-canonicalize
+				--detach-loop
+				--fake
+				--force
+				--internal-only
+				--no-mtab
+				--lazy
+				--test-opts
+				--recursive
+				--read-only
+				--types
+				--verbose
+				--help
+				--version"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+	esac
+	local DEVS_MPOINTS
+	DEVS_MPOINTS="$(mount | awk '{print $1, $3}')"
+	COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) )
+	return 0
+}
+complete -F _umount_module umount
diff --git a/bash-completion/utmpdump b/bash-completion/utmpdump
index 3b868cec0..fb636c18a 100644
--- a/bash-completion/utmpdump
+++ b/bash-completion/utmpdump
@@ -11,11 +11,12 @@ _utmpdump_module()
 	esac
 	case $cur in
 		-*)
-			OPTS="--follow --reverse --version --help"
+			OPTS="--follow --reverse --output --version --help"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/uuidd b/bash-completion/uuidd
index c45b0674c..c8f6697c9 100644
--- a/bash-completion/uuidd
+++ b/bash-completion/uuidd
@@ -6,16 +6,19 @@ _uuidd_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-p'|'--pid'|'-s'|'--socket')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -f -- $cur) )
 			return 0
 			;;
 		'-T'|'--timeout')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -W "timeout" -- $cur) )
 			return 0
 			;;
 		'-n'|'--uuids')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -W "number" -- $cur) )
 			return 0
diff --git a/bash-completion/wall b/bash-completion/wall
index 55d96587e..e3145ff6d 100644
--- a/bash-completion/wall
+++ b/bash-completion/wall
@@ -20,6 +20,7 @@ _wall_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- $cur) )
 	return 0
diff --git a/bash-completion/wdctl b/bash-completion/wdctl
index 33b4e1ff6..4f16e7607 100644
--- a/bash-completion/wdctl
+++ b/bash-completion/wdctl
@@ -56,6 +56,7 @@ _wdctl_module()
 			return 0
 			;;
 	esac
+	local IFS=$'\n'
 	compopt -o filenames
 	COMPREPLY=( $(compgen -f -- ${cur:-"/dev/"}) )
 	return 0
diff --git a/bash-completion/whereis b/bash-completion/whereis
index 2273a07c5..0dcbac35b 100644
--- a/bash-completion/whereis
+++ b/bash-completion/whereis
@@ -6,6 +6,7 @@ _whereis_module()
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
 		'-B'|'-M'|'-S')
+			local IFS=$'\n'
 			compopt -o filenames
 			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
 			return 0