resolve conflicts

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=195

aaa_base.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 25 08:42:14 UTC 2011 - lnussel@suse.de
+
+- at boot make sure /etc/mtab is a symlink (bnc#665494) so
+  util-linux doesn't need to do it in %post
+- don't wait for loop images to appear as block devices (bnc#666150)
+
 -------------------------------------------------------------------
 Wed Jan 19 10:12:19 UTC 2011 - lnussel@suse.de
 

aaa_base.post

@@ -141,7 +141,10 @@ fi
 #
 # create mtab if it does not exist
 #
-touch /etc/mtab
+if test ! -L /etc/mtab; then
+    rm -f /etc/mtab
+    ln -sf /proc/self/mounts /etc/mtab
+fi
 #
 # make sure that several log files exist
 #

aaa_base.pre

@@ -33,7 +33,6 @@ done
 # deleted db2 groups and users were uids 46,47,48 and gids 46,47,48
 #
 mkdir -p /etc
-touch /etc/mtab
 mkdir -p /var/adm/fillup-templates
 echo "root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/bin:/bin/bash

aaa_base.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dcbf6fd37ef0f429a1174ea1168b3d0d5bf2b3288c10a8d3ea608898dd45ff9
+oid sha256:981b012dad0ed38ad66e495068afa513be6db7d480a12c4dba6698b5239d4002
-size 82029
+size 81991