Update names for entry directories variables and fix options count.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Remove negotiation from `-z` to test for non-emptiness instead of
previously added version reversing those tests logic.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

- Drop patches from upstream
- Refresh remainder

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>

Signed-off-by: Frédéric Dalleau <frederic.dalleau@collabora.com>

Refresh patches against the latest bashism changes from Buster.
Also, ignore some additional code related to INITRD_OPTIONS

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>