From 55c7f080edbf7b49e2883f9bc6b45cc8f1f413ebcf943967a4591c6e07b32c9c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 29 Aug 2017 11:50:06 +0000 Subject: [PATCH] Accepting request 519303 from home:fbui:systemd:Factory - Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) - %regenerate_initrd_post is suppsed to be used in %post (not %pre) section OBS-URL: https://build.opensuse.org/request/show/519303 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=986 --- systemd-234.tar.xz | 4 ++-- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 3 +-- systemd.changes | 12 ++++++++++++ systemd.spec | 3 +-- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 53f5ae9d..99fbec2d 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1 -size 3350088 +oid sha256:ca0e6e98e69ba6a809d145ac5562f594c86acce052fbfbbf291fa61e9b8352a2 +size 3351252 diff --git a/systemd-mini.changes b/systemd-mini.changes index 95df3373..2e2d936f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com + +- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 + + 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) + +------------------------------------------------------------------- +Tue Aug 1 13:39:41 UTC 2017 - fbui@suse.com + +- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section + ------------------------------------------------------------------- Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 1ed187ec..1f6a7542 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -765,8 +765,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then end %pre -n udev%{?mini} -%regenerate_initrd_post - if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then rm /usr/lib/udev mv /lib/udev /usr/lib @@ -784,6 +782,7 @@ if [ $1 -eq 1 ]; then fi %post -n udev%{?mini} +%regenerate_initrd_post %udev_hwdb_update # add KERNEL name match to existing persistent net rules diff --git a/systemd.changes b/systemd.changes index 95df3373..2e2d936f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com + +- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 + + 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) + +------------------------------------------------------------------- +Tue Aug 1 13:39:41 UTC 2017 - fbui@suse.com + +- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section + ------------------------------------------------------------------- Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 56d0a028..6d5fda8d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -763,8 +763,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then end %pre -n udev%{?mini} -%regenerate_initrd_post - if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then rm /usr/lib/udev mv /lib/udev /usr/lib @@ -782,6 +780,7 @@ if [ $1 -eq 1 ]; then fi %post -n udev%{?mini} +%regenerate_initrd_post %udev_hwdb_update # add KERNEL name match to existing persistent net rules