From e6d1a723335238323f8289cca7a3bce50f0aa4dc Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 10 Jun 2020 11:10:40 +0100
Subject: diskdrake: remove partition from /etc/crypttab when deleted
 (mga#25891)

---
 perl-install/NEWS          | 2 ++
 perl-install/fs/dmcrypt.pm | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index fc68aedea..ec4516086 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake: remove partition from /etc/crypttab when deleted (mga#25891)
+
 Version 18.28 - 29 May 2020
 
 - drakboot: don't die in write_grub2 if grub.cfg doesn't exist (mga#26676)
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index eddf669ef..21175c2de 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -137,6 +137,12 @@ sub close_part {
     _run_or_die('luksClose', devices::make($dm_part->{device}));
     $part->{dm_active} = 0;
     @$dmcrypts = grep { $_ != $dm_part } @$dmcrypts;    
+    substInFile {
+	my ($name, $_dev) = split;
+	if ($name eq $part->{dm_name}) {
+	    $_ = '';
+	}
+    } _crypttab();
 }
 
 sub _run_or_die {
-- 
cgit v1.2.1