Skip to content
Snippets Groups Projects
Verified Commit 89a583c7 authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

Revert "Add mox-shutdown-powersave to base-minimal system"

This reverts commit 7078c3bd.
parent ab7dd7fc
1 merge request!42Remove powerdown workaround
...@@ -15,7 +15,6 @@ forInstallCritical(kmod,file2args(kmod.list)) ...@@ -15,7 +15,6 @@ forInstallCritical(kmod,file2args(kmod.list))
if board == "mox" then if board == "mox" then
forInstallCritical(kmod,file2args(kmod-mox.list)) forInstallCritical(kmod,file2args(kmod-mox.list))
Install("mox-support", { critical = true }) Install("mox-support", { critical = true })
Install("mox-shutdown-powersave", { priority = 40 })
Install("kmod-ath10k-ct", "zram-swap", { priority = 40 }) Install("kmod-ath10k-ct", "zram-swap", { priority = 40 })
elseif board == "omnia" then elseif board == "omnia" then
forInstallCritical(kmod,file2args(kmod-omnia.list)) forInstallCritical(kmod,file2args(kmod-omnia.list))
......
From e00f328fa7e094116c7ee632de91d38c170ae694 Mon Sep 17 00:00:00 2001 From 320514cb6417b3eb237b127b298f799fb518d1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz> From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Tue, 29 May 2018 16:13:18 +0200 Date: Tue, 29 May 2018 16:13:18 +0200
Subject: [PATCH] base-files: do not automatically activate services and Subject: [PATCH] base-files: do not automatically activate services and
...@@ -15,13 +15,13 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz> ...@@ -15,13 +15,13 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz>
Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz> Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
--- ---
package/base-files/Makefile | 11 ++++ package/base-files/Makefile | 11 ++++
package/base-files/files/etc/services_wanted | 56 ++++++++++++++++++++ package/base-files/files/etc/services_wanted | 54 ++++++++++++++++++++
package/base-files/files/lib/functions.sh | 16 +++--- package/base-files/files/lib/functions.sh | 16 +++---
3 files changed, 77 insertions(+), 6 deletions(-) 3 files changed, 75 insertions(+), 6 deletions(-)
create mode 100644 package/base-files/files/etc/services_wanted create mode 100644 package/base-files/files/etc/services_wanted
diff --git a/package/base-files/Makefile b/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2923a1c..f96228a 100644 index 2923a1c6ac..f96228aacd 100644
--- a/package/base-files/Makefile --- a/package/base-files/Makefile
+++ b/package/base-files/Makefile +++ b/package/base-files/Makefile
@@ -195,6 +195,17 @@ define Package/base-files/install @@ -195,6 +195,17 @@ define Package/base-files/install
...@@ -44,10 +44,10 @@ index 2923a1c..f96228a 100644 ...@@ -44,10 +44,10 @@ index 2923a1c..f96228a 100644
-include $(PLATFORM_SUBDIR)/base-files.mk -include $(PLATFORM_SUBDIR)/base-files.mk
diff --git a/package/base-files/files/etc/services_wanted b/package/base-files/files/etc/services_wanted diff --git a/package/base-files/files/etc/services_wanted b/package/base-files/files/etc/services_wanted
new file mode 100644 new file mode 100644
index 0000000..530604e index 0000000000..96ddfb2d6e
--- /dev/null --- /dev/null
+++ b/package/base-files/files/etc/services_wanted +++ b/package/base-files/files/etc/services_wanted
@@ -0,0 +1,56 @@ @@ -0,0 +1,55 @@
+asm1062-fix +asm1062-fix
+atd +atd
+atsha204-feed-entropy +atsha204-feed-entropy
...@@ -73,7 +73,6 @@ index 0000000..530604e ...@@ -73,7 +73,6 @@ index 0000000..530604e
+lvm2 +lvm2
+lxc-auto +lxc-auto
+mountd +mountd
+mox-shutdown-powersave
+mox_autosetup +mox_autosetup
+nethist +nethist
+network +network
...@@ -105,7 +104,7 @@ index 0000000..530604e ...@@ -105,7 +104,7 @@ index 0000000..530604e
+usbmode +usbmode
+watchdog_adjust +watchdog_adjust
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index edce75e..6bd0701 100755 index edce75e8ff..6bd07011cf 100755
--- a/package/base-files/files/lib/functions.sh --- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh
@@ -244,13 +244,17 @@ default_postinst() { @@ -244,13 +244,17 @@ default_postinst() {
...@@ -133,5 +132,5 @@ index edce75e..6bd0701 100755 ...@@ -133,5 +132,5 @@ index edce75e..6bd0701 100755
done done
-- --
2.23.0 2.21.0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment