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

Fix to have bulleye accept usernames with underscore (Closes #678) #679

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Fix to have bulleye accept usernames with underscore (Closes #678) #679

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
50ba9c7
Fix to have bulleye accept usernames with underscore
narc-Ontakac2 Oct 7, 2024
c3500cc
Implemented review suggestions
narc-Ontakac2 Oct 10, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENDIF()

set(VZLOGGER_MAJOR_VERSION 0)
set(VZLOGGER_MINOR_VERSION 8)
set(VZLOGGER_SUB_VERSION 7)
set(VZLOGGER_SUB_VERSION 8)
set(VERSION_SEP "-")
set(VZLOGGER_SHORT_VERSION "${VZLOGGER_MAJOR_VERSION}${VERSION_SEP}${VZLOGGER_MINOR_VERSION}")
set(VZLOGGER_VERSION "${VZLOGGER_SHORT_VERSION}${VERSION_SEP}${VZLOGGER_SUB_VERSION}")
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
vzlogger (0.8.8) unstable; urgency=medium

* Fix to have bulleye accept usernames with underscore

-- Joachim Zobel <jz-2017@heute-morgen.de> Sun, 06 Oct 2024 12:20:24 +0200

vzlogger (0.8.7) unstable; urgency=medium

* Added OMS support to the native Debian build
Expand Down
9 changes: 8 additions & 1 deletion debian/vzlogger.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@

set -e

ADDUSER_VER=$(dpkg-query --showformat='${Version}' --show adduser)
FORCE=""
if dpkg --compare-versions "$ADDUSER_VER" lt 3.131; then
FORCE="--force-badname"
fi

case "$1" in
configure)

if id vzlogger > /dev/null 2>&1 \
&& dpkg --compare-versions "$2" le-nl 0.8.3 \
&& dpkg --compare-versions "$2" ge 0.8.2; then
Expand All @@ -12,7 +19,7 @@ case "$1" in
groupmod --new-name _vzlogger vzlogger
fi
if ! id _vzlogger > /dev/null 2>&1 ; then
adduser --quiet --system --no-create-home --home /nonexistent \
adduser --quiet --system $FORCE --no-create-home --home /nonexistent \
--group --disabled-password --shell /bin/false \
_vzlogger
usermod -a -G dialout _vzlogger
Expand Down
Loading