debian.package: dracut --force, add EFI boot entry once

Also, only btrfs needs mountpoint if filesystem is mounted.

debian.package/Makefile

@@ -14,7 +14,7 @@ include dracut-conf-template.mk
 uefi-boot-metadata-collect-agent/boot/efi/uefi-boot-metadata-collect-agent.efi: db.crt db.key db.cer uefi-boot-metadata-collect-agent/boot/efi/secboot.cer
 	mkdir -p /tmp/dracut-empty
 	echo "$${dracut_conf}" > dracut.conf
-	sudo dracut -c dracut.conf --confdir /tmp/dracut-empty --uefi-output $@
+	sudo dracut --force -c dracut.conf --confdir /tmp/dracut-empty --uefi-output $@
 	sudo chmod 755 $@
 	rm -rfv /tmp/dracut-empty
 

debian.package/uefi-boot-metadata-collect-agent/DEBIAN/postinst

-#!/bin/sh
+#!/bin/bash
 
 EFI_DEV=$(mount | grep -Po '^.+(?= on /boot/efi )')
 ROOT_DEV=$(mount | grep -Po '^.+(?= on / )')
 
-efibootmgr --create --disk "$EFI_DEV" --label 'UEFI metadata-collect-agent' --loader /uefi-boot-metadata-collect-agent.efi
+if ! efibootmgr --disk "$EFI_DEV" --verbose | grep "uefi-boot-metadata-collect-agent.efi"; then
+    efibootmgr --create --disk "$EFI_DEV" --label 'UEFI metadata-collect-agent' --loader /uefi-boot-metadata-collect-agent.efi
+fi
 
-e2label / "ROOT" || true
+e2label "$ROOT_DEV" "ROOT" || true
 btrfs filesystem label / "ROOT" || true
-reiserfstune -l "ROOT" / || true
-xfs_admin -L "ROOT" / || true
-cryptsetup config --label="ROOT" / || true
\ No newline at end of file
+reiserfstune -l "ROOT" "$ROOT_DEV" || true
+xfs_admin -L "ROOT" "$ROOT_DEV" || true
+cryptsetup config --label="ROOT" "$ROOT_DEV" || true
\ No newline at end of file