- diskdrake

  o handle partitions encrypted with cryptsetup

- bug fix: add mandatory new modules for dm-crypt

4 files changed, 202 insertions, 0 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 72fd62992..febaccbbb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bug fix: add mandatory new modules for dm-crypt
+
 Version 11.47 - 17 September 2008
 
 - handle new driver:
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
new file mode 100644
index 000000000..e2d67b37a
--- /dev/null
+++ b/perl-install/fs/dmcrypt.pm
@@ -0,0 +1,157 @@
+package fs::dmcrypt; # $Id: $
+
+use diagnostics;
+use strict;
+
+#-######################################################################################
+#- misc imports
+#-######################################################################################
+use common;
+use fs::type;
+use fs::get;
+use run_program;
+
+sub _crypttab() { "$::prefix/etc/crypttab" }
+
+sub init() {
+    whereis_binary('cryptsetup') or die "cryptsetup not installed";
+
+    eval { modules::load('dm-crypt', 'cbc', 'sha256_generic', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
+    devices::init_device_mapper();
+    if ($::isInstall) {
+    }
+    1;
+}
+my $initialized;
+sub _ensure_initialized() {
+    $initialized++ or init();
+}
+
+sub read_crypttab {
+    my ($all_hds) = @_;
+
+    -e _crypttab() or return;
+
+    my @raw_parts = grep { fs::type::isRawLUKS($_) } fs::get::really_all_fstab($all_hds);
+
+    foreach (cat_(_crypttab())) {
+	my ($dm_name, $dev) = split;
+
+	my $raw_part = fs::get::device2part($dev, \@raw_parts)
+	  or log::l("crypttab: unknown device $dev for $dm_name"), next;
+
+	$raw_part->{dm_name} = $dm_name;
+    }
+}
+
+sub save_crypttab {
+    my ($all_hds) = @_;
+
+    my @raw_parts = grep { $_->{dm_name} } fs::get::really_all_fstab($all_hds) or return;
+
+    my %names = map { $_->{dm_name} => fs::wild_device::from_part('', $_) } @raw_parts;
+
+    substInFile {
+	my ($name, $_dev) = split;
+	if (my $new_dev = delete $names{$name}) {
+	    $_ = "$name $new_dev\n";
+	}
+	if (eof) {
+	    $_ .= join('', map { "$_ $names{$_}\n" } sort keys %names);
+	}
+    } _crypttab();
+}
+
+sub format_part {
+    my ($part) = @_;
+
+    my $tmp_key_file = "/tmp/.dmcrypt_key-$$";
+    common::with_private_tmp_file($tmp_key_file, $part->{dmcrypt_key}, sub {
+	_run_or_die('luksFormat', '--batch-mode', devices::make($part->{device}), $_[0]);
+    });
+    fs::format::after_formatting($part, 1);
+}
+
+sub open_part {
+    my ($dmcrypts, $part) = @_;
+
+    my $tmp_key_file = "/tmp/.dmcrypt_key-$$";
+    common::with_private_tmp_file($tmp_key_file, $part->{dmcrypt_key}, sub {
+	_run_or_die('luksOpen', devices::make($part->{device}), 
+				$part->{dm_name}, '--key-file', $_[0]);
+    });
+
+    my $active_dmcrypt = _parse_dmsetup_table($part->{dm_name}, 
+					      run_program::get_stdout('dmsetup', 'table', $part->{dm_name}));
+    push @$dmcrypts, _get_existing_one([$part], $active_dmcrypt);
+}
+
+sub close_part {
+    my ($dmcrypts, $part) = @_;
+    my $dm_part = fs::get::device2part("mapper/$part->{dm_name}", $dmcrypts);
+    _run_or_die('luksClose', devices::make($dm_part->{device}));
+    $part->{dm_active} = 0;
+    @$dmcrypts = grep { $_ != $dm_part } @$dmcrypts;    
+}
+
+sub _run_or_die {
+    my ($command, @para) = @_;
+
+    _ensure_initialized();
+
+    run_program::run_or_die('cryptsetup', $command, @para);
+}
+
+sub get_existing {
+    my $fstab = \@_;
+    map { _get_existing_one($fstab, $_) } active_dmcrypts();
+}
+
+sub _get_existing_one {
+    my ($fstab, $active_dmcrypt) = @_;
+
+    my $part = { device => "mapper/$active_dmcrypt->{name}", size => $active_dmcrypt->{size}, 
+		 options => 'noatime', dmcrypt_name => $active_dmcrypt->{name} };
+
+    if (my $raw_part = find { fs::get::is_same_hd($active_dmcrypt, $_) } @$fstab) {
+	$part->{rootDevice} = $raw_part->{device};
+	$raw_part->{dm_name} = $active_dmcrypt->{name};
+	$raw_part->{dm_active} = 1;
+    } else {
+	log::l("could not find the device $active_dmcrypt->{major}:$active_dmcrypt->{minor} for $part->{device}");
+    }
+
+    if (my $type = fs::type::type_subpart_from_magic($part)) {
+	put_in_hash($part, $type);
+    }
+    fs::type::set_isFormatted($part, to_bool($part->{fs_type}));
+    
+    $part->{fs_type} or fs::type::set_fs_type($part, 'ext3');
+
+    log::l("dmcrypt: found $part->{device} type $part->{fs_type} with rootDevice $part->{rootDevice}");
+
+    $part;
+}
+
+sub active_dmcrypts() {
+    grep { $_->{type} eq 'crypt' } active_dm();
+}
+
+sub _parse_dmsetup_table {
+    my ($name, $s) = @_;
+
+    my @l = split(' ', $s);
+    my ($major, $minor) = split(':', $l[6]);
+    { name => $name, size => $l[1], type => $l[2], major => $major, minor => $minor };
+}
+
+sub active_dm() {
+    run_program::run('udevadm', 'settle');
+
+    map {
+	my $name = s/(.*?):\s*// && $1;
+	_parse_dmsetup_table($name, $_);
+    } run_program::get_stdout('dmsetup', 'table');
+}
+
+1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8dbe17be5..69ab697aa 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bug fix: add mandatory new modules for dm-crypt
+
 Version 11.47 - 17 September 2008
 
 - handle new driver:
diff --git a/perl-install/partition_table/dmcrypt.pm b/perl-install/partition_table/dmcrypt.pm
new file mode 100644
index 000000000..3eae783c6
--- /dev/null
+++ b/perl-install/partition_table/dmcrypt.pm
@@ -0,0 +1,41 @@
+package partition_table::dmcrypt; # $Id: $
+
+# dmcrypt on full disk
+
+use diagnostics;
+use strict;
+
+our @ISA = qw(partition_table::readonly);
+
+use common;
+use partition_table::readonly;
+use fs::type;
+
+sub _parts {
+    my ($hd) = @_;
+
+    my $part = { size => $hd->{totalsectors}, device => $hd->{device} };
+    add2hash($part, fs::type::type_name2subpart('Encrypted'));
+
+    require fs;
+    fs::get_major_minor([$part]); # to allow is_same_hd() in fs::dmcrypt
+
+    [ $part ];
+}
+
+sub read_primary {
+    my ($hd) = @_;
+
+    my $type = fs::type::type_subpart_from_magic($hd);
+
+    $type && $type->{type_name} eq 'Encrypted' or return;
+
+    partition_table::dmcrypt->initialize($hd);
+    1;
+}
+
+sub initialize {
+    my ($class, $hd) = @_;
+
+    partition_table::readonly::initialize($class, $hd, _parts($hd));    
+}