Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
new file mode 100644
index 0000000..d957f4a
--- /dev/null
+++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
@@ -0,0 +1,29 @@
+# Remove "start on boot" option from webmin configuration, as
+# end-users should not need to configure this from the web interface
+#
+# Upstream-status: Inappropriate
+#
+# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+--- webmin-1.570.orig/webmin/index.cgi
++++ webmin-1.570/webmin/index.cgi
+@@ -79,20 +79,6 @@ print &ui_buttons_start();
+ my %miniserv;
+ &get_miniserv_config(\%miniserv);
+
+-if (&foreign_check("init")) {
+- &foreign_require("init");
+- my $starting = &init::action_status("webmin");
+- print &ui_buttons_row("bootup.cgi",
+- $text{'index_boot'},
+- $text{'index_bootmsg'}.
+- ($miniserv{'inetd'} ? "<b>$text{'index_inetd'}</b>" :
+- !$ENV{'MINISERV_CONFIG'} ? "<b>$text{'index_apache'}</b>" : ""),
+- &ui_hidden("starting", $starting),
+- &ui_radio("boot", $starting == 2 ? 1 : 0,
+- [ [ 1, $text{'yes'} ],
+- [ 0, $text{'no'} ] ]));
+- }
+-
+ # Restart Webmin
+ if (!$miniserv{'inetd'} && $ENV{'MINISERV_CONFIG'}) {
+ print &ui_buttons_row("restart.cgi",