Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-06-12 11:12: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-06-06 18:02:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-06-12 11:12:56.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Jun 12 07:58:42 UTC 2012 - [email protected] + +- do not build on %arm, we only have live images there + +------------------------------------------------------------------- +Sat Jun 9 08:06:02 CEST 2012 - [email protected] + +- adjust to package changes, libprocfs + +------------------------------------------------------------------- +Wed Jun 6 17:20:49 CEST 2012 - [email protected] + +- Restore ssh install helper features (bnc#676205) + +------------------------------------------------------------------- New: ---- installation-images-13.47.patch ssh-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.iyDgRk/_old 2012-06-12 11:12:58.000000000 +0200 +++ /var/tmp/diff_new_pack.iyDgRk/_new 2012-06-12 11:12:58.000000000 +0200 @@ -351,12 +351,15 @@ Provides: y2image Obsoletes: y2image AutoReqProv: off +ExcludeArch: %arm Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages Version: 13.47 Release: 0 Source: installation-images-13.47.tar.bz2 +Patch0: installation-images-13.47.patch +Patch676205: ssh-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -419,6 +422,8 @@ %prep %setup +%patch0 -p1 +%patch676205 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build ++++++ installation-images-13.47.patch ++++++ --- data/base/base.file_list | 3 +++ data/initrd/initrd.file_list | 3 +++ data/rescue/rescue.file_list | 3 +++ data/root/root.file_list | 3 +++ data/root/zenroot.file_list | 3 +++ 5 files changed, 15 insertions(+) Index: installation-images-13.47/data/base/base.file_list =================================================================== --- installation-images-13.47.orig/data/base/base.file_list +++ installation-images-13.47/data/base/base.file_list @@ -113,6 +113,9 @@ r /usr/bin/{db*,glibcbug,rpcgen} module-init-tools: / +libprocps*: + / + procps: /bin/ps /usr/bin/{free,top,vmstat} Index: installation-images-13.47/data/initrd/initrd.file_list =================================================================== --- installation-images-13.47.orig/data/initrd/initrd.file_list +++ installation-images-13.47/data/initrd/initrd.file_list @@ -563,6 +563,9 @@ if with_gdb libexpat1: /lib*/libexpat.so.* + libprocps*: + / + procps: /bin/ps Index: installation-images-13.47/data/rescue/rescue.file_list =================================================================== --- installation-images-13.47.orig/data/rescue/rescue.file_list +++ installation-images-13.47/data/rescue/rescue.file_list @@ -345,6 +345,9 @@ libusb-*-*: libtirpc*: / +libprocps*: + / + procps: / Index: installation-images-13.47/data/root/root.file_list =================================================================== --- installation-images-13.47.orig/data/root/root.file_list +++ installation-images-13.47/data/root/root.file_list @@ -295,6 +295,9 @@ less: module-init-tools: / +libprocps*: + / + procps: / Index: installation-images-13.47/data/root/zenroot.file_list =================================================================== --- installation-images-13.47.orig/data/root/zenroot.file_list +++ installation-images-13.47/data/root/zenroot.file_list @@ -301,6 +301,9 @@ module-init-tools: /sbin/{depmod,insmod,modinfo,modprobe,rmmod} /bin/lsmod +libprocps*: + / + procps: /bin/ps /usr/bin/{free,top,vmstat} ++++++ ssh-install.patch ++++++ Restore ssh install helper features (bnc#676205) --- data/root/etc/inst_setup_ssh | 26 ++++++++++++++++++++++++++ data/root/etc/ssh/ssh_host_ecdsa_key | 5 +++++ data/root/etc/ssh/ssh_host_ecdsa_key.pub | 1 + 3 files changed, 32 insertions(+) Index: installation-images-13.46/data/root/etc/inst_setup_ssh =================================================================== --- installation-images-13.46.orig/data/root/etc/inst_setup_ssh +++ installation-images-13.46/data/root/etc/inst_setup_ssh @@ -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 Index: installation-images-13.46/data/root/etc/ssh/ssh_host_ecdsa_key =================================================================== --- /dev/null +++ installation-images-13.46/data/root/etc/ssh/ssh_host_ecdsa_key @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIF0sC69t/7wGedXX2s2A/8Koaaw/Le9HVmJG1WZPkTQ4oAoGCCqGSM49 +AwEHoUQDQgAEHnzl/+HeCasHofmim3tzcWwFyKPFipnMv9NFCmf/lTUDCxABJHxC +6+fi3wzmjWatuK1PZ8nyMMAs4GTke1CHCw== +-----END EC PRIVATE KEY----- Index: installation-images-13.46/data/root/etc/ssh/ssh_host_ecdsa_key.pub =================================================================== --- /dev/null +++ installation-images-13.46/data/root/etc/ssh/ssh_host_ecdsa_key.pub @@ -0,0 +1 @@ +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB585f/h3gmrB6H5opt7c3FsBcijxYqZzL/TRQpn/5U1AwsQASR8Quvn4t8M5o1mrbitT2fJ8jDALOBk5HtQhws= hacker@instsys -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
