From 6adad2adbe7e858091ee7164913d56207dc9b87d Mon Sep 17 00:00:00 2001 From: payonel Date: Thu, 27 Sep 2018 09:48:03 -0700 Subject: [PATCH] network loot disk installed via `install` only The previous network installer was from legacy days, the new install tool provides the reboot options it was meant to have closes #2472 --- src/main/resources/assets/opencomputers/loot/network/.prop | 2 +- .../assets/opencomputers/loot/network/installNetwork.lua | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 src/main/resources/assets/opencomputers/loot/network/installNetwork.lua diff --git a/src/main/resources/assets/opencomputers/loot/network/.prop b/src/main/resources/assets/opencomputers/loot/network/.prop index cea2062f9..5c7c608fc 100644 --- a/src/main/resources/assets/opencomputers/loot/network/.prop +++ b/src/main/resources/assets/opencomputers/loot/network/.prop @@ -1 +1 @@ -{fromDir="/data/"} +{label="Network", reboot=true, fromDir="/data/"} diff --git a/src/main/resources/assets/opencomputers/loot/network/installNetwork.lua b/src/main/resources/assets/opencomputers/loot/network/installNetwork.lua deleted file mode 100644 index 817e3c840..000000000 --- a/src/main/resources/assets/opencomputers/loot/network/installNetwork.lua +++ /dev/null @@ -1,6 +0,0 @@ -local filesystem = require "filesystem" -local shell = require "shell" -local process = require "process" - -shell.execute("install --noboot --nolabelset --name=Network --fromDir=/data/ --from="..filesystem.get(process.running()).address) -print("You must reboot to start network services.")