summaryrefslogtreecommitdiff
path: root/tests/runtime
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2010-04-18 11:44:00 +0200
committerDieter Plaetinck <dieter@plaetinck.be>2010-04-18 11:44:00 +0200
commit4418f59e32858d7badcc8e9b23dd6c26b26c42f0 (patch)
treebfadfdbb1f6e262ed48c6693c346df9b0857f598 /tests/runtime
parentaa0123794a6743408f0de9d1792bdb7cc2eda733 (diff)
implement consistent/generic, more stable {en,de}coding of fs_params and fs_opts. this should fix some bugs with filesystem creating failing when options were specified
Diffstat (limited to 'tests/runtime')
-rw-r--r--tests/runtime/automatic-dmcrypt-lvm-install-sda/profile2
-rw-r--r--tests/runtime/automatic-lvm-dmcrypt-install-sda/profile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/runtime/automatic-dmcrypt-lvm-install-sda/profile b/tests/runtime/automatic-dmcrypt-lvm-install-sda/profile
index f0c37c7..8828cf3 100644
--- a/tests/runtime/automatic-dmcrypt-lvm-install-sda/profile
+++ b/tests/runtime/automatic-dmcrypt-lvm-install-sda/profile
@@ -18,5 +18,5 @@ BLOCKDATA='/dev/sda1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_para
/dev/sda2 raw lvm-pv;yes;no_mountpoint;target;no_opts;no_label;no_params
/dev/sda2+ lvm-pv no_label lvm-vg;yes;no_mountpoint;target;no_opts;mypool;/dev/sda2
/dev/mapper/mypool lvm-vg mypool lvm-lv;yes;no_mountpoint;target;no_opts;root;800M
-/dev/mapper/mypool-root lvm-lv no_label dm_crypt;yes;no_mountpoint;target;no_opts;mypool-rootcrypt;-c_aes-xts-plain_-y_-s_512
+/dev/mapper/mypool-root lvm-lv no_label dm_crypt;yes;no_mountpoint;target;no_opts;mypool-rootcrypt;-c__aes-xts-plain__-y__-s__512
/dev/mapper/mypool-rootcrypt dm_crypt no_label xfs;yes;/;target;no_opts;no_label;no_params' \ No newline at end of file
diff --git a/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile b/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile
index b936576..c90b1ec 100644
--- a/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile
+++ b/tests/runtime/automatic-lvm-dmcrypt-install-sda/profile
@@ -15,7 +15,7 @@ TARGET_PACKAGES='openssh aif'
GRUB_DEVICE=/dev/sda
PARTITIONS='/dev/sda 40:ext2:+ *:ext4'
BLOCKDATA='/dev/sda1 raw no_label ext2;yes;/boot;target;no_opts;no_label;no_params
-/dev/sda2 raw no_label dm_crypt;yes;no_mountpoint;target;no_opts;sda2crypt;-c_aes-xts-plain_-y_-s_512
+/dev/sda2 raw no_label dm_crypt;yes;no_mountpoint;target;no_opts;sda2crypt;-c__aes-xts-plain__-y__-s__512
/dev/mapper/sda2crypt dm_crypt no_label lvm-pv;yes;no_mountpoint;target;no_opts;no_label;no_params
/dev/mapper/sda2crypt+ lvm-pv no_label lvm-vg;yes;no_mountpoint;target;no_opts;cryptpool;/dev/mapper/sda2crypt
/dev/mapper/cryptpool lvm-vg cryptpool lvm-lv;yes;no_mountpoint;target;no_opts;cryptswap;20M|lvm-lv;yes;no_mountpoint;target;no_opts;cryptroot;800M|lvm-lv;yes;no_mountpoint;target;no_opts;crypthome;50M