Skip to content

Commit 1809430

Browse files
committed
Modify SYSTEMD_INIT, closes #15.
Migrating from /usr/lib/systemd/systemd -> /lib/systemd/systemd This version checks for the existence of /lib/systemd/systemd, and will use the old (/usr/lib/systemd/systemd) path if it is not found - this should be safe wrt older systems.
1 parent d836a5b commit 1809430

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

buildkernel

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ shopt -s nullglob
3131
# ********************** variables *********************
3232
PROGNAME="$(basename "${0}")"
3333
CONFFILE="/etc/${PROGNAME}.conf"
34-
VERSION="1.0.28"
34+
VERSION="1.0.29"
3535
ETCPROFILE="/etc/profile"
3636
DEFAULTEFIBOOTFILE="bootx64.efi"
3737
EFIBOOTFILE="${DEFAULTEFIBOOTFILE}"
@@ -57,8 +57,15 @@ LUKSKEYFILE="${DEFAULTLUKSKEYFILE}"
5757
MODPROBEDIR="/etc/modprobe.d"
5858
CMDLINE_ROOT="/dev/ram0"
5959
SYSTEMD_INIT="/usr/lib/systemd/systemd"
60+
SYSTEMD_NEW_INIT="/lib/systemd/systemd"
6061
OPENRC_INIT="/sbin/init"
61-
CMDLINE_REAL_INIT="${SYSTEMD_INIT}"
62+
if [[ -e "${SYSTEMD_NEW_INIT}" ]]; then
63+
# new path exists, so use it
64+
CMDLINE_REAL_INIT="${SYSTEMD_NEW_INIT}"
65+
else
66+
# fallback for older systems
67+
CMDLINE_REAL_INIT="${SYSTEMD_INIT}"
68+
fi
6269
CMDLINE_DOLVM_FLAG="dolvm"
6370
SECUREBOOTKEY="/etc/efikeys/db.key"
6471
SECUREBOOTCERT="/etc/efikeys/db.crt"

buildkernel.8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH BUILDKERNEL 8 "Version 1.0.28: November 2017"
1+
.TH BUILDKERNEL 8 "Version 1.0.29: January 2018"
22
.SH NAME
33
buildkernel \- build secure boot kernel, save to EFI system partition
44
.SH SYNOPSIS

buildkernel.conf.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH BUILDKERNEL 5 "Version 1.0.28: November 2017"
1+
.TH BUILDKERNEL 5 "Version 1.0.29: January 2018"
22
.SH NAME
33
buildkernel.conf \- a configuration file for \fBbuildkernel\fR(8)
44
.SH SYNOPSIS

0 commit comments

Comments
 (0)