diff --git a/aaa_base.changes b/aaa_base.changes index 1f0918e..b82f93f 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 19 11:49:51 CET 2008 - ro@suse.de + +- don't try to check rootfs if it is a network filesystem + (bnc#441234) + +------------------------------------------------------------------- +Wed Nov 19 00:22:13 CET 2008 - ro@suse.de + +- remove patch aaa_base.disable-ps3-vram-swap.patch again + ------------------------------------------------------------------- Tue Nov 18 11:59:16 CET 2008 - meissner@suse.de diff --git a/aaa_base.disable-ps3-vram-swap.patch b/aaa_base.disable-ps3-vram-swap.patch deleted file mode 100644 index a343019..0000000 --- a/aaa_base.disable-ps3-vram-swap.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - etc/init.d/boot.swap | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/etc/init.d/boot.swap -+++ b/etc/init.d/boot.swap -@@ -96,7 +96,8 @@ case "$1" in - if [ ! -d "/sys/devices" ] || [ -d "/sys/power" ]; then - check_swap_sig - fi -- enable_ps3_vram_swap -+ # disable PS3 vram swap for now as it causes trouble with FW 2.50 -+ # enable_ps3_vram_swap - echo "Activating remaining swap-devices in /etc/fstab..." - swapon -a &> /dev/null - rc_status -v1 -r diff --git a/aaa_base.spec b/aaa_base.spec index ecf922c..1f8dd88 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -28,7 +28,7 @@ Recommends: cron logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.1 -Release: 10005 +Release: 10006 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -39,7 +39,6 @@ Source8: get_kernel_version.c Source20: aaa_base-rpmlintrc Source21: aaa_base.pre Source22: aaa_base.post -Patch1: aaa_base.disable-ps3-vram-swap.patch # %ifarch x86_64 # Obsoletes: tpctl <= 4.17 # %endif @@ -60,7 +59,6 @@ Authors: %prep %setup -n aaa_base -b 5 -b 7 -%patch1 -p1 cd .. mkdir -p scripts cp -v %{SOURCE21} scripts @@ -141,6 +139,11 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %defattr(-,root,root) %changelog +* Wed Nov 19 2008 ro@suse.de +- don't try to check rootfs if it is a network filesystem + (bnc#441234) +* Wed Nov 19 2008 ro@suse.de +- remove patch aaa_base.disable-ps3-vram-swap.patch again * Tue Nov 18 2008 meissner@suse.de - disable MALLOC debugging for openSUSE 11.1 RC1. (bnc#441937) * Mon Nov 17 2008 werner@suse.de diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 12fbf6b..5103402 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:6a2bf4c284913c12b618fc20c3993d1543df0adf06e7271daf5abb4e5e62aaa3 -size 79790 +oid sha256:664475f65ce90c0b3a133b1607bb4e486886d3a38b35a212b1097a7071423005 +size 79809