|
|
fab351 |
From d8f0e52ac7d05c364ca24d2058c970e5e03f82ff Mon Sep 17 00:00:00 2001
|
|
|
fab351 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
fab351 |
Date: Fri, 30 Aug 2019 16:16:51 +0200
|
|
|
fab351 |
Subject: [PATCH] all: remove debugging leftovers
|
|
|
fab351 |
|
|
|
fab351 |
Accidentally folded into commit e671c3a06a7e5 ('95iscsi/module-setup.sh:
|
|
|
fab351 |
do not require 'hostname' anymore').
|
|
|
fab351 |
---
|
|
|
fab351 |
modules.d/40network/netroot.sh | 2 +-
|
|
|
fab351 |
modules.d/98dracut-systemd/dracut-cmdline.sh | 2 +-
|
|
|
fab351 |
modules.d/99base/init.sh | 2 +-
|
|
|
fab351 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
fab351 |
|
|
|
fab351 |
diff --git a/modules.d/40network/netroot.sh b/modules.d/40network/netroot.sh
|
|
|
fab351 |
index 654cfc72..207364cd 100755
|
|
|
fab351 |
--- a/modules.d/40network/netroot.sh
|
|
|
fab351 |
+++ b/modules.d/40network/netroot.sh
|
|
|
fab351 |
@@ -66,7 +66,7 @@ if [ -z "$2" ]; then
|
|
|
fab351 |
|
|
|
fab351 |
# Check: do we really know how to handle (net)root?
|
|
|
fab351 |
[ -z "$root" ] && die "No or empty root= argument"
|
|
|
fab351 |
- [ -z "$rootok" ] && die "X2 Don't know how to handle 'root=$root'"
|
|
|
fab351 |
+ [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
|
|
|
fab351 |
|
|
|
fab351 |
handler=${netroot%%:*}
|
|
|
fab351 |
handler=${handler%%4}
|
|
|
fab351 |
diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
|
fab351 |
index 89c52d13..bff9435a 100755
|
|
|
fab351 |
--- a/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
|
fab351 |
+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
|
|
|
fab351 |
@@ -76,7 +76,7 @@ case "${root}${root_unset}" in
|
|
|
fab351 |
esac
|
|
|
fab351 |
|
|
|
fab351 |
[ -z "${root}${root_unset}" ] && die "Empty root= argument"
|
|
|
fab351 |
-[ -z "$rootok" ] && die "X1 Don't know how to handle 'root=$root'"
|
|
|
fab351 |
+[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
|
|
|
fab351 |
|
|
|
fab351 |
export root rflags fstype netroot NEWROOT
|
|
|
fab351 |
|
|
|
fab351 |
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
|
|
|
fab351 |
index 3e20069f..e4f7cff1 100755
|
|
|
fab351 |
--- a/modules.d/99base/init.sh
|
|
|
fab351 |
+++ b/modules.d/99base/init.sh
|
|
|
fab351 |
@@ -136,7 +136,7 @@ getarg 'rd.break=cmdline' -d 'rdbreak=cmdline' && emergency_shell -n cmdline "Br
|
|
|
fab351 |
source_hook cmdline
|
|
|
fab351 |
|
|
|
fab351 |
[ -z "$root" ] && die "No or empty root= argument"
|
|
|
fab351 |
-[ -z "$rootok" ] && die "X0 Don't know how to handle 'root=$root'"
|
|
|
fab351 |
+[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
|
|
|
fab351 |
|
|
|
fab351 |
export root rflags fstype netroot NEWROOT
|
|
|
fab351 |
|
|
|
fab351 |
|