Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-02-21 13:48:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2014-02-12 21:53:23.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-02-21 13:48:28.000000000 +0100
@@ -1,0 +2,45 @@
+Thu Feb 20 10:02:03 UTC 2014 - [email protected]
+
+- also symlink awk in initrd
+
+-------------------------------------------------------------------
+Wed Feb 19 08:53:51 CET 2014 - [email protected]
+
+- add all tools from xorg-x11-Xvnc (bnc #855246)
+
+-------------------------------------------------------------------
+Tue Feb 18 17:00:15 CET 2014 - [email protected]
+
+- move /etc/motd and /etc/issue to initrd
+
+-------------------------------------------------------------------
+Tue Feb 18 14:12:44 CET 2014 - [email protected]
+
+- fix Solver usage
+- add sysconfig files to initrd
+
+-------------------------------------------------------------------
+Tue Feb 18 11:02:13 CET 2014 - [email protected]
+
+- more branding fixes
+
+-------------------------------------------------------------------
+Tue Feb 18 10:27:39 CET 2014 - [email protected]
+
+- branding fixes
+
+-------------------------------------------------------------------
+Tue Feb 18 09:54:10 CET 2014 - [email protected]
+
+- adjust to new branding packages
+
+-------------------------------------------------------------------
+Mon Feb 17 14:39:20 CET 2014 - [email protected]
+
+- avoid using rcnscd (bnc #863430)
+- Fix branding image installation for ppc64le
+- switch back to yaboot for a while
+- fix ssl certificates (bnc #863788)
+- ignore rake, rdoc and ri from ruby
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.39.tar.bz2
ruby-ua.patch
New:
----
gawk.patch
installation-images-14.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.rJfvHT/_old 2014-02-21 13:48:29.000000000 +0100
+++ /var/tmp/diff_new_pack.rJfvHT/_new 2014-02-21 13:48:29.000000000 +0100
@@ -19,6 +19,13 @@
%define theme openSUSE
+
+%if %theme == SLES
+%define base_theme SLE
+%else
+%define base_theme %theme
+%endif
+
%define with_vbox 0
%define with_plymouth 1
%define with_shim 1
@@ -31,6 +38,13 @@
%bcond_without xen
%endif
+%if %theme == SLES
+BuildRequires: sles-release
+BuildRequires: sles-release-DVD
+%else
+BuildRequires: openSUSE-release
+BuildRequires: openSUSE-release-dvd
+%endif
BuildRequires: Mesa
BuildRequires: Mesa-libEGL1
BuildRequires: aaa_base
@@ -65,7 +79,6 @@
BuildRequires: dmapi
BuildRequires: dmraid
BuildRequires: dosfstools
-BuildRequires: dummy-release
BuildRequires: dump
BuildRequires: e2fsprogs
BuildRequires: ed
@@ -153,12 +166,12 @@
BuildRequires: suspend
%endif
BuildRequires: systemd
-BuildRequires: systemd-presets-branding-openSUSE
+BuildRequires: systemd-presets-branding-%{base_theme}
BuildRequires: tunctl
BuildRequires: udev
%if %with_plymouth
BuildRequires: plymouth
-BuildRequires: plymouth-branding-openSUSE
+BuildRequires: plymouth-branding-%{base_theme}
BuildRequires: plymouth-plugin-script
BuildRequires: plymouth-scripts
%endif
@@ -324,8 +337,8 @@
BuildRequires: glibc-32bit
%endif
%ifarch %ix86 x86_64
-BuildRequires: gfxboot-branding-%theme
-BuildRequires: grub2-branding-openSUSE
+BuildRequires: gfxboot-branding-%{base_theme}
+BuildRequires: grub2-branding-%{base_theme}
%endif
%ifnarch s390 s390x
#BuildRequires: enic-kmp-default fnic-kmp-default ofed-kmp-default
@@ -340,10 +353,10 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.39
+Version: 14.46
Release: 0
-Source: installation-images-14.39.tar.bz2
-Patch0: ruby-ua.patch
+Source: installation-images-14.46.tar.bz2
+Patch0: gawk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -379,8 +392,8 @@
%prep
%setup -n installation-images-%{version}
-%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
+%patch0 -p1
%build
unset MALLOC_CHECK_
++++++ gawk.patch ++++++
diff --git a/data/initrd/initrd.file_list b/data/initrd/initrd.file_list
index 13ba0d1..113fba9 100644
--- a/data/initrd/initrd.file_list
+++ b/data/initrd/initrd.file_list
@@ -318,6 +318,10 @@ gzip:
/usr/bin/gzip
/usr/bin/gunzip
+gawk:
+ /usr/bin/gawk
+ s gawk usr/bin/awk
+
nscd:
# remaining files are in root image
d /var/run/nscd
++++++ installation-images-14.39.tar.bz2 -> installation-images-14.46.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/Makefile
new/installation-images-14.46/Makefile
--- old/installation-images-14.39/Makefile 2014-02-10 16:57:07.000000000
+0100
+++ new/installation-images-14.46/Makefile 2014-02-18 10:26:53.000000000
+0100
@@ -39,11 +39,12 @@
endif
ifneq ($(filter ppc ppc64 ppc64le, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel
boot-grub2-powerpc $(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel
$(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
BOOT_PARTS :=
endif
+# THEMES must be a single value
THEMES := openSUSE
DESTDIR := images/instsys
@@ -77,16 +78,16 @@
@[ -d tmp ] || mkdir tmp
base: dirs
- @[ -d tmp/base ] || nostrip=1 libdeps=base image=base fs=none
bin/mk_image
+ @[ -d tmp/base ] || theme=$(THEMES) nostrip=1 libdeps=base image=base
fs=none bin/mk_image
fbase: dirs
- nostrip=1 libdeps=base image=base fs=none bin/mk_image
+ theme=$(THEMES) nostrip=1 libdeps=base image=base fs=none bin/mk_image
biostest: base
- libdeps=initrd,biostest image=biostest src=initrd fs=cpio.gz
disjunct=initrd bin/mk_image
+ theme=$(THEMES) libdeps=initrd,biostest image=biostest src=initrd
fs=cpio.gz disjunct=initrd bin/mk_image
initrd: base
- libdeps=initrd image=initrd-base.gz tmpdir=initrd src=initrd
filelist=initrd fs=cpio.gz bin/mk_image
+ theme=$(THEMES) libdeps=initrd image=initrd-base.gz tmpdir=initrd
src=initrd filelist=initrd fs=cpio.gz bin/mk_image
[ -s tmp/initrd/bin/bash ]
modules: base
@@ -142,7 +143,7 @@
image=vmlinuz-$${MOD_CFG:-default} src=initrd filelist=kernel
kernel=kernel-$${MOD_CFG:-default} fs=dir bin/mk_image
boot-efi: base
- image=boot-efi src=boot filelist=efi fs=none bin/mk_image
+ theme=$(THEMES) image=boot-efi src=boot filelist=efi fs=none
bin/mk_image
for theme in $(THEMES) ; do \
ln images/$$theme/initrd tmp/boot-efi/efi/boot/initrd ; \
bin/hdimage --size 500k --fit-size --chs 0 4 63 --part-ofs 0 --mkfs
fat --add-files tmp/boot-efi/* tmp/boot-efi/.p* -- images/$$theme/efi ; \
@@ -162,18 +163,18 @@
done
boot: base
- image=boot fs=dir bin/mk_image
+ theme=$(THEMES) image=boot fs=dir bin/mk_image
root: base
- libdeps=root image=root bin/mk_image
+ theme=$(THEMES) libdeps=root image=root bin/mk_image
rescue: base
- libdeps=rescue image=rescue bin/mk_image
+ theme=$(THEMES) libdeps=rescue image=rescue bin/mk_image
# rescue ok? (bnc #457947)
@[ -s tmp/rescue/etc/init.d/boot.d/S*.udev ] || ( echo "build does not
work on xxx" ; false )
rescue-server:
- libdeps=rescue image=rescue-server src=rescue filelist=rescue-server
fs=squashfs bin/mk_image
+ theme=$(THEMES) libdeps=rescue image=rescue-server src=rescue
filelist=rescue-server fs=squashfs bin/mk_image
root+rescue: base
image=root+rescue fs=none bin/mk_image
@@ -217,10 +218,10 @@
for i in `cat images/rpmlist` ; do \
echo -e "$$i:\n X <rpm_file> CD1/boot/<arch>\n" >>
data/cd1/gen/rpm.file_list; \
done
- nostrip=1 image=cd1 fs=none sw 0 bin/mk_image
+ theme=$(THEMES) nostrip=1 image=cd1 fs=none sw 0 bin/mk_image
cp -a images/instsys/CD1 tmp/cd1
rm -f tmp/cd1/CD1/boot/*/rpmlist
- cp -a images/instsys/branding/openSUSE/CD1 tmp/cd1
+ cp -a images/instsys/branding/$(THEMES)/CD1 tmp/cd1
mini-iso-rmlist: base
rm -f images/$@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/VERSION
new/installation-images-14.46/VERSION
--- old/installation-images-14.39/VERSION 2014-02-11 15:38:55.000000000
+0100
+++ new/installation-images-14.46/VERSION 2014-02-19 08:53:43.000000000
+0100
@@ -1 +1 @@
-14.39
+14.46
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.39/bin/mk_ppc_installation-images_bootbinaries.sh
new/installation-images-14.46/bin/mk_ppc_installation-images_bootbinaries.sh
---
old/installation-images-14.39/bin/mk_ppc_installation-images_bootbinaries.sh
2014-02-06 16:40:00.000000000 +0100
+++
new/installation-images-14.46/bin/mk_ppc_installation-images_bootbinaries.sh
2014-02-17 13:24:04.000000000 +0100
@@ -44,12 +44,12 @@
#mkdir -pv $CD1/PS3/otheros
#cp -pfv /usr/share/ps3/otheros.bld $CD1/PS3/otheros
#
-cp -pfv $bdir/initrd $CD1/boot/$ARCH/loader/initrd32
-cp -pfv /boot/vmlinux-*-default $CD1/boot/$ARCH/loader/linux32
+cp -pfv $bdir/initrd $CD1/suseboot/initrd32
+cp -pfv /boot/vmlinux-*-default $CD1/suseboot/linux32
fi
if test "$do_64" = "true" ; then
-cp -pfv $bdir/initrd-default $CD1/boot/$ARCH/loader/initrd64
-cp -pfv /boot/vmlinux-*-default $CD1/boot/$ARCH/loader/linux64
+cp -pfv $bdir/initrd-default $CD1/suseboot/initrd64
+cp -pfv /boot/vmlinux-*-default $CD1/suseboot/linux64
fi
#grub-mkimage -O powerpc-ieee1275 -d /usr/lib/grub/powerpc-ieee1275 -p
'()/boot/$ARCH/powerpc-ieee1275' \
@@ -119,55 +119,55 @@
<chrp-boot>
<description>${we_dont_smoke_that_stuff}</description>
<os-name>${we_dont_smoke_that_stuff}</os-name>
-<boot-script>boot
&device;:1,\\boot\\$ARCH\\grub2-ieee1275\\grub2.core</boot-script>
+<boot-script>boot &device;:1,\\suseboot\\yaboot.ibm</boot-script>
</chrp-boot>
EOF
cat $CD1/ppc/bootinfo.txt
-#
-#cat > $CD1/suseboot/yaboot.txt <<EOF
-#
-# Welcome to ${we_dont_smoke_that_stuff}!
-#
-# Type "install" to start the YaST installer on this CD/DVD
-# Type "slp" to start the YaST install via network
-# Type "rescue" to start the rescue system on this CD/DVD
-#
-#
-#EOF
-#cat $CD1/suseboot/yaboot.txt
-#
+
+cat > $CD1/suseboot/yaboot.txt <<EOF
+
+ Welcome to ${we_dont_smoke_that_stuff}!
+
+ Type "install" to start the YaST installer on this CD/DVD
+ Type "slp" to start the YaST install via network
+ Type "rescue" to start the rescue system on this CD/DVD
+
+
+EOF
+cat $CD1/suseboot/yaboot.txt
+
if test "$do_32" = "true" ; then
do_bits="$do_bits 32"
fi
if test "$do_64" = "true" ; then
do_bits="$do_bits 64"
fi
-#
-#cat > $CD1/suseboot/yaboot.cnf <<EOF
-#message=yaboot.txt
-#EOF
-#for i in $do_bits
-#do
-#cat >> $CD1/suseboot/yaboot.cnf <<EOF
-#
-#image[${i}bit]=linux${i}
-# initrd=initrd${i}
-# label=install
-# append="quiet sysrq=1 insmod=sym53c8xx insmod=ipr "
-#image[${i}bit]=linux${i}
-# initrd=initrd${i}
-# label=slp
-# append="quiet sysrq=1 install=slp "
-#image[${i}bit]=linux${i}
-# initrd=initrd${i}
-# label=rescue
-# append="quiet sysrq=1 rescue=1 "
-#
-#EOF
-#done
-#cat $CD1/suseboot/yaboot.cnf
-#
+
+cat > $CD1/suseboot/yaboot.cnf <<EOF
+message=yaboot.txt
+EOF
+for i in $do_bits
+do
+cat >> $CD1/suseboot/yaboot.cnf <<EOF
+
+image[${i}bit]=linux${i}
+ initrd=initrd${i}
+ label=install
+ append="quiet sysrq=1 insmod=sym53c8xx insmod=ipr "
+image[${i}bit]=linux${i}
+ initrd=initrd${i}
+ label=slp
+ append="quiet sysrq=1 install=slp "
+image[${i}bit]=linux${i}
+ initrd=initrd${i}
+ label=rescue
+ append="quiet sysrq=1 rescue=1 "
+
+EOF
+done
+cat $CD1/suseboot/yaboot.cnf
+
cat > $CD1/suseboot/os-chooser <<EOF
<CHRP-BOOT>
@@ -178,7 +178,7 @@
SuSE Linux for PowerMac
</DESCRIPTION>
<BOOT-SCRIPT>
-load &device;:&partition;,\\boot\\$ARCH\\grub2-ieee1275\\grub2.core
+load &device;:&partition;,\\suseboot\\yaboot
go
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/changelog
new/installation-images-14.46/changelog
--- old/installation-images-14.39/changelog 2014-02-11 15:38:59.000000000
+0100
+++ new/installation-images-14.46/changelog 2014-02-19 08:53:47.000000000
+0100
@@ -1,4 +1,30 @@
-2014-02-11: HEAD
+2014-02-19: HEAD
+ - add all tools from xorg-x11-Xvnc (bnc #855246)
+
+2014-02-18: 14.45
+ - move /etc/motd and /etc/issue to initrd
+
+2014-02-18: 14.44
+ - fix Solver usage
+ - add sysconfig files to initrd
+
+2014-02-18: 14.43
+ - more branding fixes
+
+2014-02-18: 14.42
+ - branding fixes
+
+2014-02-18: 14.41
+ - adjust to new branding packages
+
+2014-02-17: 14.40
+ - avoid using rcnscd (bnc #863430)
+ - Fix branding image installation for ppc64le
+ - switch back to yaboot for a while
+ - fix ssl certificates (bnc #863788)
+ - ignore rake, rdoc and ri from ruby
+
+2014-02-11: 14.39
- fix wrong ifarch s390x
- set SLES boot theme temporarily to openSUSE as SLES branding is still
missing
- don't produce nonsense if the grub2 theme package is missing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/base/base.file_list
new/installation-images-14.46/data/base/base.file_list
--- old/installation-images-14.39/data/base/base.file_list 2014-02-05
09:33:50.000000000 +0100
+++ new/installation-images-14.46/data/base/base.file_list 2014-02-18
11:01:39.000000000 +0100
@@ -46,7 +46,6 @@
cracklib:
device-mapper:
diffutils:
-dummy-release:
elfutils:
file-magic:
file:
@@ -85,13 +84,21 @@
strace:
suse-module-tools:
?syslinux:
-systemd-presets-branding-openSUSE:
+systemd-presets-branding-<base_theme>:
systemd:
tar:
terminfo-base:
udev:
util-linux:
+if theme eq 'SLES'
+ sles-release:
+ sles-release-DVD:
+else
+ openSUSE-release:
+ openSUSE-release-dvd:
+endif
+
if arch eq 'aarch64'
qemu-linux-aarch64:
endif
@@ -99,6 +106,7 @@
ca-certificates:
/usr/sbin/update-ca-certificates
/usr/lib/ca-certificates/update.d/openssl.run
+ /usr/lib/ca-certificates/update.d/etc_ssl.run
/var/lib/ca-certificates/openssl
aaa_base:
@@ -127,6 +135,7 @@
E /create_locale
# show certificates
+s /var/lib/ca-certificates/pem etc/ssl/certs
E update-ca-certificates -f
E ls -lR /var/lib/ca-certificates
E ls -lR /etc/ssl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/boot/SLE-efi.diff
new/installation-images-14.46/data/boot/SLE-efi.diff
--- old/installation-images-14.39/data/boot/SLE-efi.diff 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.46/data/boot/SLE-efi.diff 2014-02-18
08:59:16.000000000 +0100
@@ -0,0 +1,13 @@
+--- grub2-efi/themes/SLE/theme.txt
++++ grub2-efi/themes/SLE/theme.txt
+@@ -2,7 +2,9 @@
+
+ desktop-image: "background.png"
+
+-title-text: ""
++title-text: "PRODUCT"
++title-color: "#fff"
++title-font: "DejaVu Sans Bold 14"
+
+ terminal-box: "terminal_*.png"
+ terminal-font: "Gnu Unifont Mono Regular 16"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/boot/SLES-efi.diff
new/installation-images-14.46/data/boot/SLES-efi.diff
--- old/installation-images-14.39/data/boot/SLES-efi.diff 2014-02-11
12:04:26.000000000 +0100
+++ new/installation-images-14.46/data/boot/SLES-efi.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- grub2-efi/themes/SLES/theme.txt
-+++ grub2-efi/themes/SLES/theme.txt
-@@ -2,7 +2,9 @@
-
- desktop-image: "background.png"
-
--title-text: ""
-+title-text: "PRODUCT"
-+title-color: "#fff"
-+title-font: "DejaVu Sans Bold 14"
-
- terminal-box: "terminal_*.png"
- terminal-font: "Gnu Unifont Mono Regular 16"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/boot/grub.cfg
new/installation-images-14.46/data/boot/grub.cfg
--- old/installation-images-14.39/data/boot/grub.cfg 2014-01-16
11:21:01.000000000 +0100
+++ new/installation-images-14.46/data/boot/grub.cfg 2014-02-18
09:15:35.000000000 +0100
@@ -22,13 +22,13 @@
terminal_output gfxterm
- theme=$prefix/themes/openSUSE/theme.txt
+ theme=$prefix/themes/THEME/theme.txt
export theme
loadfont $prefix/unicode.pf2
- loadfont $prefix/themes/openSUSE/DejaVuSans10.pf2
- loadfont $prefix/themes/openSUSE/DejaVuSans12.pf2
- loadfont $prefix/themes/openSUSE/DejaVuSans-Bold14.pf2
+ loadfont $prefix/themes/THEME/DejaVuSans10.pf2
+ loadfont $prefix/themes/THEME/DejaVuSans12.pf2
+ loadfont $prefix/themes/THEME/DejaVuSans-Bold14.pf2
fi
if sleep --interruptible 0 ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.39/data/boot/grub2-efi.file_list
new/installation-images-14.46/data/boot/grub2-efi.file_list
--- old/installation-images-14.39/data/boot/grub2-efi.file_list 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.46/data/boot/grub2-efi.file_list 2014-02-18
09:15:06.000000000 +0100
@@ -24,10 +24,9 @@
# grub2-efi with graphics
# this is just for patching grub.cfg
# real themes files are unpacked in theme.file_list
- if 1
- ?grub2-branding-<splash_theme>:
- R s/^with_gfx=0/with_gfx=1/ EFI/BOOT/grub.cfg
- endif
+ ?grub2-branding-<splash_theme>:
+ R s/^with_gfx=0/with_gfx=1/ EFI/BOOT/grub.cfg
+ R s/THEME/<splash_theme>/g EFI/BOOT/grub.cfg
# elsif arch eq 'ia64'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/cd1/cd1.file_list
new/installation-images-14.46/data/cd1/cd1.file_list
--- old/installation-images-14.39/data/cd1/cd1.file_list 2014-02-10
16:56:48.000000000 +0100
+++ new/installation-images-14.46/data/cd1/cd1.file_list 2014-02-18
08:44:33.000000000 +0100
@@ -1,7 +1,12 @@
-skelcd-openSUSE:
- /
+if theme eq 'SLES'
+ skelcd-sles:
+ /
+else
+ skelcd-<theme>:
+ /
+endif
-skelcd-control-openSUSE:
+skelcd-control-<theme>:
/
d CD1/boot/<arch>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/initrd/etc/issue
new/installation-images-14.46/data/initrd/etc/issue
--- old/installation-images-14.39/data/initrd/etc/issue 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.46/data/initrd/etc/issue 2013-11-18
11:49:20.000000000 +0100
@@ -0,0 +1,3 @@
+
+product_name Installation
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/initrd/etc/motd
new/installation-images-14.46/data/initrd/etc/motd
--- old/installation-images-14.39/data/initrd/etc/motd 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.46/data/initrd/etc/motd 2013-11-18
11:49:20.000000000 +0100
@@ -0,0 +1,9 @@
+
+product_name Installation
+
+- there are shells running on consoles 2, 5, 6, 9
+- use 'extend' to load extensions (remove with 'extend -r'); extensions are:
+ o bind, gdb
+- network setup: run, e.g. 'dhcpcd eth0'
+- sshd: run 'rcsshd start' (don't forget to set a password with 'passwd')
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/initrd/etc/motd.s390x
new/installation-images-14.46/data/initrd/etc/motd.s390x
--- old/installation-images-14.39/data/initrd/etc/motd.s390x 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.46/data/initrd/etc/motd.s390x 2014-01-16
11:21:01.000000000 +0100
@@ -0,0 +1,6 @@
+
+product_name Installation
+
+- use 'extend' to load extensions (remove with 'extend -r'); extensions are:
+ o bind, gdb
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.39/data/initrd/initrd.file_list
new/installation-images-14.46/data/initrd/initrd.file_list
--- old/installation-images-14.39/data/initrd/initrd.file_list 2014-02-05
09:33:50.000000000 +0100
+++ new/installation-images-14.46/data/initrd/initrd.file_list 2014-02-18
16:57:19.000000000 +0100
@@ -86,7 +86,6 @@
pinentry: ignore
rpcbind: ignore
?suspend: ignore
-sysconfig: ignore
systemd: ignore
update-alternatives: ignore
?dracut: ignore
@@ -141,6 +140,7 @@
netcfg:
/etc/protocols
+ /etc/netgroup
?xf86-input-vmmouse:
/usr/bin/vmmouse_detect
@@ -332,7 +332,6 @@
/usr/lib/udev/rules.d
multipath-tools:
- /etc/udev/rules.d
/var/cache/multipath
shadow:
@@ -359,7 +358,7 @@
plymouth:
plymouth-scripts: nodeps
plymouth-plugin-script:
- plymouth-branding-openSUSE: nodeps
+ plymouth-branding-<base_theme>: nodeps
endif
procps:
@@ -370,6 +369,12 @@
/usr/lib*/libsystemd-journal.so.*
/usr/lib*/libsystemd-login.so.*
+sysconfig:
+ /
+ m /var/adm/fillup-templates/sysconfig.config-network
/etc/sysconfig/network/config
+ m /var/adm/fillup-templates/sysconfig.dhcp-network
/etc/sysconfig/network/dhcp
+ r sbin/rcnetwork
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
@@ -400,6 +405,10 @@
polkit: nodeps
E prein
+# we just want the user & group entries
+nscd:
+ E prein
+
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
@@ -492,6 +501,9 @@
:
+# replace issue and motd with our own messages
+include texts.file_list
+
# remove files we don't want to show up at all
r /usr/share/{doc,info,locale,man} /usr/src/packages /var/adm/fillup-templates
@@ -500,6 +512,7 @@
# copy ssl certificates
e cp -a /etc/ssl etc
+e cp -a /var/lib/ca-certificates var/lib
# mtab is symlink now
r /etc/mtab
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.39/data/initrd/texts.file_list
new/installation-images-14.46/data/initrd/texts.file_list
--- old/installation-images-14.39/data/initrd/texts.file_list 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.46/data/initrd/texts.file_list 2014-01-16
11:21:01.000000000 +0100
@@ -0,0 +1,11 @@
+d etc
+x /etc/motd /etc
+x /etc/issue /etc
+
+if arch eq 's390' || arch eq 's390x'
+ x /etc/motd.s390x /etc/motd
+endif
+
+R s/product_name/<product_name>/g /etc/motd
+R s/product_name/<product_name>/g /etc/issue
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.39/data/rescue/rescue.file_list
new/installation-images-14.46/data/rescue/rescue.file_list
--- old/installation-images-14.39/data/rescue/rescue.file_list 2014-02-06
16:40:00.000000000 +0100
+++ new/installation-images-14.46/data/rescue/rescue.file_list 2014-02-18
10:58:14.000000000 +0100
@@ -141,7 +141,7 @@
suse-module-tools:
sysconfig:
sysconfig-netconfig:
-systemd-presets-branding-openSUSE:
+systemd-presets-branding-<base_theme>:
systemd-sysvinit:
systemd:
tar:
@@ -155,6 +155,14 @@
xfsprogs:
xz:
+if theme eq 'SLES'
+ sles-release:
+ sles-release-DVD:
+else
+ openSUSE-release:
+ openSUSE-release-dvd:
+endif
+
samba-libs: nodeps
/usr/lib*/samba/libreplace.so
/usr/lib*/samba/libwinbind-client.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/etc/inst_setup
new/installation-images-14.46/data/root/etc/inst_setup
--- old/installation-images-14.39/data/root/etc/inst_setup 2014-01-24
11:22:38.000000000 +0100
+++ new/installation-images-14.46/data/root/etc/inst_setup 2014-02-17
13:55:40.000000000 +0100
@@ -157,7 +157,7 @@
fi
# start nscd (bnc #530440)
-rcnscd start
+[ -f /etc/resolv.conf ] && nscd
# Update module config.
#
@@ -261,7 +261,7 @@
# start shell, useful on iSeries or via serial console
[ "$START_SHELL" ] && start_shell
-rcnscd stop
+nscd --shutdown
# stop various daemons
# killall dbus-daemon >/dev/null 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/etc/issue
new/installation-images-14.46/data/root/etc/issue
--- old/installation-images-14.39/data/root/etc/issue 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.46/data/root/etc/issue 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-
-product_name Installation
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/etc/motd
new/installation-images-14.46/data/root/etc/motd
--- old/installation-images-14.39/data/root/etc/motd 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.46/data/root/etc/motd 1970-01-01
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-
-product_name Installation
-
-- there are shells running on consoles 2, 5, 6, 9
-- use 'extend' to load extensions (remove with 'extend -r'); extensions are:
- o bind, gdb
-- network setup: run, e.g. 'dhcpcd eth0'
-- sshd: run 'rcsshd start' (don't forget to set a password with 'passwd')
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/etc/motd.s390x
new/installation-images-14.46/data/root/etc/motd.s390x
--- old/installation-images-14.39/data/root/etc/motd.s390x 2014-01-16
11:21:01.000000000 +0100
+++ new/installation-images-14.46/data/root/etc/motd.s390x 1970-01-01
01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-
-product_name Installation
-
-- use 'extend' to load extensions (remove with 'extend -r'); extensions are:
- o bind, gdb
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/root.file_list
new/installation-images-14.46/data/root/root.file_list
--- old/installation-images-14.39/data/root/root.file_list 2014-02-11
15:34:47.000000000 +0100
+++ new/installation-images-14.46/data/root/root.file_list 2014-02-19
08:23:57.000000000 +0100
@@ -137,7 +137,7 @@
sg3_utils:
suse-module-tools:
?syslinux:
-systemd-presets-branding-openSUSE:
+systemd-presets-branding-<base_theme>:
systemd-sysvinit:
systemd:
sysvinit:
@@ -150,6 +150,14 @@
xfsprogs:
xz:
+if theme eq 'SLES'
+ sles-release:
+ sles-release-DVD:
+else
+ openSUSE-release:
+ openSUSE-release-dvd:
+endif
+
# pull in yast2 installation related packages via package deps
?skelcd-control-openSUSE:
?skelcd-control-SLES:
@@ -236,7 +244,10 @@
/
# avoid update-alternatives
r /etc/alternatives
- e cd usr/bin ; for i in erb gem irb rake rdoc ri ruby testrb ; do [ -x $i ]
|| ln -snf ${i}2* $i ; done
+ r /usr/bin/rake*
+ r /usr/bin/rdoc*
+ r /usr/bin/ri*
+ e cd usr/bin ; for i in erb gem irb ruby testrb ; do [ -x $i ] || ln -snf
${i}2* $i ; done
yast2-devtools:
/usr/share/YaST2/data/devtools/bin/showy2log
@@ -484,7 +495,7 @@
if exists(xorg-x11-Xvnc)
xorg-x11-Xvnc:
- /usr/bin/Xvnc
+ /usr/bin
endif
Mesa-libEGL*:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/texts.file_list
new/installation-images-14.46/data/root/texts.file_list
--- old/installation-images-14.39/data/root/texts.file_list 2014-01-16
11:21:01.000000000 +0100
+++ new/installation-images-14.46/data/root/texts.file_list 1970-01-01
01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-d etc
-x /etc/motd /etc
-x /etc/issue /etc
-
-if arch eq 's390' || arch eq 's390x'
- x /etc/motd.s390x /etc/motd
-endif
-
-R s/product_name/<product_name>/g /etc/motd
-R s/product_name/<product_name>/g /etc/issue
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/data/root/theme.file_list
new/installation-images-14.46/data/root/theme.file_list
--- old/installation-images-14.39/data/root/theme.file_list 2014-02-03
15:27:51.000000000 +0100
+++ new/installation-images-14.46/data/root/theme.file_list 2014-02-18
16:58:35.000000000 +0100
@@ -1,10 +1,10 @@
desktop-data-openSUSE:
/usr/share/desktop-data/qtrc
-?yast2-qt-branding-<theme>:
+?yast2-qt-branding-<base_theme>:
/
-?yast2-theme-<theme>:
+yast2-theme-<base_theme>:
/
yast2-theme-<yast_theme>:
@@ -12,5 +12,3 @@
s <yast_theme> usr/share/YaST2/theme/current
s <yast_theme> usr/share/YaST2/theme/openSUSE-current
-include texts.file_list
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/etc/config
new/installation-images-14.46/etc/config
--- old/installation-images-14.39/etc/config 2014-02-11 12:08:17.000000000
+0100
+++ new/installation-images-14.46/etc/config 2014-02-18 08:50:32.000000000
+0100
@@ -67,6 +67,7 @@
[Theme openSUSE]
+base = openSUSE
splash = openSUSE
yast = openSUSE-Oxygen
product = openSUSE
@@ -77,7 +78,8 @@
[Theme SLES]
-splash = openSUSE
+base = SLE
+splash = SLE
yast = SLE
product = SUSE Linux Enterprise Server 12
version = 13.2
@@ -87,7 +89,8 @@
[Theme SLED]
-splash = SLED
+base = SLE
+splash = SLE
yast = SLE
product = SUSE Linux Enterprise Desktop 12
version = 13.2
@@ -97,7 +100,8 @@
[Theme Zen]
-splash = SLES
+base = SLE
+splash = SLE
yast = SLE
product = ZENworks
version = 13.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/install.ppc
new/installation-images-14.46/install.ppc
--- old/installation-images-14.39/install.ppc 2014-02-06 16:40:00.000000000
+0100
+++ new/installation-images-14.46/install.ppc 2014-02-17 13:24:58.000000000
+0100
@@ -5,7 +5,7 @@
set -e
# create directory layout
-mkdir -p $DESTDIR/CD1/boot/$ARCH/loader
+mkdir -p $DESTDIR/CD1/boot/$ARCH
for theme in $THEMES ; do
mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH
done
@@ -21,7 +21,7 @@
[ -e images/$theme/$i ] && cp -r images/$theme/$i
$DESTDIR/branding/$theme/CD1/boot/$ARCH
done
- cp images/$theme/$theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader
+ cp images/$theme/$theme $DESTDIR/branding/$theme/CD1/boot/$ARCH
ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
case "$ARCH" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/lib/AddFiles.pm
new/installation-images-14.46/lib/AddFiles.pm
--- old/installation-images-14.39/lib/AddFiles.pm 2014-01-15
10:47:53.000000000 +0100
+++ new/installation-images-14.46/lib/AddFiles.pm 2014-02-18
08:51:26.000000000 +0100
@@ -158,7 +158,7 @@
$ifmsg = sprintf " [%x|%x] %s\n", $if_val, $if_taken, $_;
s/<rpm_file>/$rpm_file/g;
-
s/<(kernel_ver|kernel_mods|kernel_rpm|kernel_img|(suse|sles|sled)_release|theme|splash_theme|yast_theme|product|product_name|update_dir|load_image|min_memory|instsys_build_id|instsys_complain|instsys_complain_root|arch|lib)>/$ConfigData{$1}/g;
+
s/<(kernel_ver|kernel_mods|kernel_rpm|kernel_img|(suse|sles|sled)_release|theme|base_theme|splash_theme|yast_theme|product|product_name|update_dir|load_image|min_memory|instsys_build_id|instsys_complain|instsys_complain_root|arch|lib)>/$ConfigData{$1}/g;
for my $i (qw( linuxrc lang extramod items )) {
s/<$i>/$ENV{$i}/g if exists $ENV{$i};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.39/lib/ReadConfig.pm
new/installation-images-14.46/lib/ReadConfig.pm
--- old/installation-images-14.39/lib/ReadConfig.pm 2014-02-10
13:20:15.000000000 +0100
+++ new/installation-images-14.46/lib/ReadConfig.pm 2014-02-18
14:10:41.000000000 +0100
@@ -392,6 +392,11 @@
print $f $_;
close $f;
+ $_ = `$rpm_cmd -qp --provides $rpm->{file} 2>/dev/null`;
+ open $f, ">$dir/provides";
+ print $f $_;
+ close $f;
+
@s = `$rpm_cmd -qp --qf
'%|PREIN?{PREIN\n}:{}|%|POSTIN?{POSTIN\n}:{}|%|PREUN?{PREUN\n}:{}|%|POSTUN?{POSTUN\n}:{}|'
$rpm->{file} 2>/dev/null`;
for (@s) {
chomp;
@@ -713,9 +718,6 @@
$pool->createwhatprovides();
$pool->set_debuglevel(4) if $ENV{debug} =~ /solv/;
- my $solver = $pool->Solver();
- $solver->set_flag($solv::Solver::SOLVER_FLAG_IGNORE_RECOMMENDED, 1);
-
my $jobs;
for (@$packages) {
push @$jobs, $pool->Job($solv::Job::SOLVER_INSTALL |
$solv::Job::SOLVER_SOLVABLE_NAME, $pool->str2id($_));
@@ -759,6 +761,9 @@
warn "$Script: outdated perl-solv: solver will not work properly";
}
+ my $solver = $pool->Solver();
+ $solver->set_flag($solv::Solver::SOLVER_FLAG_IGNORE_RECOMMENDED, 1);
+
my @problems = $solver->solve($jobs);
if(@problems) {
@@ -1200,6 +1205,7 @@
$load_image = $load_image * 1024 if $load_image;
$ConfigData{theme} = $theme;
+ $ConfigData{base_theme} = $ConfigData{ini}{"Theme $theme"}{base};
$ConfigData{splash_theme} = $ConfigData{ini}{"Theme $theme"}{splash};
$ConfigData{yast_theme} = $ConfigData{ini}{"Theme $theme"}{yast};
$ConfigData{product_name} = $product_name;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
