diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 85f846c..6f2b40c 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -712,18 +712,18 @@ process_filesystem ()
 
 		#TODO: health checks on $fs_params etc
 		case ${fs_type} in #TODO: implement label, opts etc decently
-			xfs)      mkfs.xfs -f $part           $opts >$LOG 2>&1; ret=$? ;;
-			jfs)      yes | mkfs.jfs $part        $opts >$LOG 2>&1; ret=$? ;;
-			reiserfs) yes | mkreiserfs $part      $opts >$LOG 2>&1; ret=$? ;;
-			ext2)     mke2fs "$part"              $opts >$LOG 2>&1; ret=$? ;;
-			ext3)     mke2fs -j $part             $opts >$LOG 2>&1; ret=$? ;;
-			ext4)     mkfs.ext4 $part             $opts >$LOG 2>&1; ret=$? ;; #TODO: installer.git uses mke2fs -t ext4 -O dir_index,extent,uninit_bg , which is best?
-			vfat)     mkfs.vfat $part             $opts >$LOG 2>&1; ret=$? ;;
-			swap)     mkswap $part                $opts >$LOG 2>&1; ret=$? ;;
+			xfs)      mkfs.xfs -f $part           $fs_opts >$LOG 2>&1; ret=$? ;;
+			jfs)      yes | mkfs.jfs $part        $fs_opts >$LOG 2>&1; ret=$? ;;
+			reiserfs) yes | mkreiserfs $part      $fs_opts >$LOG 2>&1; ret=$? ;;
+			ext2)     mke2fs "$part"              $fs_opts >$LOG 2>&1; ret=$? ;;
+			ext3)     mke2fs -j $part             $fs_opts >$LOG 2>&1; ret=$? ;;
+			ext4)     mkfs.ext4 $part             $fs_opts >$LOG 2>&1; ret=$? ;; #TODO: installer.git uses mke2fs -t ext4 -O dir_index,extent,uninit_bg , which is best?
+			vfat)     mkfs.vfat $part             $fs_opts >$LOG 2>&1; ret=$? ;;
+			swap)     mkswap $part                $fs_opts >$LOG 2>&1; ret=$? ;;
 			dm_crypt) [ -z "$fs_params" ] && fs_params='-c aes-xts-plain -y -s 512';
 			          fs_params=${fs_params//_/ }
                       infofy "Please enter your passphrase to encrypt the device (with confirmation)"
-			          cryptsetup $fs_params $opts luksFormat -q $part >$LOG 2>&1 < /dev/tty ; ret=$? #hack to give cryptsetup the approriate stdin. keep in mind we're in a loop (see process_filesystems where something else is on stdin)
+			          cryptsetup $fs_params $fs_opts luksFormat -q $part >$LOG 2>&1 < /dev/tty ; ret=$? #hack to give cryptsetup the approriate stdin. keep in mind we're in a loop (see process_filesystems where something else is on stdin)
                       infofy "Please enter your passphrase to unlock the device"
 			          cryptsetup       luksOpen $part $fs_label >$LOG 2>&1 < /dev/tty; ret=$? || ( show_warning 'cryptsetup' "Error luksOpening $part on /dev/mapper/$fs_label" ) ;;
 			lvm-pv)   pvcreate $fs_opts $part              >$LOG 2>&1; ret=$? ;;