Fix ubuntu 16.04 support (#140)

* Fix ubuntu 16.04 support

* Format

* Correct env settings

* Rearrange plan a bit

nix/tests/vm-test/default.nix

@@ -17,6 +17,7 @@ let
   images = {
 
     # End of standard support https://wiki.ubuntu.com/Releases
+    # No systemd
     /*
       "ubuntu-v14_04" = {
       image = import <nix/fetchurl.nix> {
@@ -29,7 +30,7 @@ let
     */
 
     # End of standard support https://wiki.ubuntu.com/Releases
-    /* "ubuntu-v16_04" = {
+    "ubuntu-v16_04" = {
       image = import <nix/fetchurl.nix> {
         url = "https://app.vagrantup.com/generic/boxes/ubuntu1604/versions/4.1.12/providers/libvirt.box";
         hash = "sha256-lO4oYQR2tCh5auxAYe6bPOgEqOgv3Y3GC1QM1tEEEU8=";
@@ -37,7 +38,6 @@ let
       rootDisk = "box.img";
       system = "x86_64-linux";
     };
-    */
 
     "ubuntu-v22_04" = {
       image = import <nix/fetchurl.nix> {
@@ -67,6 +67,7 @@ let
       hash = "sha256-QwzbvRoRRGqUCQptM7X/InRWFSP2sqwRt2HaaO6zBGM=";
       };
       rootDisk = "box.img";
+      postBoot = disableSELinux;
       system = "x86_64-linux";
       };
     */

src/action/base/mod.rs

@@ -1,13 +1,13 @@
 //! Base [`Action`](crate::action::Action)s that themselves have no other actions as dependencies
 
-mod create_directory;
+pub(crate) mod create_directory;
-mod create_file;
+pub(crate) mod create_file;
-mod create_group;
+pub(crate) mod create_group;
-mod create_or_append_file;
+pub(crate) mod create_or_append_file;
-mod create_user;
+pub(crate) mod create_user;
-mod fetch_and_unpack_nix;
+pub(crate) mod fetch_and_unpack_nix;
-mod move_unpacked_nix;
+pub(crate) mod move_unpacked_nix;
-mod setup_default_profile;
+pub(crate) mod setup_default_profile;
 
 pub use create_directory::CreateDirectory;
 pub use create_file::CreateFile;

src/action/common/configure_nix.rs

@@ -1,8 +1,10 @@
 use crate::{
     action::{
         base::SetupDefaultProfile,
-        common::{ConfigureShellProfile, PlaceChannelConfiguration, PlaceNixConfiguration},
+        common::{
-        linux::ConfigureNixDaemonService,
+            ConfigureNixDaemonService, ConfigureShellProfile, PlaceChannelConfiguration,
+            PlaceNixConfiguration,
+        },
         Action, ActionDescription, ActionError, StatefulAction,
     },
     channel_value::ChannelValue,

src/action/common/configure_nix_daemon_service.rs

@@ -156,7 +156,7 @@ impl Action for ConfigureNixDaemonService {
                         .process_group(0)
                         .arg("enable")
                         .arg("--now")
-                        .arg("nix-daemon.socket"),
+                        .arg(SOCKET_SRC),
                 )
                 .await
                 .map_err(ActionError::Command)?;

src/action/common/mod.rs

@@ -1,14 +1,16 @@
 //! [`Action`](crate::action::Action)s which only call other base plugins
 
-mod configure_nix;
+pub(crate) mod configure_nix;
-mod configure_shell_profile;
+pub(crate) mod configure_nix_daemon_service;
-mod create_nix_tree;
+pub(crate) mod configure_shell_profile;
-mod create_users_and_groups;
+pub(crate) mod create_nix_tree;
-mod place_channel_configuration;
+pub(crate) mod create_users_and_groups;
-mod place_nix_configuration;
+pub(crate) mod place_channel_configuration;
-mod provision_nix;
+pub(crate) mod place_nix_configuration;
+pub(crate) mod provision_nix;
 
 pub use configure_nix::ConfigureNix;
+pub use configure_nix_daemon_service::{ConfigureNixDaemonService, ConfigureNixDaemonServiceError};
 pub use configure_shell_profile::ConfigureShellProfile;
 pub use create_nix_tree::CreateNixTree;
 pub use create_users_and_groups::CreateUsersAndGroups;

src/action/darwin/mod.rs

@@ -1,14 +1,14 @@
 /*!  [`Action`](crate::action::Action)s for Darwin based systems
 */
 
-mod bootstrap_apfs_volume;
+pub(crate) mod bootstrap_apfs_volume;
-mod create_apfs_volume;
+pub(crate) mod create_apfs_volume;
-mod create_nix_volume;
+pub(crate) mod create_nix_volume;
-mod create_synthetic_objects;
+pub(crate) mod create_synthetic_objects;
-mod enable_ownership;
+pub(crate) mod enable_ownership;
-mod encrypt_apfs_volume;
+pub(crate) mod encrypt_apfs_volume;
-mod kickstart_launchctl_service;
+pub(crate) mod kickstart_launchctl_service;
-mod unmount_apfs_volume;
+pub(crate) mod unmount_apfs_volume;
 
 pub use bootstrap_apfs_volume::{BootstrapApfsVolume, BootstrapVolumeError};
 pub use create_apfs_volume::{CreateApfsVolume, CreateVolumeError};

src/action/linux/mod.rs

@@ -1,5 +1,3 @@
-mod configure_nix_daemon_service;
+pub(crate) mod start_systemd_unit;
-mod start_systemd_unit;
 
-pub use configure_nix_daemon_service::{ConfigureNixDaemonService, ConfigureNixDaemonServiceError};
 pub use start_systemd_unit::{StartSystemdUnit, StartSystemdUnitError};

src/action/mod.rs

@@ -32,8 +32,8 @@ action.try_revert().await.unwrap();
 ```
 
 A general guidance for what determines how fine-grained an [`Action`] should be is the unit of
-reversion. The [`ConfigureNixDaemonService`](linux::ConfigureNixDaemonService) action is a good
+reversion. The [`ConfigureNixDaemonService`](common::ConfigureNixDaemonService) action is a good
-example of this,it takes several steps, such as running `systemd-tmpfiles`, and calling
+example of this, it takes several steps, such as running `systemd-tmpfiles`, and calling
 `systemctl link` on some systemd units.
 
 Where possible, tasks which could break during execution should be broken up, as uninstalling/installing

src/cli/mod.rs

@@ -99,7 +99,7 @@ pub fn ensure_root() -> eyre::Result<()> {
         arg_vec_cstring.push(sudo_cstring.clone());
 
         let mut preserve_env_list = vec![];
-        for (key, _value) in std::env::vars() {
+        for (key, value) in std::env::vars() {
             let preserve = match key.as_str() {
                 // Rust logging/backtrace bits we use
                 "RUST_LOG" | "RUST_BACKTRACE" => true,
@@ -110,16 +110,20 @@ pub fn ensure_root() -> eyre::Result<()> {
                 _ => false,
             };
             if preserve {
-                preserve_env_list.push(key);
+                preserve_env_list.push(format!("{key}={value}"));
             }
         }
 
         if !preserve_env_list.is_empty() {
+            arg_vec_cstring
+                .push(CString::new("env").wrap_err("Building a `env` argument for `sudo`")?);
+            for env in preserve_env_list {
                 arg_vec_cstring.push(
-                CString::new(format!("--preserve-env={}", preserve_env_list.join(",")))
+                    CString::new(env.clone())
-                    .wrap_err("Building a `--preserve-env` argument for `sudo`")?,
+                        .wrap_err_with(|| format!("Building a `{}` argument for `sudo`", env))?,
                 );
             }
+        }
 
         for arg in args {
             arg_vec_cstring.push(CString::new(arg).wrap_err("Making arg into C string")?);

src/planner/linux/multi.rs

@@ -2,7 +2,6 @@ use crate::{
     action::{
         base::CreateDirectory,
         common::{ConfigureNix, ProvisionNix},
-        linux::StartSystemdUnit,
         StatefulAction,
     },
     planner::{Planner, PlannerError},
@@ -78,10 +77,6 @@ impl Planner for LinuxMulti {
                 .await
                 .map_err(PlannerError::Action)?
                 .boxed(),
-            StartSystemdUnit::plan("nix-daemon.socket".to_string())
-                .await
-                .map_err(|v| PlannerError::Action(v.into()))?
-                .boxed(),
         ])
     }
 

src/planner/linux/steam_deck.rs

@@ -223,10 +223,6 @@ impl Planner for SteamDeck {
                 .await
                 .map_err(PlannerError::Action)?
                 .boxed(),
-            StartSystemdUnit::plan("nix-daemon.socket".to_string())
-                .await
-                .map_err(PlannerError::Action)?
-                .boxed(),
         ])
     }