Regression fixes.

arkane-systems · May 13, 2021 · 2b2e620 · 2b2e620
1 parent fe89efd
commit 2b2e620
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/binsrc/genie/Helpers.cs b/binsrc/genie/Helpers.cs
@@ -27,7 +27,7 @@ internal static int GetSystemdPid ()
         }
 
         #region Subprocesses
-        
+
         // Run a subprocess and wait for it to exit, returning its return code.
         internal static int RunAndWait (string command, string[] args)
         {

diff --git a/binsrc/genie/Program.cs b/binsrc/genie/Program.cs
@@ -81,11 +81,10 @@ where Config.CloneEnv.Contains (de.Key)
 
             // *** PARSE COMMAND-LINE
             // Create options.
-            Option optVerbose = new Option ("--verbose",
-                                            "Display verbose progress messages");
+            Option optVerbose = new Option<bool> ("--verbose",
+                                                  getDefaultValue: () => false,
+                                                  description: "Display verbose progress messages");
             optVerbose.AddAlias ("-v");
-            optVerbose.Argument = new Argument<bool>();
-            optVerbose.Argument.SetDefaultValue(false);
 
             // Add them to the root command.
             var rootCommand = new RootCommand();
@@ -177,7 +176,7 @@ public static int InitializeHandler (bool verbose)
 
             // Daemonize expects real uid root as well as effective uid root.
             using (var r = new RootPrivilege())
-            {            
+            {
                 // Init the bottle.
                 InitializeBottle(verbose);
             }
@@ -410,7 +409,6 @@ private static void InitializeBottle (bool verbose)
                 systemdPid = Helpers.GetSystemdPid();
 
                 Console.Write (".");
-
             } while ( systemdPid == 0);
 
             // Now that systemd exists, write out its (external) PID.
@@ -435,7 +433,7 @@ private static void InitializeBottle (bool verbose)
                 if (timeout < 0)
                 {
                     // What state are we in?
-                    var state = Helpers.RunAndWaitForOutput ("sh", new string[] {"-c", $"nsenter -t {systemdPid} -m -p systemctl is-system-running 2> /dev/null"});
+                    var state = Helpers.RunAndWaitForOutput ("sh", new string[] {"-c", $"\"nsenter -t {systemdPid} -m -p systemctl is-system-running 2> /dev/null\""});
 
                     if (state.StartsWith("starting"))
                     {

diff --git a/binsrc/genie/genie.csproj b/binsrc/genie/genie.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <VersionPrefix>1.41</VersionPrefix>
+    <VersionPrefix>1.42</VersionPrefix>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>false</SelfContained>
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="5.0.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
     <PackageReference Include="Tmds.LibC" Version="0.5.0" />
   </ItemGroup>
 

diff --git a/binsrc/runinwsl/runinwsl.csproj b/binsrc/runinwsl/runinwsl.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <VersionPrefix>1.41</VersionPrefix>
+    <VersionPrefix>1.42</VersionPrefix>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>false</SelfContained>

diff --git a/package/arch/PKGBUILD b/package/arch/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: facekapow, rayfalling, Ducksoft
 
 pkgname=genie-systemd
-pkgver=1.41
+pkgver=1.42
 pkgrel=1
 pkgdesc="A quick way into a systemd \"bottle\" for WSL"
 arch=('x86_64')

diff --git a/package/debian/debian/changelog b/package/debian/debian/changelog
@@ -1,3 +1,9 @@
+systemd-genie (1.42) buster bullseye bookworm sid focal bionic; urgency=medium
+
+        * Regression fixes.
+
+ -- Alistair Young <avatar@arkane-systems.net>  Thu, 13 May 2021 05:40:00 -0500
+
 systemd-genie (1.41) buster bullseye bookworm sid focal bionic; urgency=medium
 
         * Moved user-runtime-dir@.service override to ExecStartPost.

diff --git a/package/fedora/genie.spec b/package/fedora/genie.spec
@@ -1,5 +1,5 @@
 %global project https://github.com/arkane-systems/genie/
-%global version 1.41
+%global version 1.42
 
 # debuginfo is 'not supported' for .NET binaries
 %global debug_package %{nil}
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
 %{_unitdir}/user-runtime-dir@.service.d/override.conf
 
 %changelog
+* Thu May 06 2021 Alistair Young <avatar@arkane-systems.net> 1.42-1
+- Regression fixes.
+
 * Thu May 06 2021 Alistair Young <avatar@arkane-systems.net> 1.41-1
 - Moved user-runtime-dir@.service override to ExecStartPost.
 - Fix virtualization detection for non-custom kernels.
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ internal static int GetSystemdPid () @@
             }
             #region Subprocesses
             // Run a subprocess and wait for it to exit, returning its return code.
             internal static int RunAndWait (string command, string[] args)
             {
@@ Expand Down @@