Skip to content

Commit

Permalink
Modify SYSTEMD_INIT, closes #15.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sakaki- committed Jan 25, 2018
1 parent d836a5b commit 1809430
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
11 changes: 9 additions & 2 deletions buildkernel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ shopt -s nullglob
# ********************** variables *********************
PROGNAME="$(basename "${0}")"
CONFFILE="/etc/${PROGNAME}.conf"
VERSION="1.0.28"
VERSION="1.0.29"
ETCPROFILE="/etc/profile"
DEFAULTEFIBOOTFILE="bootx64.efi"
EFIBOOTFILE="${DEFAULTEFIBOOTFILE}"
Expand All @@ -57,8 +57,15 @@ LUKSKEYFILE="${DEFAULTLUKSKEYFILE}"
MODPROBEDIR="/etc/modprobe.d"
CMDLINE_ROOT="/dev/ram0"
SYSTEMD_INIT="/usr/lib/systemd/systemd"
SYSTEMD_NEW_INIT="/lib/systemd/systemd"
OPENRC_INIT="/sbin/init"
CMDLINE_REAL_INIT="${SYSTEMD_INIT}"
if [[ -e "${SYSTEMD_NEW_INIT}" ]]; then
# new path exists, so use it
CMDLINE_REAL_INIT="${SYSTEMD_NEW_INIT}"
else
# fallback for older systems
CMDLINE_REAL_INIT="${SYSTEMD_INIT}"
fi
CMDLINE_DOLVM_FLAG="dolvm"
SECUREBOOTKEY="/etc/efikeys/db.key"
SECUREBOOTCERT="/etc/efikeys/db.crt"
Expand Down
2 changes: 1 addition & 1 deletion buildkernel.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH BUILDKERNEL 8 "Version 1.0.28: November 2017"
.TH BUILDKERNEL 8 "Version 1.0.29: January 2018"
.SH NAME
buildkernel \- build secure boot kernel, save to EFI system partition
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion buildkernel.conf.5
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH BUILDKERNEL 5 "Version 1.0.28: November 2017"
.TH BUILDKERNEL 5 "Version 1.0.29: January 2018"
.SH NAME
buildkernel.conf \- a configuration file for \fBbuildkernel\fR(8)
.SH SYNOPSIS
Expand Down

0 comments on commit 1809430

Please sign in to comment.