From 1123d23114201988ac3f5f50ab6e74a5307d3d52 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Thu, 26 Oct 2023 18:45:07 -0400
Subject: [PATCH] remount-secure: disable debugging to save space in initrd

---
 usr/bin/remount-secure                             |  9 ++++++---
 .../modules.d/20remount-secure/module-setup.sh     | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/usr/bin/remount-secure b/usr/bin/remount-secure
index e38e837..a81f43f 100755
--- a/usr/bin/remount-secure
+++ b/usr/bin/remount-secure
@@ -23,9 +23,12 @@ init() {
 
    $output_command "$0: INFO: START"
 
-   if [ "$(id -u)" != "0" ]; then
-      $output_command "ERROR: must be run as root! sudo $0"
-      exit 1
+   ## dracut does not have id. Saving space in initial ramdisk.
+   if command -v id &>/dev/null ; then
+      if [ "$(id -u)" != "0" ]; then
+         $output_command "ERROR: must be run as root! sudo $0"
+         exit 1
+      fi
    fi
 
    mkdir --parents "/run/remount-secure"
diff --git a/usr/lib/dracut/modules.d/20remount-secure/module-setup.sh b/usr/lib/dracut/modules.d/20remount-secure/module-setup.sh
index c48d08c..ce0a67b 100755
--- a/usr/lib/dracut/modules.d/20remount-secure/module-setup.sh
+++ b/usr/lib/dracut/modules.d/20remount-secure/module-setup.sh
@@ -5,11 +5,14 @@
 
 # called by dracut
 check() {
+    ## For debugging only.
+    ## Saving space in initial ramdisk.
+    #require_binaries id || return 1
+    #require_binaries env || return 1
+
     require_binaries findmnt || return 1
     require_binaries touch || return 1
     require_binaries grep || return 1
-    require_binaries id || return 1
-    require_binaries env || return 1
     require_binaries mount || return 1
     require_binaries remount-secure || return 1
     return 0
@@ -22,11 +25,14 @@ depends() {
 
 # called by dracut
 install() {
+    ## For debugging only.
+    ## Saving space in initial ramdisk.
+    #inst_multiple id
+    #inst_multiple env
+
     inst_multiple findmnt
     inst_multiple touch
     inst_multiple grep
-    inst_multiple id
-    inst_multiple env
     inst_multiple mount
     inst_multiple remount-secure
     inst_hook cleanup 90 "$moddir/remount-secure.sh"