SHA256
1
0
forked from pool/systemd

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
This commit is contained in:
Franck Bui 2017-08-29 11:50:06 +00:00 committed by Git OBS Bridge
parent 491001c577
commit 55c7f080ed
5 changed files with 28 additions and 6 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1 oid sha256:ca0e6e98e69ba6a809d145ac5562f594c86acce052fbfbbf291fa61e9b8352a2
size 3350088 size 3351252

View File

@ -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 Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com

View File

@ -765,8 +765,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
end end
%pre -n udev%{?mini} %pre -n udev%{?mini}
%regenerate_initrd_post
if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then
rm /usr/lib/udev rm /usr/lib/udev
mv /lib/udev /usr/lib mv /lib/udev /usr/lib
@ -784,6 +782,7 @@ if [ $1 -eq 1 ]; then
fi fi
%post -n udev%{?mini} %post -n udev%{?mini}
%regenerate_initrd_post
%udev_hwdb_update %udev_hwdb_update
# add KERNEL name match to existing persistent net rules # add KERNEL name match to existing persistent net rules

View File

@ -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 Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com

View File

@ -763,8 +763,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
end end
%pre -n udev%{?mini} %pre -n udev%{?mini}
%regenerate_initrd_post
if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then
rm /usr/lib/udev rm /usr/lib/udev
mv /lib/udev /usr/lib mv /lib/udev /usr/lib
@ -782,6 +780,7 @@ if [ $1 -eq 1 ]; then
fi fi
%post -n udev%{?mini} %post -n udev%{?mini}
%regenerate_initrd_post
%udev_hwdb_update %udev_hwdb_update
# add KERNEL name match to existing persistent net rules # add KERNEL name match to existing persistent net rules