Hello community, here is the log from the commit of package aaa_base for openSUSE:12.1:Update:Test checked in at 2012-03-16 18:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/aaa_base (Old) and /work/SRC/openSUSE:12.1:Update:Test/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/aaa_base/aaa_base.changes 2012-02-09 15:38:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.aaa_base.new/aaa_base.changes 2012-03-16 18:23:01.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 14 01:04:13 CET 2012 - [email protected] + +- fix chkconfig for systemd (bnc#732934) + +------------------------------------------------------------------- New: ---- aaa_base-chkconfig-bnc-732934.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.oKw99t/_old 2012-03-16 18:23:02.000000000 +0100 +++ /var/tmp/diff_new_pack.oKw99t/_new 2012-03-16 18:23:02.000000000 +0100 @@ -20,10 +20,23 @@ Version: 12.1 Release: 0 Url: http://gitorious.org/opensuse/aaa_base -Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} +Provides: bin +Provides: bootutls +Provides: etc +Provides: skeleng +Provides: skelger Obsoletes: aaa_skel < %{version} -Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc +Requires: /bin/login +Requires: /bin/mktemp +Requires: /usr/bin/find +Requires: /usr/bin/tput +Requires: /usr/bin/xargs +Requires: cpio +Requires: distribution-release +Requires: filesystem +Requires: mingetty +Requires: psmisc Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Summary: SUSE Linux Base Package @@ -35,6 +48,7 @@ Source99: aaa_base-rpmlintrc Patch0: systemd_no_wrap_service.patch Patch1: Strip-boot.d-also-from-rc-symbolic-links-bnc-739217.patch +Patch2: aaa_base-chkconfig-bnc-732934.patch %description This package installs several important configuration files. Central @@ -55,6 +69,7 @@ %setup -n aaa_base %patch0 -p1 %patch1 -p1 +%patch2 -p0 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} ++++++ aaa_base-chkconfig-bnc-732934.patch ++++++ --- files/sbin/chkconfig +++ files/sbin/chkconfig @@ -8,6 +8,7 @@ my $inetddir = '/etc/inetd.d'; my $xinetddir = '/etc/xinetd.d'; my $systemd_service_path = '/lib/systemd/system'; +my $systemd_etc_service_path = '/etc/systemd/system'; my $systemd_binary_path = '/bin/systemd'; my %to_d = ( @@ -471,7 +472,7 @@ sub is_overriden_by_systemd { my $service = shift; my $root = shift; - return -e "$root/$systemd_service_path/$service.service"; + return -e "$root/$systemd_service_path/$service.service" or -e "$root/$systemd_etc_service_path/$service.service"; } sub forward_to_systemd { @@ -680,6 +681,14 @@ my $want = shift @services; $want = normalize($s, $want); $status = 1, next unless defined $want; + if (($root ne "/") or (($root eq "/") and is_systemd_active()) and is_overriden_by_systemd ($s,$root)) { + if ($want ne "") { + push @enable, $s; + } else { + push @remove, $s; + } + next; + } $current{$s} = getcurrent($s) unless defined $current{$s}; $status = 1, next unless defined $current{$s}; my $current = $current{$s}; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
