Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2013-11-14 10:39:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2013-10-10 10:36:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2013-11-14 10:39:30.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 12 09:35:59 UTC 2013 - [email protected] + +- chkconfig: add option -L to only list enabled services (bnc#707823) +- updated comment in sysconfig.language for ROOT_USES_LANG (bnc#505417) +- tighten regexp of ignored files in chkconfig (bnc#828820) +- protect from reading home kshrc twice (bnc#848697) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base-13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.1/files/etc/profile new/aaa_base-13.1/files/etc/profile --- old/aaa_base-13.1/files/etc/profile 2013-10-02 13:39:29.000000000 +0200 +++ new/aaa_base-13.1/files/etc/profile 2013-11-11 17:51:38.000000000 +0100 @@ -356,7 +356,7 @@ if test ! /etc/bash.bashrc -ef /etc/ksh.kshrc ; then test -r /etc/bash.bashrc && . /etc/bash.bashrc fi - if test -n "$ENV" -a "$ENV" != "$HOME/.kshrc" -a -z "$_HOMEKSHRC" ; then + if test -n "$ENV" -a "$ENV" != "\$HOME/.kshrc" -a "$ENV" != "$HOME/.kshrc" -a -z "$_HOMEKSHRC" ; then # loop detection readonly _HOMEKSHRC=true test -r $HOME/.kshrc && . $HOME/.kshrc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.1/files/usr/bin/chkconfig new/aaa_base-13.1/files/usr/bin/chkconfig --- old/aaa_base-13.1/files/usr/bin/chkconfig 2013-10-02 13:39:29.000000000 +0200 +++ new/aaa_base-13.1/files/usr/bin/chkconfig 2013-11-11 17:51:38.000000000 +0100 @@ -362,7 +362,7 @@ for (ls($initdir)) { next unless -f "$initdir/$_"; next if /^README/ || /^core/; - next if /~$/ || /^[\d\$\.#_\-\\\*]/ || /\.(rpm|ba|old|new|save|swp|core)/; + next if /~$/ || /^[\d\$\.#_\-\\\*]/ || /\.(rpm.*|ba.|old|new|save|swp|core)$/; $known_rc{$_} = 1; $known_all{$_} = 1; } @@ -528,6 +528,7 @@ chkconfig -e|--edit [names] (configure services) chkconfig -s|--set [name state]... (configure services) chkconfig -l|--list [--deps] [names] (shows the links) + chkconfig -L|--liston [--deps] [names] (as -l, enabled in at least 1 level) chkconfig -c|--check name [state] (check state) chkconfig -a|--add [names] (runs insserv) chkconfig -d|--del [names] (runs insserv -r) @@ -543,6 +544,7 @@ Getopt::Long::Configure('no_ignore_case'); if (!GetOptions('list|l' => \&addmode, + 'L|liston' => \&addmode, 'terse|t' => \&addmode, 'add|a' => \&addmode, 'del|d' => \&addmode, @@ -583,7 +585,7 @@ } $mode = 't' if $mode eq ''; -initlinks_rc() if $mode eq 'e' || $mode eq 't' || $mode eq 's' || $mode eq 'c' || $mode eq 'l'; +initlinks_rc() if $mode eq 'e' || $mode eq 't' || $mode eq 's' || $mode eq 'c' || $mode eq 'l' || $mode eq 'L'; if (!@ARGV && !$allservices) { my $l; @@ -781,7 +783,7 @@ $mode = 'l'; initlinks_rc(); } -if ($mode eq 'l') { +if ($mode eq 'l' || $mode eq 'L') { my $usecolor = -t STDOUT; if (is_systemd_active()) { print STDERR <<EOF; @@ -797,25 +799,30 @@ print STDERR "$s: unknown service\n" unless $known_all{$s}; next; } - printf "%-24s", $s; + my $line = ""; my $l; for $l (0, 1, 2, 3, 4, 5, 6, 'B', 'S') { next if ($l eq 'B' || $l eq 'S') && !$links{$l}->{$s}; if ($usecolor) { - print $links{$l}->{$s} ? " \e[0;1;32m$l:on\e[m " : " $l:off"; + $line .= ( $links{$l}->{$s} ? " \e[0;1;32m$l:on\e[m " : " $l:off" ); } else { - print $links{$l}->{$s} ? " $l:on " : " $l:off"; + $line .= ( $links{$l}->{$s} ? " $l:on " : " $l:off" ); } } - print getdeps_rc($s) if $printdeps; - print "\n"; + if (($mode eq 'l') || ($line =~ /:on/)) { + printf "%-24s%s", $s, $line; + print getdeps_rc($s) if $printdeps; + print "\n"; + } } my @inetd_services = grep {$known_inetd{$_}} @services; if (@inetd_services) { print "inetd based services:\n"; for $s (@inetd_services) { + my $enabled = getreal_inetd($s) ne ''; + next if !$enabled && $mode eq 'L'; printf " %-19s ", "$s:"; - if (getreal_inetd($s) ne '') { + if ($enabled) { print $usecolor ? "\e[0;1;32mon\e[m\n" : "on\n"; } else { print "off\n"; @@ -826,8 +833,10 @@ if (@xinetd_services) { print "xinetd based services:\n"; for $s (@xinetd_services) { + my $enabled = getreal_xinetd($s) ne ''; + next if !$enabled && $mode eq 'L'; printf " %-19s ", "$s:"; - if (getreal_xinetd($s) ne '') { + if ($enabled) { print $usecolor ? "\e[0;1;32mon\e[m\n" : "on\n"; } else { print "off\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.language new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.language --- old/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.language 2013-10-02 13:39:29.000000000 +0200 +++ new/aaa_base-13.1/files/var/adm/fillup-templates/sysconfig.language 2013-11-11 17:51:38.000000000 +0100 @@ -85,6 +85,7 @@ # This defines if the user "root" should use the locale settings # which are defined here. # Value "ctype" means that root uses just LC_CTYPE. +# Value "yes" means that root uses the full settings.. # ROOT_USES_LANG="ctype" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
