From ba93ae6a0b621a9cb09457886fab1c7963ca3f749b85e4aa420b1dca3e04467b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 5 Oct 2012 10:40:58 +0000 Subject: [PATCH] Accepting request 136999 from home:a_jaeger:FactoryFix Create loop devices via tmpfiles and not via /lib/udev/devices. OBS-URL: https://build.opensuse.org/request/show/136999 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=397 --- aaa_base-12.3.tar.gz | 4 ++-- aaa_base.changes | 5 +++++ aaa_base.spec | 22 ++++++++-------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/aaa_base-12.3.tar.gz b/aaa_base-12.3.tar.gz index 34a3a7e..4336178 100644 --- a/aaa_base-12.3.tar.gz +++ b/aaa_base-12.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683954d65d8dce06c2c55571625c1bac32a647d18c3bb132214a34e9df15f837 -size 137113 +oid sha256:44a8e77938e32d994477172d5fd5de9a87917ebe6625bb33f6486259384da104 +size 137769 diff --git a/aaa_base.changes b/aaa_base.changes index f1a52fd..fbf6140 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 4 08:26:50 UTC 2012 - aj@suse.de + +- Create loop devices via tmpfiles and not via /lib/udev/devices. + ------------------------------------------------------------------- Wed Sep 26 11:18:35 UTC 2012 - aj@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index aba6c0c..9e4399e 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -46,6 +46,11 @@ Group: System/Fhs BuildRoot: %{_tmppath}/%{name}-%{version}-build # run osc service dr to recreate Source: aaa_base-%{version}.tar.gz +# +# Read README.packaging.txt before making any changes to this +# package +# +Source1: README.packaging.txt Source99: aaa_base-rpmlintrc %description @@ -73,7 +78,7 @@ malloc checks to catch potential heap corruptions. It's not installed by default as it may degrade performance. %prep -%setup +%setup -q %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} @@ -98,9 +103,6 @@ test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 for i in passwd group shadow gshadow ; do touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base done -# -# loop module auto loading bnc#661715 -mkdir -p $RPM_BUILD_ROOT/lib/udev/devices %pre -f aaa_base.pre @@ -190,6 +192,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/bin/safe-rmdir /usr/bin/setJava /usr/lib/restricted/bin/hostname +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/loop.conf /usr/sbin/Check /usr/sbin/rcpowerfail /usr/sbin/rcrandom @@ -210,16 +214,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown /var/adm/fillup-templates/sysconfig.windowmanager -%dir /lib/udev -%dir /lib/udev/devices -%ghost %attr(660,root,disk) %dev(b,7,0) /lib/udev/devices/loop0 -%ghost %attr(660,root,disk) %dev(b,7,1) /lib/udev/devices/loop1 -%ghost %attr(660,root,disk) %dev(b,7,2) /lib/udev/devices/loop2 -%ghost %attr(660,root,disk) %dev(b,7,3) /lib/udev/devices/loop3 -%ghost %attr(660,root,disk) %dev(b,7,4) /lib/udev/devices/loop4 -%ghost %attr(660,root,disk) %dev(b,7,5) /lib/udev/devices/loop5 -%ghost %attr(660,root,disk) %dev(b,7,6) /lib/udev/devices/loop6 -%ghost %attr(660,root,disk) %dev(b,7,7) /lib/udev/devices/loop7 %files extras %defattr(-,root,root)