Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2014-07-10 08:24:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-02 15:18:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-07-10 09:32:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 2 10:49:37 UTC 2014 - ro@suse.com + +- drop re-creation of before.local and add a comment about not + being supported if it had real content (bnc#869177) +- mark /etc/init.d/{boot,halt,after}.local as ghost (bnc#868416) + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20140604.9f4be6e.tar.xz New: ---- aaa_base-13.2+git20140702.7ebaf71.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.7u1Yne/_old 2014-07-10 09:32:12.000000000 +0200 +++ /var/tmp/diff_new_pack.7u1Yne/_new 2014-07-10 09:32:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: aaa_base -Version: 13.2+git20140604.9f4be6e +Version: 13.2+git20140702.7ebaf71 Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -113,12 +113,11 @@ for i in passwd group shadow gshadow ; do touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base done -# we copy some random script there to have a valid ghost - and we can't -# just touch as long as there is brp-55-check-boot -# we need to fix brp-55 first ;( -#for i in boot.local after.local before.local halt.local ; do -# cp $RPM_BUILD_ROOT/etc/init.d/boot.localnet $RPM_BUILD_ROOT/etc/init.d/$i -#done +mkdir -p $RPM_BUILD_ROOT/etc/init.d +for i in boot.local after.local halt.local ; do + echo "#!bin/bash" > $RPM_BUILD_ROOT/etc/init.d/$i + chmod 755 $RPM_BUILD_ROOT/etc/init.d/$i +done # install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions @@ -161,6 +160,9 @@ %ghost /var/adm/fillup-templates/group.aaa_base %ghost /var/adm/fillup-templates/gshadow.aaa_base %ghost /var/adm/fillup-templates/shadow.aaa_base +%ghost /etc/init.d/boot.local +%ghost /etc/init.d/after.local +%ghost /etc/init.d/halt.local # don't forget to also change aaa_base.post, boot.cleanup # and /etc/permissions! %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog ++++++ aaa_base-13.2+git20140604.9f4be6e.tar.xz -> aaa_base-13.2+git20140702.7ebaf71.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20140604.9f4be6e/aaa_base.pre new/aaa_base-13.2+git20140702.7ebaf71/aaa_base.pre --- old/aaa_base-13.2+git20140604.9f4be6e/aaa_base.pre 2014-06-04 10:32:49.000000000 +0200 +++ new/aaa_base-13.2+git20140702.7ebaf71/aaa_base.pre 2014-07-02 12:27:13.000000000 +0200 @@ -190,26 +190,6 @@ # # Author: Werner Fink, 2010 # -# /etc/init.d/before.local -# -# script with local commands to be executed from init before executing -# any script of a runlevel. -# -# Here you should add things, that should happen directly before entering -# a runlevel. Common environment variables for this are: -# RUNLEVEL -- The current system runlevel. -# PREVLEVEL -- The previous runlevel (useful after a runlevel switch). -# -" > /etc/init.d/before.local.new -test -e /etc/init.d/before.local || mv /etc/init.d/before.local.new /etc/init.d/before.local -rm -f /etc/init.d/before.local.new -chmod 744 /etc/init.d/before.local -echo "#! /bin/sh -# -# Copyright (c) 2010 SuSE LINUX Products GmbH, Germany. All rights reserved. -# -# Author: Werner Fink, 2010 -# # /etc/init.d/after.local # # script with local commands to be executed from init after all scripts @@ -225,6 +205,12 @@ test -e /etc/init.d/after.local || mv /etc/init.d/after.local.new /etc/init.d/after.local rm -f /etc/init.d/after.local.new chmod 744 /etc/init.d/after.local + +test -e /etc/init.d/before.local && { +grep -q "not supported by systemd" /etc/init.d/before.local || { +echo "# this file is not supported by systemd and the content will probably not be run during bootup" >> /etc/init.d/before.local +} +} mkdir -p /etc for LINK in /usr/X11R6/lib/X11 /var/X11R6/lib/fonts /usr/lib/mgetty+sendfax \ /usr/man/cat? /usr/X11R6/man/cat? /usr/openwin/man/cat? /usr/lib/news ; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org