|
Lines 247-253
Link Here
|
| 247 |
{ |
247 |
{ |
| 248 |
if (!Mode::test ()) |
248 |
if (!Mode::test ()) |
| 249 |
{ |
249 |
{ |
| 250 |
symbol detected_fs = FileSystems::DetectFs (partition); |
250 |
symbol detected_fs = Storage::DetectFs (partition); |
| 251 |
if (detected_fs == `ext2) |
251 |
if (detected_fs == `ext2) |
| 252 |
{ |
252 |
{ |
| 253 |
// label, %1 is partition |
253 |
// label, %1 is partition |
|
Lines 277-283
Link Here
|
| 277 |
{ |
277 |
{ |
| 278 |
if (mount_type == "") |
278 |
if (mount_type == "") |
| 279 |
mount_type = FileSystems::GetMountString ( |
279 |
mount_type = FileSystems::GetMountString ( |
| 280 |
FileSystems::DetectFs (device), ""); |
280 |
Storage::DetectFs (device), ""); |
| 281 |
if (mount_type != "") |
281 |
if (mount_type != "") |
| 282 |
mount_type = "-t " + mount_type; |
282 |
mount_type = "-t " + mount_type; |
| 283 |
|
283 |
|
|
Lines 560-571
Link Here
|
| 560 |
|
560 |
|
| 561 |
if (!issubstring (mntops, "noauto")) |
561 |
if (!issubstring (mntops, "noauto")) |
| 562 |
{ |
562 |
{ |
| 563 |
if (crypt_nb == 0) |
|
|
| 564 |
{ |
| 565 |
SCR::Execute(.target.modprobe, "loop_fish2", ""); |
| 566 |
crypt_nb = crypt_nb + 1; |
| 567 |
} |
| 568 |
|
| 569 |
string crypt_passwd = DlgUpdateCryptFs( device, fspath ); |
563 |
string crypt_passwd = DlgUpdateCryptFs( device, fspath ); |
| 570 |
|
564 |
|
| 571 |
if (crypt_passwd == nil) |
565 |
if (crypt_passwd == nil) |
|
Lines 583-588
Link Here
|
| 583 |
"partitionName" : device ]; |
577 |
"partitionName" : device ]; |
| 584 |
|
578 |
|
| 585 |
crypt_ok = Storage::PerformLosetup( setloop, false ); |
579 |
crypt_ok = Storage::PerformLosetup( setloop, false ); |
|
|
580 |
if( crypt_ok ) |
| 581 |
loop = setloop["loop_dev"]:""; |
| 586 |
|
582 |
|
| 587 |
y2milestone ("crypt ok: %1", crypt_ok); |
583 |
y2milestone ("crypt ok: %1", crypt_ok); |
| 588 |
} |
584 |
} |