From db52a7963e2f48d06565cdefb0fe90632941ebf6 Mon Sep 17 00:00:00 2001 From: Bart Saint Germain Date: Tue, 19 Nov 2019 15:01:38 +0100 Subject: [PATCH 1/2] Use the standard home folder when creating the new user --- Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs | 2 +- Packaging.Targets/Deb/DebPackageCreator.cs | 2 +- Packaging.Targets/Rpm/RpmPackageCreator.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs b/Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs index ee13f53..0f2c5ef 100644 --- a/Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs +++ b/Packaging.Targets.Tests/Deb/DebPackageCreatorTests.cs @@ -129,7 +129,7 @@ namespace Packaging.Targets.Tests.Deb additionalMetadata: null); Assert.Equal(@"/usr/sbin/groupadd -r demouser 2>/dev/null || : -/usr/sbin/useradd -g demouser -s /sbin/nologin -r -d /opt/local demouser 2>/dev/null || : +/usr/sbin/useradd -g demouser -s /sbin/nologin -r demouser 2>/dev/null || : echo 'Hello from pre install' ", pkg.PreInstallScript, ignoreLineEndingDifferences: true); Assert.Equal(@"systemctl daemon-reload diff --git a/Packaging.Targets/Deb/DebPackageCreator.cs b/Packaging.Targets/Deb/DebPackageCreator.cs index f7e31c5..dfc94dd 100644 --- a/Packaging.Targets/Deb/DebPackageCreator.cs +++ b/Packaging.Targets/Deb/DebPackageCreator.cs @@ -73,7 +73,7 @@ namespace Packaging.Targets.Deb // Add the user and group, under which the service runs. // These users are never removed because UIDs are re-used on Linux. pkg.PreInstallScript += $"/usr/sbin/groupadd -r {userName} 2>/dev/null || :\n" + - $"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r -d {prefix} {userName} 2>/dev/null || :\n"; + $"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r {userName} 2>/dev/null || :\n"; } if (installService) diff --git a/Packaging.Targets/Rpm/RpmPackageCreator.cs b/Packaging.Targets/Rpm/RpmPackageCreator.cs index e5cf1b9..302ea07 100644 --- a/Packaging.Targets/Rpm/RpmPackageCreator.cs +++ b/Packaging.Targets/Rpm/RpmPackageCreator.cs @@ -335,7 +335,7 @@ namespace Packaging.Targets.Rpm // Add the user and group, under which the service runs. // These users are never removed because UIDs are re-used on Linux. preIn += $"/usr/sbin/groupadd -r {userName} 2>/dev/null || :\n" + - $"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r -d {prefix} {userName} 2>/dev/null || :\n"; + $"/usr/sbin/useradd -g {userName} -s /sbin/nologin -r {userName} 2>/dev/null || :\n"; } if (installService) From 01f8a35a6d57f9155670082d4e083f5ab9110601 Mon Sep 17 00:00:00 2001 From: Bart Saint Germain Date: Tue, 19 Nov 2019 15:18:22 +0100 Subject: [PATCH 2/2] update UserExists test --- demo/cliscd/Tests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/cliscd/Tests.cs b/demo/cliscd/Tests.cs index 1f1188a..8401916 100644 --- a/demo/cliscd/Tests.cs +++ b/demo/cliscd/Tests.cs @@ -13,7 +13,7 @@ namespace cliscd Assert.NotEqual(0, user.UserId); Assert.NotEqual(0, user.GroupId); Assert.Equal("quamotion", user.GroupName); - Assert.Equal("/usr/share/cliscd", user.HomeDirectory); + Assert.Equal("/home/quamotion", user.HomeDirectory); } [Fact]