Skip to content
This repository has been archived by the owner on Oct 18, 2020. It is now read-only.

Commit

Permalink
correct error introduced previously...
Browse files Browse the repository at this point in the history
  • Loading branch information
szorfein committed Apr 25, 2020
1 parent 45bd271 commit 0e6bdad
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion docs/examples/custom-hook
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ KEY_SIZE=8192

mkdir -p $USB_MOUNTPOINT

gpg_with_luks $PATH_KEY $CRYPTBOOT cryptboot
gpg_with_luks $PATH_KEY "$CRYPTBOOT" cryptboot

[ -b /dev/mapper/cryptboot ] || rescueShell "Fail to open cryptboot"

Expand All @@ -28,3 +28,4 @@ cryptsetup -v --header $USB_MOUNTPOINT/header.img --key-file=/dev/mapper/lukskey
[ -b /dev/mapper/zfs-enc ] || rescueShell "Fail to open zfs-enc"

cryptsetup close lukskey
# cryptsetup close cryptboot
6 changes: 3 additions & 3 deletions eclosion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,12 @@ fi

gcc_version=$(gcc --version | head -n 1 | awk '{print $6}')

if search_lib=$(find /usr/lib* -type f -name libgcc_s.so.1 | grep "$gcc_version/lib") ; then
# we use the gcc_version to exclude the version in 32 bit if any
if search_lib=$(find /usr/lib/ -type f -name libgcc_s.so.1 | grep "$gcc_version/lib") ; then
bin+=" $search_lib"
cp "$search_lib" usr/lib64/libgcc_s.so.1
else
echo "[-] libgcc_s.so.1 no found on the system..."
exit 1
die "libgcc_s.so.1 no found on the system..."
fi

########################################################
Expand Down
2 changes: 1 addition & 1 deletion scripts/init-top/gpg
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gpg_with_luks() {
{ flock -s 9;
i=1
while [ $i -le 3 ] ; do
gpg "$GPG_OPTS" -d "$1" | cryptsetup --key-file=- open --type luks "$2" "$3"
gpg $GPG_OPTS -d "$1" | cryptsetup --key-file=- open --type luks "$2" "$3"
ret=$?
[ $ret -eq 0 ] || [ $ret -eq 5 ] && break
[ $ret -eq 1 ] && echo "Bad password"
Expand Down

0 comments on commit 0e6bdad

Please sign in to comment.