diff options
Diffstat (limited to 'meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 135492d713..5563227d55 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -5,9 +5,17 @@ # Upstream-status: Pending # # Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- webmin-1.570.orig/init/index.cgi -+++ webmin-1.570/init/index.cgi -@@ -48,19 +48,20 @@ elsif ($init_mode eq "init" && $access{' +# Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + init/index.cgi | 27 ++++++++++++++------------- + 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'}) { : "$config{'init_dir'}/$ac[0]"); } @runlevels = &list_runlevels(); @@ -41,11 +49,11 @@ # For each action, look at /etc/rc*.d/* files to see if it is # started at boot -Index: webmin-1.570/init/init-lib.pl -=================================================================== ---- webmin-1.570.orig/init/init-lib.pl -+++ webmin-1.570/init/init-lib.pl -@@ -108,15 +108,17 @@ List boot time action names from init.d, +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. =cut sub list_actions { @@ -56,12 +64,15 @@ Index: webmin-1.570/init/init-lib.pl opendir(DIR, $dir); foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || - $f eq "core" || $f eq "README" || $f eq "rc" || $f eq "rcS" || +@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || -- $f =~ /^\.depend\./ || $f eq '.legacy-bootordering') { next; } -+ $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || -+ grep {$_ eq $f} @exclude ) { next; } + $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || +- $f =~ /^mandrake/) { next; } ++ $f =~ /^mandrake/ || grep {$_ eq $f} @exclude ) { next; } if (@stbuf = stat("$dir/$f")) { push(@rv, "$f $stbuf[1]"); } +-- +2.0.0 + |