Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-03-06 19:29:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-24 17:28:15.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-03-06 19:29:40.000000000 +0100
@@ -1,0 +2,53 @@
+Thu Mar 6 16:22:18 CET 2014 - [email protected]
+
+- add sg3_utils to initrd (bnc #866933)
+
+-------------------------------------------------------------------
+Thu Mar 6 12:16:46 CET 2014 - [email protected]
+
+- add sysconfig-netconfig to initrd (bnc #867078)
+
+-------------------------------------------------------------------
+Wed Mar 5 13:34:49 CET 2014 - [email protected]
+
+- fix yast2 theme handling in openSUSE
+- change terminal to ibm3270
+
+-------------------------------------------------------------------
+Tue Mar 4 13:02:04 CET 2014 - [email protected]
+
+- fix rescue system (bnc #841695)
+
+-------------------------------------------------------------------
+Mon Mar 3 12:15:07 CET 2014 - [email protected]
+
+- rename yast theme in openSUSE
+- filesystem package comes with /var/run symlink
+- adjust module config
+- systemd has new library names
+- take all of fontconfig - see sr#224058
+
+-------------------------------------------------------------------
+Fri Feb 28 14:10:48 CET 2014 - [email protected]
+
+- adjust s390x parameters (bnc #866061)
+
+-------------------------------------------------------------------
+Thu Feb 27 15:43:15 CET 2014 - [email protected]
+
+- remove special branding image
+- remove last remaining explicit qt4 references
+
+-------------------------------------------------------------------
+Thu Feb 27 12:51:04 CET 2014 - [email protected]
+
+- move s390x files to branding directory
+- kill dhcpcd entirely
+- create cd.ikr
+- Add mount-rootfs-and-do-chroot.sh to inst-sys and rescue (bnc #674684)
+- Add ed25519_key to predefined ssh keys
+- Include hyper-v package in inst-sys and rescue to enable the host to query
IP addresses.
+- rearrange s390x files (bnc #865348)
+- rename IMAGE to LINUX in sles12.exec (bnc #865348)
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.47.tar.bz2
New:
----
installation-images-14.55.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.1557CJ/_old 2014-03-06 19:29:41.000000000 +0100
+++ /var/tmp/diff_new_pack.1557CJ/_new 2014-03-06 19:29:41.000000000 +0100
@@ -75,7 +75,6 @@
BuildRequires: dd_rescue
BuildRequires: dejavu-fonts
BuildRequires: dhcp-server
-BuildRequires: dhcpcd
BuildRequires: dmapi
BuildRequires: dmraid
BuildRequires: dosfstools
@@ -347,15 +346,15 @@
BuildRequires: dmz-icon-theme-cursors
Name: installation-images-%theme
-Provides: installation-images = %version-%release
AutoReqProv: off
ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.47
+Version: 14.55
Release: 0
-Source: installation-images-14.47.tar.bz2
+Provides: installation-images = %version-%release
+Source: installation-images-14.55.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.47.tar.bz2 -> installation-images-14.55.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/Makefile
new/installation-images-14.55/Makefile
--- old/installation-images-14.47/Makefile 2014-02-18 10:26:53.000000000
+0100
+++ new/installation-images-14.55/Makefile 2014-02-27 15:14:50.000000000
+0100
@@ -5,7 +5,7 @@
GIT2LOG = $(shell [ -x ./git2log ] && echo ./git2log )
-COMMON_TARGETS := rescue root root+rescue root-themes bind gdb
mini-iso-rmlist
+COMMON_TARGETS := rescue root root+rescue bind gdb mini-iso-rmlist
COMMON_INSTSYS_PARTS := config rpmlist root common rescue bind gdb
ifneq ($(filter i386, $(ARCH)),)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/VERSION
new/installation-images-14.55/VERSION
--- old/installation-images-14.47/VERSION 2014-02-21 16:22:41.000000000
+0100
+++ new/installation-images-14.55/VERSION 2014-03-06 16:22:11.000000000
+0100
@@ -1 +1 @@
-14.47
+14.55
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/bin/mk_cd_ikr
new/installation-images-14.55/bin/mk_cd_ikr
--- old/installation-images-14.47/bin/mk_cd_ikr 1970-01-01 01:00:00.000000000
+0100
+++ new/installation-images-14.55/bin/mk_cd_ikr 2014-02-27 11:38:38.000000000
+0100
@@ -0,0 +1,69 @@
+#! /usr/bin/perl
+
+# Creates cd.ikr from suse.ins.
+#
+# Note this expects parmfile.cd to be present as well; parmfile.cd can be
+# removed after creating cd.ikr.
+#
+# Usage: mk_cd_ikr /foo/bar/suse.ins
+#
+
+use strict;
+
+sub create_cd_ikr;
+
+create_cd_ikr $ARGV[0];
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub create_cd_ikr
+{
+ my $ins = shift;
+
+ my $dir = $ins;
+ $dir =~ s#/[^/]*$##;
+
+ my $ikr = "$dir/cd.ikr";
+
+ my @layout;
+
+ if(open my $s, $ins) {
+ while(<$s>) {
+ next if /^\s*\*/;
+ push @layout, { file => "$dir/$1", ofs => oct($2) } if
/^\s*(\S+)\s+(\S+)/;
+ }
+ close $s;
+ }
+
+ die "$ins: nothing to do?\n" if !@layout;
+
+ if(open my $d, ">", $ikr) {
+ for (@layout) {
+ my $fname = $_->{file};
+ my $is_parmfile;
+ $is_parmfile = 1 if $fname =~ s#(/parmfile)$#$1.cd#;
+ if(open my $f, $fname) {
+ sysread $f, my $buf, -s($f);
+ close $f;
+ sysseek $d, $_->{ofs}, 0;
+ # remove newlines from parmfile
+ $buf =~ s/\n+/ /g if $is_parmfile;
+ syswrite $d, $buf;
+ # print "$fname: $_->{ofs} ", length($buf), "\n";
+ }
+ else {
+ die "$_->{file}: $!\n";
+ }
+ }
+
+ sysseek $d, 4, 0;
+ syswrite $d, pack("N",0x80010000);
+
+ # align to 4k
+ sysseek $d, -s($d) | 0xfff, 0;
+ syswrite $d, "\x00";
+
+ close $d;
+ }
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/changelog
new/installation-images-14.55/changelog
--- old/installation-images-14.47/changelog 2014-02-21 16:22:45.000000000
+0100
+++ new/installation-images-14.55/changelog 2014-03-06 16:22:15.000000000
+0100
@@ -1,4 +1,47 @@
-2014-02-21: HEAD
+2014-03-06: HEAD
+ - add sg3_utils to initrd (bnc #866933)
+
+2014-03-06: 14.54
+ - add sysconfig-netconfig to initrd (bnc #867078)
+
+2014-03-05: 14.53
+ - fix yast2 theme handling in openSUSE
+ - change terminal to ibm3270
+
+2014-03-04: 14.52
+ - fix rescue system (bnc #841695)
+
+2014-03-03: 14.51
+ - rename yast theme in openSUSE
+ - filesystem package comes with /var/run symlink
+ - adjust module config
+ - systemd has new library names
+ - take all of fontconfig - see sr#224058
+
+2014-02-28: 14.50
+ - adjust s390x parameters (bnc #866061)
+
+2014-02-27: 14.49
+ - remove special branding image
+ - remove last remaining explicit qt4 references
+
+2014-02-27: 14.48
+ - move s390x files to branding directory
+ - kill dhcpcd entirely
+ - create cd.ikr
+ - Merge pull request #10 from olafhering/olh-misc
+ - changes for sles12
+ - Add mount-rootfs-and-do-chroot.sh to inst-sys and rescue (bnc #674684)
+ - Signed-off-by: Olaf Hering <[email protected]>
+ - Add ed25519_key to predefined ssh keys
+ - Signed-off-by: Olaf Hering <[email protected]>
+ - Include hyper-v package in inst-sys and rescue
+ - ... to enable the host to query IP addresses.
+ - Signed-off-by: Olaf Hering <[email protected]>
+ - rearrange s390x files (bnc #865348)
+ - rename IMAGE to LINUX in sles12.exec (bnc #865348)
+
+2014-02-21: 14.47
- replace sles11.exec with sles12.exec (bnc #865109)
- link gawk also in initrd or we get dangling symlinks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/initrd.file_list
new/installation-images-14.55/data/initrd/initrd.file_list
--- old/installation-images-14.47/data/initrd/initrd.file_list 2014-02-21
15:27:04.000000000 +0100
+++ new/installation-images-14.55/data/initrd/initrd.file_list 2014-03-06
15:52:43.000000000 +0100
@@ -1,7 +1,7 @@
d bin dev etc mnt proc sys tmp
d run/dbus
d var/run var/spool var/lock/libstorage var/tmp var/log/YaST2 var/adm/mount
-d var/lib/YaST2 var/lib/dhcpcd var/lib/hardware/unique-keys var/lib/autoinstall
+d var/lib/YaST2 var/lib/hardware/unique-keys var/lib/autoinstall
d var/run/hotplug var/cache/fontconfig
d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind
d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/cache/zypp
var/lib/sax
@@ -99,7 +99,6 @@
cpio:
curl:
device-mapper:
-dhcpcd:
ethtool:
glibc:
hwinfo:
@@ -112,6 +111,8 @@
pcmciautils:
sed:
?wicked:
+sysconfig-netconfig:
+sg3_utils:
if arch eq 'aarch64'
qemu-linux-aarch64:
@@ -170,10 +171,6 @@
/usr/share/kbd/consoletrans/koi2alt
/usr/share/kbd/consoletrans/trivial
-sg3_utils:
- /usr/bin/sg_luns
- /usr/bin/sg_inq
-
cifs-utils:
/sbin/mount.cifs
@@ -370,8 +367,7 @@
# maybe we don't need everything...
systemd:
- /usr/lib*/libsystemd-journal.so.*
- /usr/lib*/libsystemd-login.so.*
+ /usr/lib*/libsystemd*.so.*
sysconfig:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/data/initrd/s390/parmfile
new/installation-images-14.55/data/initrd/s390/parmfile
--- old/installation-images-14.47/data/initrd/s390/parmfile 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/parmfile 2014-03-04
15:01:22.000000000 +0100
@@ -0,0 +1,2 @@
+TERM=ibm327x conmode=3270 manual=1
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/parmfile.cd
new/installation-images-14.55/data/initrd/s390/parmfile.cd
--- old/installation-images-14.47/data/initrd/s390/parmfile.cd 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/parmfile.cd 2014-02-28
11:18:40.000000000 +0100
@@ -0,0 +1,2 @@
+TERM=linux console=ttyS0 netsetup=1
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/sles12.exec
new/installation-images-14.55/data/initrd/s390/sles12.exec
--- old/installation-images-14.47/data/initrd/s390/sles12.exec 2014-02-21
16:16:57.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/sles12.exec 2014-02-26
14:12:44.000000000 +0100
@@ -5,7 +5,7 @@
'CP CLOSE RDR'
'PURGE RDR ALL'
'SPOOL PUNCH * RDR'
-'PUNCH SLES12 IMAGE A (NOH'
+'PUNCH SLES12 LINUX A (NOH'
'PUNCH SLES12 PARMFILE A (NOH'
'PUNCH SLES12 INITRD A (NOH'
'IPL 00C'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/data/initrd/s390/suse.ins
new/installation-images-14.55/data/initrd/s390/suse.ins
--- old/installation-images-14.47/data/initrd/s390/suse.ins 1970-01-01
01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins 2014-02-28
11:18:57.000000000 +0100
@@ -0,0 +1,6 @@
+* SuSE Linux for zSeries Installation/Rescue System
+linux 0x00000000
+initrd.off 0x0001040c
+initrd.siz 0x00010414
+initrd 0x01000000
+parmfile 0x00010480
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.images.s390
new/installation-images-14.55/data/initrd/s390/suse.ins.images.s390
--- old/installation-images-14.47/data/initrd/s390/suse.ins.images.s390
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.images.s390
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-* SuSE Linux for S/390 and zSeries Installation/Rescue System
-vmrdr.ikr 0x00000000
-initrd.off 0x0001040c
-initrd.siz 0x00010414
-initrd 0x00800000
-parmfile 0x00010480
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.images.s390x
new/installation-images-14.55/data/initrd/s390/suse.ins.images.s390x
--- old/installation-images-14.47/data/initrd/s390/suse.ins.images.s390x
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.images.s390x
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-* SuSE Linux for zSeries Installation/Rescue System
-vmrdr.ikr 0x00000000
-initrd.off 0x0001040c
-initrd.siz 0x00010414
-initrd 0x00800000
-parmfile 0x00010480
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.parmfile
new/installation-images-14.55/data/initrd/s390/suse.ins.parmfile
--- old/installation-images-14.47/data/initrd/s390/suse.ins.parmfile
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.parmfile
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-ramdisk_size=65536 root=/dev/ram1 ro init=/linuxrc TERM=dumb
-manual=1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.parmfile.cd
new/installation-images-14.55/data/initrd/s390/suse.ins.parmfile.cd
--- old/installation-images-14.47/data/initrd/s390/suse.ins.parmfile.cd
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.parmfile.cd
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-ramdisk_size=65536 root=/dev/ram1 ro init=/linuxrc TERM=linux
-console=ttyS0 netsetup=1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.root.s390
new/installation-images-14.55/data/initrd/s390/suse.ins.root.s390
--- old/installation-images-14.47/data/initrd/s390/suse.ins.root.s390
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.root.s390
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-* SuSE Linux for S/390 and zSeries Installation/Rescue System
-boot/s390/vmrdr.ikr 0x00000000
-boot/s390/initrd.off 0x0001040c
-boot/s390/initrd.siz 0x00010414
-boot/s390/initrd 0x00800000
-boot/s390/parmfile 0x00010480
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/s390/suse.ins.root.s390x
new/installation-images-14.55/data/initrd/s390/suse.ins.root.s390x
--- old/installation-images-14.47/data/initrd/s390/suse.ins.root.s390x
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/s390/suse.ins.root.s390x
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-* SuSE Linux for zSeries Installation/Rescue System
-boot/s390x/vmrdr.ikr 0x00000000
-boot/s390x/initrd.off 0x0001040c
-boot/s390x/initrd.siz 0x00010414
-boot/s390x/initrd 0x00800000
-boot/s390x/parmfile 0x00010480
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/initrd/scripts/prepare_rescue
new/installation-images-14.55/data/initrd/scripts/prepare_rescue
--- old/installation-images-14.47/data/initrd/scripts/prepare_rescue
2013-11-18 11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/initrd/scripts/prepare_rescue
2014-03-04 12:38:06.000000000 +0100
@@ -17,9 +17,11 @@
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
+cd /mounts/initrd
+for i in etc/modprobe.d/blacklist etc/modprobe.d/noload etc/resolv.conf
etc/sysconfig/network/* ; do
+ [ -f "$i" ] && cp -f "$i" "/$i"
done
+cd /
# bash >/dev/console 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/rescue/mount-rootfs-and-do-chroot.sh
new/installation-images-14.55/data/rescue/mount-rootfs-and-do-chroot.sh
--- old/installation-images-14.47/data/rescue/mount-rootfs-and-do-chroot.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/rescue/mount-rootfs-and-do-chroot.sh
2014-02-27 11:14:30.000000000 +0100
@@ -0,0 +1,42 @@
+#!/bin/bash
+# Usage: $0 /dev/sda5
+rootfs=$1
+mnt=/rootfs.${PPID}.$$
+mounts=
+
+if test -b "${rootfs}"
+then
+ mkdir -pv "${mnt}"
+ if mount -v "${rootfs}" "${mnt}"
+ then
+ for i in dev dev/pts proc sys
+ do
+ if test -d /${i} && test -d "${mnt}/${i}" && test
"`stat -c %D /`" != "`stat -c %D /${i}`"
+ then
+ mount -v --bind /${i} "${mnt}/${i}"
+ fi
+ done
+
+ echo "Performing chroot into ${rootfs}. Use 'exit' or 'CTRL+d'
to leave chroot shell."
+ chroot "${mnt}" su -
+
+ while read b m rest
+ do
+ case "${m}" in
+ ${mnt}*)
+ mounts="${m} ${mounts}"
+ ;;
+ esac
+ done <<-EOF
+`
+cat < /proc/mounts
+`
+EOF
+
+ for i in ${mounts}
+ do
+ umount -v "${i}"
+ done
+ rmdir -v "${mnt}"
+ fi
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/rescue/rescue.file_list
new/installation-images-14.55/data/rescue/rescue.file_list
--- old/installation-images-14.47/data/rescue/rescue.file_list 2014-02-18
10:58:14.000000000 +0100
+++ new/installation-images-14.55/data/rescue/rescue.file_list 2014-03-04
11:55:44.000000000 +0100
@@ -26,6 +26,20 @@
TEMPLATE:
/
+# install filesystem first and *REMOVE* /var/run link
+filesystem:
+ /etc/{ppp,rc.d,uucp}
+ /etc/sysconfig
+ /root
+ /run
+ /etc/init.d
+ /usr/tmp
+ /var
+ # remove symlink to /run
+ e [ -L var/run ] && rm var/run ; true
+ # remove temporarily so that 'mount /sys' doesn't work
+ r /sys
+
AUTODEPS:
dbus-1-x11: ignore
@@ -50,6 +64,7 @@
?grub2-powerpc-ieee1275:
?grub2:
?grub:
+?hyper-v:
?iprutils:
?lilo:
?pdisk:
@@ -75,7 +90,6 @@
cryptsetup:
curl:
dd_rescue:
-dhcpcd:
diffutils:
dosfstools:
?dracut:
@@ -143,7 +157,6 @@
sysconfig-netconfig:
systemd-presets-branding-<base_theme>:
systemd-sysvinit:
-systemd:
tar:
telnet:
terminfo-base:
@@ -179,18 +192,6 @@
/usr/bin/gawk
s gawk usr/bin/awk
-filesystem:
- /etc/{ppp,rc.d,uucp}
- /etc/sysconfig
- /root
- /run
- /etc/init.d
- /usr/tmp
- /var
-
- # remove temporarily so that 'mount /sys' doesn't work
- r /sys
-
glibc-locale:
/usr/lib*/gconv/ISO8859*
/usr/lib*/gconv/KOI*
@@ -284,6 +285,10 @@
E prein
E postin
+systemd:
+ /
+ E prein
+
lvm2:
device-mapper:
rpcbind:
@@ -317,17 +322,17 @@
# 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
+r dev/mapper dev/stderr dev/initctl
# we better have one...
e touch etc/sysconfig/kernel
-# our own dhcp6c config
-x etc/dhcp6c.conf etc
-
# our own mount
e mv usr/bin/mount usr/bin/mount.bin
x mount usr/bin
+x mount-rootfs-and-do-chroot.sh /bin
+
# run getty on tty1
d etc/systemd/system/getty.target.wants
s /usr/lib/systemd/system/[email protected]
etc/systemd/system/getty.target.wants/[email protected]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/data/root/config
new/installation-images-14.55/data/root/config
--- old/installation-images-14.47/data/root/config 2013-11-18
11:49:20.000000000 +0100
+++ new/installation-images-14.55/data/root/config 2014-02-27
15:21:30.000000000 +0100
@@ -1,4 +1,4 @@
-root: common root cracklib-dict-full.rpm bind branding
?yast2-trans-<lang>.rpm
+root: common root cracklib-dict-full.rpm bind
?yast2-trans-<lang>.rpm
rescue: common rescue ?cracklib-dict-full.rpm
yast2-trans-ar.rpm: yast2-trans-ar.rpm arabic-fonts.rpm?list=*/KacstBook.ttf
yast2-trans-bn.rpm: yast2-trans-bn.rpm
indic-fonts.rpm?list=*/MuktiNarrow.ttf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/root/etc/ssh/ssh_host_ed25519_key
new/installation-images-14.55/data/root/etc/ssh/ssh_host_ed25519_key
--- old/installation-images-14.47/data/root/etc/ssh/ssh_host_ed25519_key
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/root/etc/ssh/ssh_host_ed25519_key
2014-02-27 11:14:30.000000000 +0100
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACCrSnkJXB6hhQX1xUuqpzLz47+YqEKXghvxK1RUVqNX3gAAAJiVn56QlZ+e
+kAAAAAtzc2gtZWQyNTUxOQAAACCrSnkJXB6hhQX1xUuqpzLz47+YqEKXghvxK1RUVqNX3g
+AAAECDYlcQRZA7JtwMt1wNpI7NmwjDUKvfxQeQQjcJfAkTpqtKeQlcHqGFBfXFS6qnMvPj
+v5ioQpeCG/ErVFRWo1feAAAAD2hhY2tlckBpbnN0LXN5cwECAwQFBg==
+-----END OPENSSH PRIVATE KEY-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.47/data/root/etc/ssh/ssh_host_ed25519_key.pub
new/installation-images-14.55/data/root/etc/ssh/ssh_host_ed25519_key.pub
--- old/installation-images-14.47/data/root/etc/ssh/ssh_host_ed25519_key.pub
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.55/data/root/etc/ssh/ssh_host_ed25519_key.pub
2014-02-27 11:14:30.000000000 +0100
@@ -0,0 +1 @@
+ssh-ed25519
AAAAC3NzaC1lZDI1NTE5AAAAIKtKeQlcHqGFBfXFS6qnMvPjv5ioQpeCG/ErVFRWo1fe
hacker@inst-sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/data/root/root.file_list
new/installation-images-14.55/data/root/root.file_list
--- old/installation-images-14.47/data/root/root.file_list 2014-02-19
08:23:57.000000000 +0100
+++ new/installation-images-14.55/data/root/root.file_list 2014-03-05
11:44:58.000000000 +0100
@@ -32,6 +32,10 @@
# just a template that does nothing
d .
+TEMPLATE yast2-theme-openSUSE:
+ # yast2 openSUSE theme is just broken...
+ /usr/share/YaST2
+
TEMPLATE:
/
@@ -73,7 +77,6 @@
unzip: ignore
?dracut: ignore
?mkinitrd: ignore
-?yast2-theme-openSUSE-Oxygen: ignore
if arch eq 'aarch64'
qemu-linux-aarch64:
@@ -99,6 +102,7 @@
gzip:
hex:
hwinfo:
+?hyper-v:
initviocons:
insserv-compat:
iputils:
@@ -178,6 +182,8 @@
/run
/var
t /var/log/{faillog,lastlog,mail,messages,sendmail.st,wtmp,xdm.errors}
+ # remove symlink to /run
+ e [ -L var/run ] && rm var/run ; true
bash:
/bin/bash
@@ -337,6 +343,8 @@
x root/.bash_login /root
x root/.vimrc /root
+ x ../rescue/mount-rootfs-and-do-chroot.sh /bin
+
openssl:
/usr/share/ssl
@@ -453,11 +461,6 @@
gpm:
/usr/sbin/gpm
-fontconfig:
- /
- r /etc/fonts/local.conf
- m /etc/fonts/local.conf.instsys /etc/fonts/local.conf
-
xdm:
/etc/X11/xdm/Keyboard.map
@@ -515,15 +518,6 @@
/usr/bin/icewm-lite
s /usr/bin/icewm-lite /usr/bin/icewm
-# once qt5 port of libyui is in, remove
-?libqt4:
- /usr/lib*/libQtCore.so.*
- /usr/share/qt4/translations/qt_*.qm
-
-?libqt4-x11:
- /usr/lib*/libQtGui.so.*
- /usr/lib*/qt4/plugins/imageformats/libqjpeg.so
-
dejavu-fonts:
/usr/share/fonts/truetype/DejaVuSans*.ttf
r /usr/share/fonts/truetype/DejaVuSansCondensed*
@@ -537,9 +531,6 @@
dmz-icon-theme-cursors:
/usr/share/icons/DMZ
-desktop-data-openSUSE: nodeps
- /usr/share/icons/hicolor/32x32/apps/package_utility_desktop.png
-
multipath-tools:
/sbin
@@ -591,6 +582,9 @@
:
+# set yast theme
+s <yast_theme> usr/share/YaST2/theme/current
+
x etc/suse-post-user.conf etc/fonts/
e mkfontscale usr/share/fonts/misc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/etc/module.config
new/installation-images-14.55/etc/module.config
--- old/installation-images-14.47/etc/module.config 2014-01-28
10:17:36.000000000 +0100
+++ new/installation-images-14.55/etc/module.config 2014-03-03
11:11:38.000000000 +0100
@@ -143,6 +143,10 @@
ezusb
dsa_core
ip_tunnel
+dns_resolver
+rapidio
+ntb
+ntb_netdev
kernel/drivers/hv/.*
kernel/drivers/staging/hv/.*
@@ -151,6 +155,7 @@
kernel/crypto/.*
kernel/drivers/crypto/.*
kernel/drivers/firmware/.*
+kernel/drivers/leds/.*
kernel/drivers/md/.*
kernel/drivers/platform/.*
kernel/drivers/base/regmap/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/etc/module.list
new/installation-images-14.55/etc/module.list
--- old/installation-images-14.47/etc/module.list 2014-01-20
12:22:52.000000000 +0100
+++ new/installation-images-14.55/etc/module.list 2014-03-03
11:11:20.000000000 +0100
@@ -217,6 +217,12 @@
kernel/net/dsa/dsa_core.ko
kernel/net/ipv4/ip_tunnel.ko
+kernel/drivers/leds/led-class.ko
+kernel/net/dns_resolver/dns_resolver.ko
+kernel/drivers/rapidio/rapidio.ko
+kernel/drivers/ntb/ntb.ko
+
+
# kmps
updates/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/install.aarch64
new/installation-images-14.55/install.aarch64
--- old/installation-images-14.47/install.aarch64 2014-02-05
09:33:50.000000000 +0100
+++ new/installation-images-14.55/install.aarch64 2014-02-27
15:17:24.000000000 +0100
@@ -20,9 +20,6 @@
for i in $INSTSYS_PARTS $BOOT_PARTS ; do
[ -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
- ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
done
mkdir -p $DESTDIR/usr/share
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/install.i386
new/installation-images-14.55/install.i386
--- old/installation-images-14.47/install.i386 2014-01-29 15:19:16.000000000
+0100
+++ new/installation-images-14.55/install.i386 2014-02-27 15:15:54.000000000
+0100
@@ -39,9 +39,6 @@
cp -r images/$theme/EFI/EFI/BOOT/* $DESTDIR/branding/$theme/CD1/EFI/BOOT
fi
- cp images/$theme/$theme $DESTDIR/branding/$theme/CD1/boot/$ARCH
- ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
-
# xen initrd
for i in images/$theme/initrd-+([^.]) ; do
[ -f "$i" ] && cp $i $DESTDIR/branding/$theme/CD1/boot/$ARCH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/install.ia64
new/installation-images-14.55/install.ia64
--- old/installation-images-14.47/install.ia64 2013-11-18 11:49:20.000000000
+0100
+++ new/installation-images-14.55/install.ia64 2014-02-27 15:17:51.000000000
+0100
@@ -21,9 +21,6 @@
[ -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
- ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
-
ln -s efi $DESTDIR/branding/$theme/CD1/boot/$ARCH/image
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/install.ppc
new/installation-images-14.55/install.ppc
--- old/installation-images-14.47/install.ppc 2014-02-17 13:24:58.000000000
+0100
+++ new/installation-images-14.55/install.ppc 2014-02-27 15:18:03.000000000
+0100
@@ -21,9 +21,6 @@
[ -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
- ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
-
case "$ARCH" in
ppc) BITS="-32 -64";;
ppc64|ppc64le) BITS="-64";;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.47/install.s390x
new/installation-images-14.55/install.s390x
--- old/installation-images-14.47/install.s390x 2014-02-21 16:21:45.000000000
+0100
+++ new/installation-images-14.55/install.s390x 2014-02-28 11:19:23.000000000
+0100
@@ -21,23 +21,24 @@
[ -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
- ln -s $theme $DESTDIR/branding/$theme/CD1/boot/$ARCH/branding
-
perl -e "print pack('N', -s
'$DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd')"
>$DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd.siz
- perl -e "print pack('N', 0x800000)"
>$DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd.off
-done
+ perl -e "print pack('N', 0x1000000)"
>$DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd.off
-[ -f /boot/kernel-installation-tapeipl/image ] && install -m 644
/boot/kernel-installation-tapeipl/image $DESTDIR/CD1/boot/$ARCH/tapeipl.ikr
-install -m 644 /boot/image-* $DESTDIR/CD1/boot/$ARCH/vmrdr.ikr
+ install -m 644 /boot/image-* $DESTDIR/branding/$theme/CD1/boot/$ARCH/linux
-install -m 644 data/initrd/s390/suse.ins.root.$ARCH $DESTDIR/CD1/suse.ins
-install -m 644 data/initrd/s390/suse.ins.images.$ARCH
$DESTDIR/CD1/boot/$ARCH/suse.ins
+ install -m 644 data/initrd/s390/suse.ins
$DESTDIR/branding/$theme/CD1/suse.ins
+ perl -pi -e "s#^([^*]+)#boot/$ARCH/\$1#"
$DESTDIR/branding/$theme/CD1/suse.ins
+ install -m 644 data/initrd/s390/suse.ins
$DESTDIR/branding/$theme/CD1/boot/$ARCH/suse.ins
-install -m 644 data/initrd/s390/suse.ins.parmfile
$DESTDIR/CD1/boot/$ARCH/parmfile
-install -m 644 data/initrd/s390/suse.ins.parmfile.cd
$DESTDIR/CD1/boot/$ARCH/parmfile.cd
+ install -m 644 data/initrd/s390/parmfile
$DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile
+ install -m 644 data/initrd/s390/parmfile.cd
$DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.cd
-install -m 644 data/initrd/s390/sles12.exec $DESTDIR/CD1/boot/$ARCH/sles12.exec
+ install -m 644 data/initrd/s390/sles12.exec
$DESTDIR/branding/$theme/CD1/boot/$ARCH/sles12.exec
+
+ # create cd.ikr and remove no longer needed parmfile.cd
+ bin/mk_cd_ikr $DESTDIR/branding/$theme/CD1/boot/$ARCH/suse.ins
+ rm $DESTDIR/branding/$theme/CD1/boot/$ARCH/parmfile.cd
+done
mkdir -p $DESTDIR/usr/share
cp images/mini-iso-rmlist $DESTDIR/usr/share
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
