Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-04-19 08:48:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-04-03 17:38:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-04-19 08:48:58.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 18 11:13:53 CEST 2012 - [email protected] + +- efont-unicode was renamed + +------------------------------------------------------------------- +Tue Apr 17 15:55:45 CEST 2012 - [email protected] + +- adjust rescue system setup +- installkey.gpg no longer needed + +------------------------------------------------------------------- Old: ---- installation-images-13.40.tar.bz2 New: ---- installation-images-13.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.8ryvz2/_old 2012-04-19 08:49:04.000000000 +0200 +++ /var/tmp/diff_new_pack.8ryvz2/_new 2012-04-19 08:49:04.000000000 +0200 @@ -60,7 +60,7 @@ BuildRequires: dump BuildRequires: e2fsprogs BuildRequires: ed -BuildRequires: efont-unicode +BuildRequires: efont-unicode-bitmap-fonts BuildRequires: eject BuildRequires: espeak BuildRequires: ethtool @@ -334,9 +334,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.40 +Version: 13.42 Release: 0 -Source: installation-images-13.40.tar.bz2 +Source: installation-images-13.42.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.40.tar.bz2 -> installation-images-13.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/VERSION new/installation-images-13.42/VERSION --- old/installation-images-13.40/VERSION 2012-04-03 15:57:06.000000000 +0200 +++ new/installation-images-13.42/VERSION 2012-04-18 11:13:46.000000000 +0200 @@ -1 +1 @@ -13.40 +13.42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/changelog new/installation-images-13.42/changelog --- old/installation-images-13.40/changelog 2012-04-03 15:57:10.000000000 +0200 +++ new/installation-images-13.42/changelog 2012-04-18 11:13:51.000000000 +0200 @@ -1,4 +1,11 @@ -2012-04-03: HEAD +2012-04-18: HEAD + - efont-unicode was renamed + +2012-04-17: 13.41 + - adjust rescue system setup + - installkey.gpg no longer needed + +2012-04-03: 13.40 - follow font package renaming 2012-04-02: 13.39 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/initrd/etc/prepare_rescue new/installation-images-13.42/data/initrd/etc/prepare_rescue --- old/installation-images-13.40/data/initrd/etc/prepare_rescue 2011-02-21 15:47:04.000000000 +0100 +++ new/installation-images-13.42/data/initrd/etc/prepare_rescue 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#! /bin/sh - -# ensure some trees are completely writable -for i in /etc /media /root /var ; do - cp -aL $i ${i}_tmp - rm -rf $i - mv ${i}_tmp $i -done - -if [ -f /mounts/initrd/etc/suse-blinux.conf ] ; then - grep -q '^brlname=none' /mounts/initrd/etc/suse-blinux.conf || { - cp /mounts/initrd/etc/suse-blinux.conf /etc - insserv brld - insserv sbl - } -fi - -# keep some initrd config files for rescue system -for i in etc/modprobe.d/blacklist etc/modprobe.d/noload ; do - [ -f /mounts/initrd/$i ] && cp -f /mounts/initrd/$i /$i -done - -rm -f /mounts/initrd/{*,.*} -rmdir /mounts/initrd/* 2>/dev/null -rm -rf /mounts/initrd/{bin,download,etc,lbin,lib,modules,oldroot,root,sbin,tmp,usr,var} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/initrd/initrd.file_list new/installation-images-13.42/data/initrd/initrd.file_list --- old/installation-images-13.40/data/initrd/initrd.file_list 2012-03-26 12:13:16.000000000 +0200 +++ new/installation-images-13.42/data/initrd/initrd.file_list 2012-04-17 15:24:49.000000000 +0200 @@ -11,6 +11,7 @@ d mounts d root d download +d scripts d dev/pts dev/shm d var/lib/systemd/migrated @@ -332,10 +333,10 @@ if exists(suse-build-key) suse-build-key: - m /usr/lib/rpm/gnupg/suse-build-key.gpg /installkey.gpg + /usr/lib/rpm/gnupg/suse-build-key.gpg elsif exists(openSUSE-build-key) openSUSE-build-key: - m /usr/lib/rpm/gnupg/suse-build-key.gpg /installkey.gpg + /usr/lib/rpm/gnupg/keys/* endif libblkid*: @@ -644,8 +645,8 @@ # log to console 4 x etc/syslog.conf etc -# script neeeded for rescue startup -x etc/prepare_rescue bin +# additional scripts for linuxrc +x scripts / e ldconfig -r . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/initrd/scripts/early_setup new/installation-images-13.42/data/initrd/scripts/early_setup --- old/installation-images-13.40/data/initrd/scripts/early_setup 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.42/data/initrd/scripts/early_setup 2012-04-17 15:50:20.000000000 +0200 @@ -0,0 +1,17 @@ +#! /bin/bash + +exec >&2 + +chmod 700 /root/.gnupg + +if [ -d /usr/lib/rpm/gnupg/keys ] ; then + touch /installkey.gpg + gpg --batch --homedir /root/.gnupg --no-default-keyring --ignore-time-conflict --ignore-valid-from --keyring /installkey.gpg --import /usr/lib/rpm/gnupg/keys/* +elif [ -f /usr/lib/rpm/gnupg/suse-build-key.gpg ] ; then + cp /usr/lib/rpm/gnupg/suse-build-key.gpg /installkey.gpg +fi + +if [ ! -s /installkey.gpg ] ; then + echo "warning: no build keys!" +fi + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/initrd/scripts/prepare_rescue new/installation-images-13.42/data/initrd/scripts/prepare_rescue --- old/installation-images-13.40/data/initrd/scripts/prepare_rescue 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.42/data/initrd/scripts/prepare_rescue 2012-04-17 15:06:58.000000000 +0200 @@ -0,0 +1,28 @@ +#! /bin/sh + +# ensure some trees are completely writable +for i in /etc /media /root /var ; do + cp -aL $i ${i}_tmp + rm -rf $i + mv ${i}_tmp $i +done + +if [ -f /mounts/initrd/etc/suse-blinux.conf ] ; then + grep -q '^brlname=none' /mounts/initrd/etc/suse-blinux.conf || { + cp /mounts/initrd/etc/suse-blinux.conf /etc + insserv brld + insserv sbl + } +fi + +# keep some initrd config files for rescue system +for i in etc/modprobe.d/blacklist etc/modprobe.d/noload ; do + [ -f /mounts/initrd/$i ] && cp -f /mounts/initrd/$i /$i +done + +# bash >/dev/console 2>&1 + +rm -f /mounts/initrd/{*,.*} +rmdir /mounts/initrd/* 2>/dev/null +rm -rf /mounts/initrd/{bin,download,etc,lbin,lib,modules,oldroot,root,sbin,scripts,tmp,usr,var} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/rescue/rescue.file_list new/installation-images-13.42/data/rescue/rescue.file_list --- old/installation-images-13.40/data/rescue/rescue.file_list 2012-03-21 11:42:42.000000000 +0100 +++ new/installation-images-13.42/data/rescue/rescue.file_list 2012-04-17 14:06:24.000000000 +0200 @@ -699,10 +699,9 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -dbus-1: prein,postin +# need to break circular dependecy dbus-1 <-> aaa_base +dbus-1: / -E prein -E postin aaa_base: prein,postin E prein @@ -710,6 +709,11 @@ t /etc/fstab E postin +dbus-1: prein,postin + / +E prein +E postin + lvm2: postin / E postin @@ -788,6 +792,10 @@ # remove, ehm, things... r /usr/share/doc /usr/share/info /usr/share/man /usr/share/locale /var/adm/fillup-templates +r /run/* + +# we better have one... +e touch etc/sysconfig/kernel # our own dhcp6c config x etc/dhcp6c.conf etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.40/data/root/root.file_list new/installation-images-13.42/data/root/root.file_list --- old/installation-images-13.40/data/root/root.file_list 2012-04-03 15:26:18.000000000 +0200 +++ new/installation-images-13.42/data/root/root.file_list 2012-04-18 10:55:10.000000000 +0200 @@ -1284,7 +1284,7 @@ utempter: /usr/lib*/libutempter.so.* -efont-unicode: +efont-unicode-bitmap-fonts: /usr/share/fonts/misc/b16.pcf.gz dmz-icon-theme-cursors: @@ -1326,6 +1326,10 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# until we have libdbus-1 +dbus-1: + / + aaa_base: prein,postin E prein / -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
