Hello community,
here is the log from the commit of package systemd-rpm-macros for
openSUSE:Factory checked in at 2015-10-14 16:34:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2015-09-19 06:51:37.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes
2015-10-14 16:34:30.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 18 15:27:04 CEST 2015 - sbra...@suse.com
+
+- Skip %systemd_preset_* during the clean installation to prevent
+ presetting of all services (boo#946216).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.bgcdhQ/_old 2015-10-14 16:34:31.000000000 +0200
+++ /var/tmp/diff_new_pack.bgcdhQ/_new 2015-10-14 16:34:31.000000000 +0200
@@ -228,42 +228,50 @@
%{nil}
%systemd_preset_pre() \
-cd /usr/lib/systemd/system-preset; \
-declare -a PRESET_FILES; \
-declare -A PRESETS; \
-PRESET_FILES=(*.preset); \
-if ! test -f presets-all.rpm-tmp ; then \
- for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
- FILE=${PRESET_FILES[i]}; \
- exec 3<"$FILE"; \
- while read -u3 ENABLE SERVICE PAD ; do \
- if test -z "$SERVICE" ; then \
- continue; \
- fi; \
- case "$ENABLE" in \
- enable|disable) \
- PRESETS[$SERVICE]=$ENABLE;; \
- esac; \
+if ! test -f /usr/lib/systemd/system-preset/99-default-disable.preset ; then \
+ mkdir -p /usr/lib/systemd/system-preset; \
+ touch /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp; \
+else \
+ cd /usr/lib/systemd/system-preset; \
+ declare -a PRESET_FILES; \
+ declare -A PRESETS; \
+ PRESET_FILES=(*.preset); \
+ if ! test -f systemd_preset-old.rpm-tmp ; then \
+ for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
+ FILE=${PRESET_FILES[i]}; \
+ exec 3<"$FILE"; \
+ while read -u3 ENABLE SERVICE PAD ; do \
+ if test -z "$SERVICE" ; then \
+ continue; \
+ fi; \
+ case "$ENABLE" in \
+ enable|disable) \
+ PRESETS[$SERVICE]=$ENABLE;; \
+ esac; \
+ done; \
+ exec 3<&-; \
done; \
- exec 3<&-; \
- done; \
- exec 3>presets-all.rpm-tmp; \
- for PRESET in "${!PRESETS[@]}" ; do \
- echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
- done; \
- exec 3>&-; \
+ exec 3>systemd_preset-old.rpm-tmp; \
+ for PRESET in "${!PRESETS[@]}" ; do \
+ echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
+ done; \
+ exec 3>&-; \
+ fi; \
fi; \
%{nil}
%systemd_preset_posttrans() \
+if test -f /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp ; then \
+ rm -f /usr/lib/systemd/system-preset/systemd_preset-{old,skip}.rpm-tmp;
\
+fi; \
cd /usr/lib/systemd/system-preset; \
-declare -a PRESET_FILES; \
-declare -A PRESETS_OLD; \
-declare -A PRESETS_OLD_WILDCARD; \
-declare -A PRESETS; \
-declare -A PRESETS_WILDCARD; \
-if test -f presets-all.rpm-tmp ; then \
- exec 3<presets-all.rpm-tmp; \
+if test -f systemd_preset-old.rpm-tmp ; then \
+ declare -a PRESET_FILES; \
+ declare -A PRESETS_OLD; \
+ declare -A PRESETS_OLD_WILDCARD; \
+ declare -A PRESETS; \
+ declare -A PRESETS_WILDCARD; \
+ exec 3<systemd_preset-old.rpm-tmp; \
while read -u3 ENABLE SERVICE PAD ; do \
if test -z "$SERVICE" ; then \
continue; \
@@ -297,8 +305,8 @@
done; \
if test -x /usr/bin/systemctl ; then \
/usr/bin/systemctl --type=service,socket list-unit-files; \
- fi >service-states.rpm-tmp; \
- exec 3<service-states.rpm-tmp; \
+ fi >systemd_preset-states.rpm-tmp; \
+ exec 3<systemd_preset-states.rpm-tmp; \
read -u3 PAD; \
while read -u3 SERVICE ENABLE PAD ; do \
if test -z "$SERVICE" ; then \
@@ -328,6 +336,6 @@
fi; \
done; \
exec 3<&-; \
- rm -f presets-all.rpm-tmp service-states.rpm-tmp; \
+ rm -f systemd_preset-old.rpm-tmp systemd_preset-states.rpm-tmp; \
fi; \
%{nil}
