richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
594167
From 27b017353a06a22d42dc8bbabbaf602200730719 Mon Sep 17 00:00:00 2001
aa0848
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
aa0848
Date: Wed, 19 Jan 2022 12:10:37 +0100
aa0848
Subject: [PATCH] kernel-install: k-i already creates $ENTRY_DIR_ABS, no need
aa0848
 to do it again
aa0848
aa0848
(cherry picked from commit a520d5dddb991cd713392d4de0e342e312547a2e)
aa0848
aa0848
Related: #2065061
aa0848
---
aa0848
 src/kernel-install/90-loaderentry.install | 8 ++------
aa0848
 1 file changed, 2 insertions(+), 6 deletions(-)
aa0848
aa0848
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
aa0848
index e588e72bf9..7b768457c1 100644
aa0848
--- a/src/kernel-install/90-loaderentry.install
aa0848
+++ b/src/kernel-install/90-loaderentry.install
aa0848
@@ -78,12 +78,8 @@ else
aa0848
 fi
aa0848
 
aa0848
 if ! [ -d "$ENTRY_DIR_ABS" ]; then
aa0848
-    if [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ]; then
aa0848
-        echo "+mkdir -v -p $ENTRY_DIR_ABS"
aa0848
-        mkdir -v -p "$ENTRY_DIR_ABS"
aa0848
-    else
aa0848
-        mkdir -p "$ENTRY_DIR_ABS"
aa0848
-    fi
aa0848
+    echo "Error: entry directory '$ENTRY_DIR_ABS' does not exist" >&2
aa0848
+    exit 1
aa0848
 fi
aa0848
 
aa0848
 install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {