diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 19:45:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 21:38:15 +0300 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.xz |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 5563227d5..4212917f6 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -11,11 +11,11 @@ init/init-lib.pl | 5 +++-- 2 files changed, 17 insertions(+), 15 deletions(-) -diff --git a/init/index.cgi b/init/index.cgi -index d48b793..30dafd4 100755 ---- a/init/index.cgi -+++ b/init/index.cgi -@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{'bootup'}) { +Index: webmin-1.850/init/index.cgi +=================================================================== +--- webmin-1.850.orig/init/index.cgi ++++ webmin-1.850/init/index.cgi +@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{' : "$config{'init_dir'}/$ac[0]"); } @runlevels = &list_runlevels(); @@ -49,11 +49,11 @@ index d48b793..30dafd4 100755 # For each action, look at /etc/rc*.d/* files to see if it is # started at boot -diff --git a/init/init-lib.pl b/init/init-lib.pl -index ead21ed..b41794b 100755 ---- a/init/init-lib.pl -+++ b/init/init-lib.pl -@@ -119,8 +119,9 @@ List boot time action names from init.d, such as httpd and cron. +Index: webmin-1.850/init/init-lib.pl +=================================================================== +--- webmin-1.850.orig/init/init-lib.pl ++++ webmin-1.850/init/init-lib.pl +@@ -124,8 +124,9 @@ List boot time action names from init.d, =cut sub list_actions { @@ -64,7 +64,7 @@ index ead21ed..b41794b 100755 opendir(DIR, $dir); foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || -@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { +@@ -133,7 +134,7 @@ foreach $f (sort { lc($a) cmp lc($b) } r -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || @@ -73,6 +73,3 @@ index ead21ed..b41794b 100755 if (@stbuf = stat("$dir/$f")) { push(@rv, "$f $stbuf[1]"); } --- -2.0.0 - |