Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-debian-packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reform
reform-debian-packages
Commits
bcacf728
Unverified
Commit
bcacf728
authored
2 years ago
by
Johannes Schauer Marin Rodrigues
Browse files
Options
Downloads
Patches
Plain Diff
patches/flash-kernel: use patch from MR
parent
f7bb0c4d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/flash-kernel
+7
-14
7 additions, 14 deletions
patches/flash-kernel
with
7 additions
and
14 deletions
patches/flash-kernel
+
7
−
14
View file @
bcacf728
#!/bin/sh
#!/bin/sh
set -e
set -e
# https://salsa.debian.org/installer-team/flash-kernel/-/merge_requests/33/diffs
patch -p1 << 'EOF'
patch -p1 << 'EOF'
diff --git a/functions b/functions
diff --git a/functions b/functions
index a2e2b31
..5899e59
100644
index a2e2b31
1ceeee65460286c83fc4a9e6d7b06eec2..d04d7620a10e6d2344ee7a8313c5f15edb53f6fc
100644
--- a/functions
--- a/functions
+++ b/functions
+++ b/functions
@@ -789,
13
+789,
12
@@
if [ -L "$kfile" ]; then
@@ -789,
8
+789,
8
@@
if [ -L "$kfile" ]; then
kfile=$(readlink -e "$kfile")
kfile=$(readlink -e "$kfile")
fi
fi
-if [ -d /sys/firmware/efi ]; then
-if [ -d /sys/firmware/efi ]; then
- # skipping when detect EFI
- # skipping when detect EFI
- echo "System running in EFI mode, skipping."
+if ! ischroot && [ -d /sys/firmware/efi ]; then
- exit 0
+ # skipping when detect EFI and we are not running inside a chroot
-fi
echo "System running in EFI mode, skipping."
-
exit 0
if ! check_supported "$machine"; then
+ # do nothing if an unsupported platform is booted from EFI
+ if [ -d /sys/firmware/efi ]; then
+ echo "Unsupported platform on EFI system, doing nothing."
+ exit 0
+ fi
error "Unsupported platform '$machine'."
fi
fi
EOF
EOF
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment