Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes up some rough edges #155

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes up some rough edges #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db28ca
Adding cryptsetup to req's install and adding another path to look fo…
umbernhard Oct 28, 2021
b691710
Don't die if files already in initramfs (fixes #157)
Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ requirements: | build
bison \
libelf-dev \
libjson-glib-dev \
cryptsetup \


# Remove the temporary files and build stuff
Expand Down
28 changes: 18 additions & 10 deletions initramfs/hooks/safeboot-hooks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@

set -e

# A function to ignore errors if a file is already present in the initramfs
idempotent_copy () {
copy_file "$1" "$2" "$3" || [ $? -eq 1 ]
return
}

if [ "$1" = "prereqs" ]; then
exit 0
fi
Expand All @@ -30,15 +36,17 @@ fi
DIR="/etc/safeboot"
[ -r "$DIR/safeboot.conf" ] && . "$DIR/safeboot.conf"
[ -r "$DIR/local.conf" ] && . "$DIR/local.conf"
ls $DIR
stat "$DIR/safeboot.conf"

# Move the configuration and keys into the initrd as well
copy_file safeboot "$DIR/safeboot.conf"
copy_file safeboot-functions "$DIR/functions.sh"
copy_file safeboot-keys "$(dirname "$CERT")/$(basename "$CERT" .pem).pub" "$DIR/cert.pub"
copy_file safeboot-keys "$CERT"
idempotent_copy safeboot "$DIR/safeboot.conf"
idempotent_copy safeboot-functions "$DIR/functions.sh"
idempotent_copy safeboot-keys "$(dirname "$CERT")/$(basename "$CERT" .pem).pub" "$DIR/cert.pub"
idempotent_copy safeboot-keys "$CERT"

if [ -r "$DIR/local.conf" ]; then
copy_file safeboot-local "$DIR/local.conf"
idempotent_copy safeboot-local "$DIR/local.conf"
fi

# Programs required to unseal the secrets and decrypt the disk
Expand All @@ -53,22 +61,22 @@ manual_add_modules nls_iso8859-1
copy_exec /bin/bash
copy_exec /usr/bin/setsid
copy_exec /usr/sbin/veritysetup
copy_exec /usr/bin/xxd
copy_exec /usr/bin/xxd /sbin/
copy_exec /usr/bin/dd
copy_exec /usr/bin/chattr
copy_exec /usr/bin/objcopy
copy_exec /bin/efibootmgr
copy_exec /sbin/safeboot
copy_exec /sbin/sbsign.safeboot
copy_exec /usr/sbin/fsck.fat
copy_file efi-stub /usr/lib/systemd/boot/efi/linuxx64.efi.stub
copy_file fstab /etc/fstab /etc/safeboot/fstab
idempotent_copy efi-stub /usr/lib/systemd/boot/efi/linuxx64.efi.stub
idempotent_copy fstab /etc/fstab /etc/safeboot/fstab

# openssl has lots of dependencies to be able to talk to
# the pkcs11 smart cards
copy_exec /usr/bin/openssl
copy_file opensc /etc/opensc/opensc.conf
copy_file opensc /usr/lib/ssl/openssl.cnf
idempotent_copy opensc /etc/opensc/opensc.conf
idempotent_copy opensc /usr/lib/ssl/openssl.cnf
copy_exec /usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so
copy_exec /usr/lib/x86_64-linux-gnu/p11-kit-proxy.so
copy_exec /lib/x86_64-linux-gnu/libffi.so.7
Expand Down
3 changes: 3 additions & 0 deletions sbin/safeboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ if [[ -s $TOP/lib/safeboot/functions.sh ]]; then
elif [[ -s $TOP/functions.sh ]]; then
# shellcheck source=functions.sh
. "$TOP/functions.sh"
elif [[ -s /etc/safeboot/functions.sh ]]; then
# shellcheck source=functions.sh
. "/etc/safeboot/functions.sh"
else
echo "Unable to find Safeboot function library" 1>&2
exit 1
Expand Down