From: Michael Prokop <mika@grml.org>
Date: Fri, 10 Jul 2020 09:14:57 +0000 (+0200)
Subject: scripts/GRMLBASE/52-mdadm: unconditionally clear 64-md-raid-assembly.rules
X-Git-Tag: v0.37.0~9
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=b090c76f24602f88fc251b287732142710496ca5;ds=sidebyside

scripts/GRMLBASE/52-mdadm: unconditionally clear 64-md-raid-assembly.rules

Similar to what we did in commit 31cd53a8b for LVM,
if /lib/udev/rules.d/64-md-raid-assembly.rules was removed by a
prior run of the unpatched script,
the patched script will fail to create the placeholder file.

This work was funded by Grml-Forensic.
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/52-mdadm b/etc/grml/fai/config/scripts/GRMLBASE/52-mdadm
index 1bceb58..625065f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/52-mdadm
+++ b/etc/grml/fai/config/scripts/GRMLBASE/52-mdadm
@@ -9,11 +9,6 @@
 set -u
 set -e
 
-if ! [ -r "${target}/lib/udev/rules.d/64-md-raid-assembly.rules" ] ; then
-  echo "File /lib/udev/rules.d/64-md-raid-assembly.rules doesn't exist, skipping execution of script."
-  exit 0
-fi
-
 echo "Removing /lib/udev/rules.d/64-md-raid-assembly.rules to avoid automatic mdadm scanning"
 echo '# this file was generated by grml-live script GRMLBASE/52-mdadm' > "${target}/lib/udev/rules.d/64-md-raid-assembly.rules"