Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2012-06-18 14:52:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2012-06-15 19:36:15.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2012-06-18 14:52:46.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 18 13:23:30 CEST 2012 - snw...@suse.de
+
+- add all of kbd to inst-sys
+
+-------------------------------------------------------------------
Old:
----
installation-images-13.47.patch
installation-images-13.47.tar.bz2
ssh-install.patch
New:
----
installation-images-13.48.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.qXecVC/_old 2012-06-18 14:52:50.000000000 +0200
+++ /var/tmp/diff_new_pack.qXecVC/_new 2012-06-18 14:52:50.000000000 +0200
@@ -356,11 +356,9 @@
Summary: Installation Image Files
License: GPL-2.0+
Group: Metapackages
-Version: 13.47
+Version: 13.48
Release: 0
-Source: installation-images-13.47.tar.bz2
-Patch0: installation-images-13.47.patch
-Patch676205: ssh-install.patch
+Source: installation-images-13.48.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -423,8 +421,6 @@
%prep
%setup
-%patch0 -p1
-%patch676205 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-13.47.tar.bz2 -> installation-images-13.48.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-13.47/VERSION
new/installation-images-13.48/VERSION
--- old/installation-images-13.47/VERSION 2012-06-05 17:10:47.000000000
+0200
+++ new/installation-images-13.48/VERSION 2012-06-18 13:23:24.000000000
+0200
@@ -1 +1 @@
-13.47
+13.48
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-13.47/changelog
new/installation-images-13.48/changelog
--- old/installation-images-13.47/changelog 2012-06-05 17:10:51.000000000
+0200
+++ new/installation-images-13.48/changelog 2012-06-18 13:23:28.000000000
+0200
@@ -1,4 +1,9 @@
-2012-06-05: HEAD
+2012-06-18: HEAD
+ - adjust to package changes
+ - add all of kbd to inst-sys
+ - restore ssh install helper features (bnc #676205)
+
+2012-06-05: 13.47
- added yast2-proxy
2012-05-23: 13.46
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-13.47/data/base/base.file_list
new/installation-images-13.48/data/base/base.file_list
--- old/installation-images-13.47/data/base/base.file_list 2012-05-23
12:08:22.000000000 +0200
+++ new/installation-images-13.48/data/base/base.file_list 2012-06-18
13:04:52.000000000 +0200
@@ -113,6 +113,9 @@
module-init-tools:
/
+libprocps*:
+ /
+
procps:
/bin/ps
/usr/bin/{free,top,vmstat}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/initrd/initrd.file_list
new/installation-images-13.48/data/initrd/initrd.file_list
--- old/installation-images-13.47/data/initrd/initrd.file_list 2012-05-23
12:09:58.000000000 +0200
+++ new/installation-images-13.48/data/initrd/initrd.file_list 2012-06-18
13:04:52.000000000 +0200
@@ -563,6 +563,9 @@
libexpat1:
/lib*/libexpat.so.*
+ libprocps*:
+ /
+
procps:
/bin/ps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/rescue/rescue.file_list
new/installation-images-13.48/data/rescue/rescue.file_list
--- old/installation-images-13.47/data/rescue/rescue.file_list 2012-06-05
15:26:21.000000000 +0200
+++ new/installation-images-13.48/data/rescue/rescue.file_list 2012-06-18
13:04:52.000000000 +0200
@@ -345,6 +345,9 @@
libtirpc*:
/
+libprocps*:
+ /
+
procps:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/root/etc/inst_setup_ssh
new/installation-images-13.48/data/root/etc/inst_setup_ssh
--- old/installation-images-13.47/data/root/etc/inst_setup_ssh 2012-02-09
10:24:01.000000000 +0100
+++ new/installation-images-13.48/data/root/etc/inst_setup_ssh 2012-06-18
13:05:23.000000000 +0200
@@ -1,16 +1,42 @@
# will be sourced by /sbin/inst_setup
+# but can also be called manually: $0 [-n] rootpassword
# vim: syntax=sh
+nosshkey=false
+if [ "$1" = "-n" ] ; then
+ nosshkey=true
+ shift
+fi
+
if grep -qwi nosshkey < /proc/cmdline ; then
nosshkey=true
fi
+if ! test -z "$1" ; then
+ sshpassword=$1
+fi
+
if [ "$nosshkey" = "true" ] ; then
# for inst-sys testing
echo using built-in ssh keys
cp -a --remove-destination /lib/ssh/*key* /etc/ssh/
+ chmod 644 /etc/ssh/*key.pub
+ chmod 600 /etc/ssh/*key
+fi
+
+if [ ! -z "$sshpassword" ] ; then
+ mv -f /etc/passwd /etc/passwd.
+ mv -f /etc/shadow /etc/shadow.
+ cat /etc/passwd. > /etc/passwd
+ cat /etc/shadow. > /etc/shadow
+ chmod 600 /etc/shadow
+ chmod 644 /etc/passwd
+ echo "setting temporary root password to '$sshpassword'"
+ echo "root:$sshpassword" | chpasswd
fi
+chown -R 0.0 /etc/ssh /root /etc/shadow 2>/dev/null
+echo "Starting SSH daemon ... "
rcsshd start || {
export SSH_FAILED=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/root/etc/ssh/ssh_host_ecdsa_key
new/installation-images-13.48/data/root/etc/ssh/ssh_host_ecdsa_key
--- old/installation-images-13.47/data/root/etc/ssh/ssh_host_ecdsa_key
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-13.48/data/root/etc/ssh/ssh_host_ecdsa_key
2012-06-18 13:05:23.000000000 +0200
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIF0sC69t/7wGedXX2s2A/8Koaaw/Le9HVmJG1WZPkTQ4oAoGCCqGSM49
+AwEHoUQDQgAEHnzl/+HeCasHofmim3tzcWwFyKPFipnMv9NFCmf/lTUDCxABJHxC
+6+fi3wzmjWatuK1PZ8nyMMAs4GTke1CHCw==
+-----END EC PRIVATE KEY-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/root/etc/ssh/ssh_host_ecdsa_key.pub
new/installation-images-13.48/data/root/etc/ssh/ssh_host_ecdsa_key.pub
--- old/installation-images-13.47/data/root/etc/ssh/ssh_host_ecdsa_key.pub
1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-13.48/data/root/etc/ssh/ssh_host_ecdsa_key.pub
2012-06-18 13:05:23.000000000 +0200
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256
AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB585f/h3gmrB6H5opt7c3FsBcijxYqZzL/TRQpn/5U1AwsQASR8Quvn4t8M5o1mrbitT2fJ8jDALOBk5HtQhws=
hacker@instsys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-13.47/data/root/root.file_list
new/installation-images-13.48/data/root/root.file_list
--- old/installation-images-13.47/data/root/root.file_list 2012-06-05
14:20:57.000000000 +0200
+++ new/installation-images-13.48/data/root/root.file_list 2012-06-18
13:06:46.000000000 +0200
@@ -295,6 +295,9 @@
module-init-tools:
/
+libprocps*:
+ /
+
procps:
/
@@ -938,16 +941,7 @@
if !(arch eq 's390' || arch eq 's390x')
kbd:
- /usr/share/kbd
- /usr/bin/chvt
- /usr/bin/dumpkeys
- /usr/bin/kbd_mode
- /usr/bin/loadkeys
- /usr/bin/loadunimap
- /usr/bin/setfont
- /usr/bin/testutf8
- /usr/bin/unicode_start
- /usr/bin/unicode_stop
+ /
m /var/adm/fillup-templates/sysconfig.keyboard /etc/sysconfig/keyboard
endif
@@ -1083,9 +1077,6 @@
libXmuu*:
/
- libXp*:
- /
-
libXpm*:
/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-13.47/data/root/zenroot.file_list
new/installation-images-13.48/data/root/zenroot.file_list
--- old/installation-images-13.47/data/root/zenroot.file_list 2012-02-22
14:07:28.000000000 +0100
+++ new/installation-images-13.48/data/root/zenroot.file_list 2012-06-18
13:04:52.000000000 +0200
@@ -301,6 +301,9 @@
/sbin/{depmod,insmod,modinfo,modprobe,rmmod}
/bin/lsmod
+libprocps*:
+ /
+
procps:
/bin/ps
/usr/bin/{free,top,vmstat}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
