agherzan / yubikey-full-disk-encryption

Use YubiKey to unlock a LUKS partition
Apache License 2.0
795 stars 50 forks source link

Various adjustments and improvements #10

Closed Vincent43 closed 6 years ago

Vincent43 commented 6 years ago
agherzan commented 6 years ago

Still work in progress? Needs rebase as well.

Vincent43 commented 6 years ago

No, it's quite complete. I tested all functionality and use it daily. Feel free to adjust and rebase as you like.

I made it compatible with https://github.com/cornelinux/yubikey-luks so users can reuse same passwords between distros.

agherzan commented 6 years ago

@Vincent43 There are some conflicts that you need to fix before being able to pull this in.

Vincent43 commented 6 years ago

@agherzan what conflicts? I see This branch has no conflicts with the base branch below.

Vincent43 commented 6 years ago

Ok, I see. For some reason we can't rebase and merge this however we can still simply merge or squash and merge. Is it possible to go that way? @agherzan

Hm..when I do from your repo git pull -v --rebase=true git://github.com/Vincent43/yubikey-full-disk-encryption.git patch-1 it works without conflicts.

Looking up github.com ... done.
Connecting to github.com (port 9418) ... done.
remote: Counting objects: 90, done.
remote: Compressing objects: 100% (37/37), done.
remote: Total 90 (delta 26), reused 6 (delta 6), pack-reused 46
Unpacking objects: 100% (90/90), done.
From git://github.com/Vincent43/yubikey-full-disk-encryption
 * branch            patch-1    -> FETCH_HEAD
Updating 5099b2e..0209a0a
Fast-forward
 Makefile                  |  20 +++++++++++++++-----
 PKGBUILD                  |  21 +++++++++++++++++++++
 README.md                 |  60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/hooks/ykfde           |  61 +++++++++++++++++++++++++++++++------------------------------
 src/initramfs-suspend     |  60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/install/ykfde         |   1 +
 src/ykfde-enroll          | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ykfde-open            |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ykfde-suspend         | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ykfde-suspend.service |  20 ++++++++++++++++++++
 10 files changed, 491 insertions(+), 35 deletions(-)
 create mode 100644 PKGBUILD
 create mode 100644 src/initramfs-suspend
 create mode 100644 src/ykfde-enroll
 create mode 100644 src/ykfde-open
 create mode 100644 src/ykfde-suspend
 create mode 100644 src/ykfde-suspend.service
Current branch master is up to date.

Maybe it's only some github issue. Can you try merge and rebase from cmdline?

agherzan commented 6 years ago

Can you try to do a local rebase (on top of master) of the dev branch you have in your checkout and force push to this branch that you want merged in? This should fix the conflicts.

Vincent43 commented 6 years ago

I did as you said and git shows that rebased branch is identical to the old one. When I tried to pull rebased branch to new branch based on your master it still can't merge and rebase on github.

It seems that rebasing doesn't do anything in this case actually. I build it chronologically on top of your master so I guess there is nothing to rebase and that's the reason github refuses to do it. What exactly do you want here?

IMO you can simply merge this or squash if you don't want a lot of commits. You can also rebase and push from local but it has the same effect.

Vincent43 commented 6 years ago

@agherzan is there anything else you want me to do before merge?

Vincent43 commented 6 years ago

@agherzan any chance this could land before xmass as gift for users? :grinning:

agherzan commented 6 years ago

Merry Christmas!