canonical · townsend2010 · Jun 26, 2019 · May 29, 2019 · May 29, 2019 · May 31, 2019
diff --git a/include/multipass/constants.h b/include/multipass/constants.h
@@ -25,6 +25,8 @@ constexpr auto daemon_name = "multipassd";
 constexpr auto min_memory_size = "128M";
 constexpr auto min_disk_size = "512M";
 constexpr auto petenv_key = "client.primary_name"; // This will eventually be moved to some dynamic settings schema
+constexpr auto driver_key = "local.driver";        // idem
+constexpr auto driver_env_var = "MULTIPASS_VM_DRIVER";
 } // namespace multipass
 
 #endif // MULTIPASS_CONSTANTS_H
diff --git a/include/multipass/exceptions/settings_exceptions.h b/include/multipass/exceptions/settings_exceptions.h
@@ -38,8 +38,8 @@ class SettingsException : public std::runtime_error
 class PersistentSettingsException : public SettingsException
 {
 public:
-    PersistentSettingsException(const QString& attempted_operation, const QString& failure)
-        : SettingsException{fmt::format("Could not {} settings: {} error", attempted_operation, failure)}
+    PersistentSettingsException(const QString& attempted_operation, const QString& detail)
+        : SettingsException{fmt::format("Unable to {} settings: {}", attempted_operation, detail)}
     {
     }
 };

diff --git a/include/multipass/platform.h b/include/multipass/platform.h
@@ -26,13 +26,18 @@
 
 #include <libssh/sftp.h>
 
+#include <QString>
+
 #include <string>
 
 namespace multipass
 {
 namespace platform
 {
 std::string default_server_address();
+QString default_driver();
+QString daemon_config_home(); // temporary
+bool is_backend_supported(const QString& backend); // temporary
 VirtualMachineFactory::UPtr vm_backend(const Path& data_dir);
 logging::Logger::UPtr make_logger(logging::Level level);
 UpdatePrompt::UPtr make_update_prompt();

diff --git a/include/multipass/settings.h b/include/multipass/settings.h
@@ -34,6 +34,8 @@ class Settings : public Singleton<Settings>
     virtual QString get(const QString& key) const;            // throws on unknown key
     virtual void set(const QString& key, const QString& val); // throws on unknown key or bad settings
 
+    static QString get_daemon_settings_file_path(); // temporary
+
 protected:
     const QString& get_default(const QString& key) const; // throws on unknown key
 

diff --git a/snap-wrappers/bin/launch-libvirtd b/snap-wrappers/bin/launch-libvirtd
diff --git a/snap-wrappers/bin/launch-multipass b/snap-wrappers/bin/launch-multipass
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+. launcher-common.sh
+mk_xdg_dirs
+
+exec "$SNAP/bin/multipass" "$@"
diff --git a/snap-wrappers/bin/launch-multipass-gui b/snap-wrappers/bin/launch-multipass-gui
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+. launcher-common.sh
+mk_xdg_dirs
+
+exec "$SNAP/bin/multipass-gui" "$@"
diff --git a/snap-wrappers/bin/launch-multipassd b/snap-wrappers/bin/launch-multipassd
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
+. launcher-common.sh
+mk_xdg_dirs
+
 http_proxy="$(snapctl get proxy.http)"
 https_proxy="$(snapctl get proxy.https)"
 MULTIPASS_VM_DRIVER="$(snapctl get driver)"

diff --git a/snap-wrappers/bin/launcher-common.sh b/snap-wrappers/bin/launcher-common.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+mk_xdg_dirs()
+{   # need quotes to handle spaces, but then better test for emptiness
+    for dir in "$XDG_CACHE_HOME" "$XDG_CONFIG_HOME" "$XDG_DATA_HOME"; do
+        if [ ! -z "$dir" ]; then
+            mkdir -p "$dir"
+        fi
+    done
+}
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -17,25 +17,31 @@ apps:
   multipassd:
     command: bin/launch-multipassd
     environment:
-      LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
-      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
+      LD_LIBRARY_PATH: &library-path |
+        $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
+      PATH: &path |
+        $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
       QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
       XDG_DATA_HOME: $SNAP_COMMON/data
       XDG_CACHE_HOME: $SNAP_COMMON/cache
+      XDG_CONFIG_HOME: &daemon-config $SNAP_DATA/config
+      DAEMON_CONFIG_HOME: *daemon-config # temporary
     daemon: simple
     plugs: [libvirt]
   multipass:
     environment:
-      LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
-      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
-      QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
-    command: bin/multipass
+      <<: &client-environment
+        LD_LIBRARY_PATH: *library-path
+        PATH: *path
+        QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
+        XDG_DATA_HOME: $SNAP_USER_DATA/data
+        XDG_CACHE_HOME: $SNAP_USER_DATA/cache
+        XDG_CONFIG_HOME: $SNAP_USER_DATA/config
+      DAEMON_CONFIG_HOME: *daemon-config # temporary
+    command: bin/launch-multipass
     completer: etc/bash_completion.d/snap.multipass
   gui:
-    environment:
-      LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
-      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
-      QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
+    environment: *client-environment
     command: bin/multipass-gui
 
 parts:

diff --git a/src/client/cli/cmd/set.cpp b/src/client/cli/cmd/set.cpp
@@ -63,22 +63,33 @@ QString cmd::Set::description() const
 
 mp::ParseCode cmd::Set::parse_args(mp::ArgParser* parser)
 {
-    parser->addPositionalArgument("key", "Path to the option to configure.", "<key>");
-    parser->addPositionalArgument("value", "Value to set the option to.", "<value>");
+    parser->addPositionalArgument(
+        "keyval",
+        "A key-value pair. The key specifies a path to the option to configure. The value is its intended value.",
+        "<key>=<value>");
 
     auto status = parser->commandParse(this);
     if (status == ParseCode::Ok)
     {
         const auto args = parser->positionalArguments();
-        if (args.count() == 2)
+        if (args.size() != 1)
         {
-            key = args.at(0);
-            val = args.at(1);
+            cerr << "Need exactly one key-value pair.\n";
+            status = ParseCode::CommandLineError;
         }
         else
         {
-            cerr << "Need exactly one option key and one value\n";
-            status = ParseCode::CommandLineError;
+            const auto keyval = args.at(0).split('=');
+            if (keyval.size() != 2 || keyval.contains(QStringLiteral("")))
+            {
+                cerr << "Bad key-value format.\n";
+                status = ParseCode::CommandLineError;
+            }
+            else
+            {
+                key = keyval.at(0);
+                val = keyval.at(1);
+            }
         }
     }
 

diff --git a/src/daemon/daemon_main.cpp b/src/daemon/daemon_main.cpp
@@ -26,6 +26,7 @@
 #include <multipass/name_generator.h>
 #include <multipass/platform.h>
 #include <multipass/platform_unix.h>
+#include <multipass/settings.h>
 #include <multipass/utils.h>
 #include <multipass/version.h>
 #include <multipass/virtual_machine_factory.h>
@@ -35,6 +36,8 @@
 #include <multipass/format.h>
 
 #include <QCoreApplication>
+#include <QFileSystemWatcher>
+#include <QObject>
 
 #include <csignal>
 #include <cstring>
@@ -48,6 +51,7 @@ namespace mpp = multipass::platform;
 
 namespace
 {
+constexpr const int settings_changed_code = 42;
 const std::vector<std::string> supported_socket_groups{"sudo", "adm", "admin"};
 
 void set_server_permissions(const std::string& server_address)
@@ -76,6 +80,12 @@ void set_server_permissions(const std::string& server_address)
         throw std::runtime_error("Could not set permissions for the multipass socket.");
 }
 
+void init_settings(const QString& filename)
+{
+    QFile file{filename};
+    file.open(QIODevice::WriteOnly | QIODevice::Append);
+}
+
 class UnixSignalHandler
 {
 public:
@@ -102,6 +112,16 @@ class UnixSignalHandler
 private:
     mp::AutoJoinThread signal_handling_thread;
 };
+
+void monitor_and_quit_on_settings_change()
+{
+    static const auto filename = mp::Settings::get_daemon_settings_file_path();
+    init_settings(filename); // create if not there
+
+    static QFileSystemWatcher monitor{{filename}};
+    QObject::connect(&monitor, &QFileSystemWatcher::fileChanged, [] { QCoreApplication::exit(settings_changed_code); });
+}
+
 } // namespace
 
 int main(int argc, char* argv[]) // clang-format off
@@ -117,14 +137,15 @@ try // clang-format on
     auto config = builder.build();
     auto server_address = config->server_address;
 
+    monitor_and_quit_on_settings_change();
     mp::Daemon daemon(std::move(config));
 
     set_server_permissions(server_address);
 
-    QCoreApplication::exec();
+    auto ret = QCoreApplication::exec();
 
     mpl::log(mpl::Level::info, "daemon", "Goodbye!");
-    return EXIT_SUCCESS;
+    return ret;
 }
 catch (const std::exception& e)
 {

diff --git a/src/platform/platform_linux.cpp b/src/platform/platform_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Canonical, Ltd.
+ * Copyright (C) 2017-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,36 +13,68 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Alberto Aguirre <alberto.aguirre@canonical.com>
- *
  */
 
+#include <multipass/constants.h>
+#include <multipass/format.h>
 #include <multipass/platform.h>
-
+#include <multipass/settings.h>
 #include <multipass/virtual_machine_factory.h>
 
 #include "backends/libvirt/libvirt_virtual_machine_factory.h"
 #include "backends/qemu/qemu_virtual_machine_factory.h"
 #include "logger/journald_logger.h"
 #include <disabled_update_prompt.h>
 
+#include <QtGlobal>
+
 namespace mp = multipass;
 
+namespace
+{
+
+QString get_driver_str()
+{
+    auto driver = qgetenv(mp::driver_env_var);
+    return driver.isEmpty() ? mp::Settings::instance().get(mp::driver_key) : driver.toLower();
+}
+
+} // namespace
+
 std::string mp::platform::default_server_address()
 {
     return {"unix:/run/multipass_socket"};
 }
 
-mp::VirtualMachineFactory::UPtr mp::platform::vm_backend(const mp::Path& data_dir)
+QString mp::platform::default_driver()
 {
-    auto driver = qgetenv("MULTIPASS_VM_DRIVER");
+    return QStringLiteral("qemu");
+}
 
-    if (driver.isEmpty() || driver == "QEMU")
+QString mp::platform::daemon_config_home() // temporary
+{
+    auto ret = QString{qgetenv("DAEMON_CONFIG_HOME")};
+    if (ret.isEmpty())
+        ret = QStringLiteral("/root/.config");
+
+    ret = QDir{ret}.absoluteFilePath(mp::daemon_name);
+    return ret;
+}
+
+bool mp::platform::is_backend_supported(const QString& backend)
+{
+    return backend == "qemu" || backend == "libvirt";
+}
+
+mp::VirtualMachineFactory::UPtr mp::platform::vm_backend(const mp::Path& data_dir)
+{
+    const auto& driver = get_driver_str();
+    if (driver == QStringLiteral("qemu"))
         return std::make_unique<QemuVirtualMachineFactory>(data_dir);
-    else if (driver == "LIBVIRT")
+    else if (driver == QStringLiteral("libvirt"))
         return std::make_unique<LibVirtVirtualMachineFactory>(data_dir);
-
-    throw std::runtime_error("Invalid virtualization driver set in the environment");
+    else
+        throw std::runtime_error(fmt::format("Unsupported virtualization driver: {}", driver));
 }
 
 mp::UpdatePrompt::UPtr mp::platform::make_update_prompt()