From 4050d5fb4ac937224d7d1612803516ff1bd0d4895f9fe984eef993ad25800629 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Sep 2015 12:10:53 +0000 Subject: [PATCH] Accepting request 329506 from home:fbui:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/329506 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=901 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 9 +++++---- systemd.changes | 5 +++++ systemd.spec | 9 +++++---- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 616e79af..953b65ca 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 7 11:50:21 UTC 2015 - fbui@suse.com + +- restore usage of LUA in %pretrans. + ------------------------------------------------------------------- Mon Sep 7 08:09:05 UTC 2015 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 47db80fc..be60d0f9 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -992,10 +992,11 @@ if [ $1 -eq 0 ]; then rm -f /etc/systemd/system/default.target 2>&1 || : fi -%pretrans -n udev%{?mini} -if test -e /lib/udev -a ! -e /usr/lib/udev; then - ln -s /lib/udev /usr/lib/udev -fi +# pretrans section must always use lua +%pretrans -n %{udevpkgname} -p +if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then + posix.symlink("/lib/udev", "/usr/lib/udev") +end %pre -n udev%{?mini} if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then diff --git a/systemd.changes b/systemd.changes index 616e79af..953b65ca 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 7 11:50:21 UTC 2015 - fbui@suse.com + +- restore usage of LUA in %pretrans. + ------------------------------------------------------------------- Mon Sep 7 08:09:05 UTC 2015 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 49f7cf0c..bdc5592b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -987,10 +987,11 @@ if [ $1 -eq 0 ]; then rm -f /etc/systemd/system/default.target 2>&1 || : fi -%pretrans -n udev%{?mini} -if test -e /lib/udev -a ! -e /usr/lib/udev; then - ln -s /lib/udev /usr/lib/udev -fi +# pretrans section must always use lua +%pretrans -n %{udevpkgname} -p +if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then + posix.symlink("/lib/udev", "/usr/lib/udev") +end %pre -n udev%{?mini} if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then