From a8398b287f8d0baaf9eeadbefd8518debaadad213333d2e93bc7144a1ed4fb5c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 24 Jan 2011 15:02:36 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/aaa_base revision 248.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=e381bd507ca4a8246f1d78d4afd5d561 --- aaa_base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aaa_base.spec b/aaa_base.spec index 2a4d36b..9f51511 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 20 +Release: 21 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger From f8e358e91e23f85ed86dc29d8ea994ec46b4f229751ad904b83c817308dc27dd Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 25 Jan 2011 08:48:51 +0000 Subject: [PATCH 2/3] resolve conflicts OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=195 --- aaa_base.changes | 7 +++++++ aaa_base.post | 5 ++++- aaa_base.pre | 1 - aaa_base.tar.bz2 | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 525612d..5428328 100644 --- a/aaa_base.changes +++ b/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 diff --git a/aaa_base.post b/aaa_base.post index b7fddf1..36eae5f 100644 --- a/aaa_base.post +++ b/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 # diff --git a/aaa_base.pre b/aaa_base.pre index 2508114..aadc26e 100644 --- a/aaa_base.pre +++ b/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 diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 0c7cb88..429c554 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dcbf6fd37ef0f429a1174ea1168b3d0d5bf2b3288c10a8d3ea608898dd45ff9 -size 82029 +oid sha256:981b012dad0ed38ad66e495068afa513be6db7d480a12c4dba6698b5239d4002 +size 81991 From 2ae2f59b875311b78e25dc06e774a516f8410fac3d32e0cacbd60d84e247df84 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 25 Jan 2011 08:50:17 +0000 Subject: [PATCH 3/3] only make mtab a symlink if it didn't exist before OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=196 --- aaa_base.post | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aaa_base.post b/aaa_base.post index 36eae5f..94ce4e8 100644 --- a/aaa_base.post +++ b/aaa_base.post @@ -141,8 +141,7 @@ fi # # create mtab if it does not exist # -if test ! -L /etc/mtab; then - rm -f /etc/mtab +if test ! -e /etc/mtab; then ln -sf /proc/self/mounts /etc/mtab fi #