Hello community,
here is the log from the commit of package installation-images for openSUSE:11.4
checked in at Fri Feb 18 14:05:01 CET 2011.
--------
--- old-versions/11.4/all/installation-images/installation-images.changes 2011-02-07 16:36:46.000000000 +0100
+++ /mounts/work_src_done/11.4/installation-images/installation-images.changes 2011-02-17 18:00:17.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 17 18:00:07 CET 2011 - snwint@suse.de
+
+- changed inst_setup_ssh script to use rcsshd (bnc #672100)
+- don't mess with mtab (bnc #668149)
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
installation-images-12.75.tar.bz2
needed_space_in_mb
New:
----
installation-images-12.76.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.Gnhy2z/_old 2011-02-18 14:04:56.000000000 +0100
+++ /var/tmp/diff_new_pack.Gnhy2z/_new 2011-02-18 14:04:56.000000000 +0100
@@ -22,7 +22,7 @@
Name: installation-images
%define has_sles 0
%define build_xen 1
-%define has_vnc 0
+%define has_vnc 1
BuildRequires: PolicyKit adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-utils cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject fbiterm finger fonts-config gdb glibc-i18ndata hex icmpinfo initviocons iputils joe krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump
BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-nfs-client yast2-ntp-client yast2-qt yast2-qt-pkg yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users
BuildRequires: aaa_base aaa_base-extras audit-libs busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool fvwm2 gpm hfsutils icewm-lite libcares2 libelf0 libzypp open-iscsi openct pciutils pciutils-ids pcsc-lite perl-HTML-Parser sqlite3 util-linux
@@ -106,9 +106,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.75
-Release: 1
-Source: installation-images-12.75.tar.bz2
+Version: 12.76
+Release: 1.<RELEASE2>
+Source: installation-images-12.76.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-12.75.tar.bz2 -> installation-images-12.76.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.75/VERSION new/installation-images-12.76/VERSION
--- old/installation-images-12.75/VERSION 2011-02-07 16:36:30.000000000 +0100
+++ new/installation-images-12.76/VERSION 2011-02-17 17:59:57.000000000 +0100
@@ -1 +1 @@
-12.75
+12.76
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.75/changelog new/installation-images-12.76/changelog
--- old/installation-images-12.75/changelog 2011-02-07 16:36:33.000000000 +0100
+++ new/installation-images-12.76/changelog 2011-02-17 18:00:01.000000000 +0100
@@ -1,4 +1,8 @@
-2011-02-07: HEAD
+2011-02-17: HEAD
+ - changed inst_setup_ssh script to use rcsshd (bnc #672100)
+ - don't mess with mtab (bnc #668149)
+
+2011-02-07: 12.75
- remove unzip and dependent libs
2011-01-20: 12.74
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.75/data/initrd/initrd.file_list new/installation-images-12.76/data/initrd/initrd.file_list
--- old/installation-images-12.75/data/initrd/initrd.file_list 2011-02-07 16:21:51.000000000 +0100
+++ new/installation-images-12.76/data/initrd/initrd.file_list 2011-02-17 16:01:49.000000000 +0100
@@ -11,6 +11,7 @@
d mounts
d root
d download
+d dev/pts dev/shm
t var/run/utmp
@@ -508,7 +509,6 @@
# keep only passwd & group
r boot
r etc/init.d
- r etc/mtab
r var/adm/fillup-templates
/etc/rc.status
@@ -641,6 +641,10 @@
# historical static device nodes
x devz /devz
+# mtab is symlink now
+r /etc/mtab
+s /proc/self/mounts /etc/mtab
+
# our own rules file which loads only pnp subsystem mods
x etc/80-drivers.rules /lib/udev/80-drivers.rules.no_modprobe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.75/data/root/etc/inst_setup new/installation-images-12.76/data/root/etc/inst_setup
--- old/installation-images-12.75/data/root/etc/inst_setup 2011-02-07 16:21:51.000000000 +0100
+++ new/installation-images-12.76/data/root/etc/inst_setup 2011-02-17 15:10:46.000000000 +0100
@@ -47,9 +47,6 @@
# /proc/self/fd/N will fail
exec < /dev/console > /dev/console 2>&1 3>&1
-# fix mtab a bit
-sed -ie '/\/mounts/ d' /etc/mtab
-
yast="$1"
shift
echo $yast > /tmp/linuxrc_installer_name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.75/data/root/etc/inst_setup_ssh new/installation-images-12.76/data/root/etc/inst_setup_ssh
--- old/installation-images-12.75/data/root/etc/inst_setup_ssh 2011-02-07 16:21:44.000000000 +0100
+++ new/installation-images-12.76/data/root/etc/inst_setup_ssh 2011-02-17 16:42:41.000000000 +0100
@@ -2,83 +2,30 @@
# 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
+ nosshkey=true
fi
-echo 'sshd found, prepare remote login'
-#
-if test ! -z "$nameserver" ; then
- echo "nameserver $nameserver" >> /etc/resolv.conf
-fi
-if test ! -z "$domain" ; then
- echo "search $domain" >> /etc/resolv.conf
-fi
-mkdir -p /dev/pts
-mkdir -p /dev/shm
-grep -q devpts /proc/mounts || \
-mount -n -t devpts -o mode=0620,gid=5 devpts /dev/pts
-#
if [ "$nosshkey" = "true" ] ; then
- # for inst-sys testing
- echo using built-in ssh keys
- cp -a --remove-destination /lib/ssh/*key* /etc/ssh/
-
-else
- #
- echo "generating SSH keys ... "
- #
- if ! test -f /etc/ssh/ssh_host_key ; then
- echo Generating /etc/ssh/ssh_host_key.
- ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
- fi
- if ! test -f /etc/ssh/ssh_host_dsa_key ; then
- echo Generating /etc/ssh/ssh_host_dsa_key.
-
- ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ''
- fi
- if ! test -f /etc/ssh/ssh_host_rsa_key ; then
- echo Generating /etc/ssh/ssh_host_rsa_key.
-
- ssh-keygen -t rsa -b 1024 -f /etc/ssh/ssh_host_rsa_key -N ''
- fi
-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
- echo "setting root pwd to '$sshpassword'"
- echo "root:$sshpassword" | chpasswd
+ # for inst-sys testing
+ echo using built-in ssh keys
+ cp -a --remove-destination /lib/ssh/*key* /etc/ssh/
fi
-chmod -R og-rxw /etc/ssh /root /etc/shadow 2>/dev/null
-chown -R 0.0 /etc/ssh /root /etc/shadow 2>/dev/null
-echo "Starting SSH daemon ... "
-#
-/usr/sbin/sshd || {
-export SSH_FAILED=true
-export YAST2_SSH=false
-echo 'sshd did NOT start!'
+
+rcsshd start || {
+ export SSH_FAILED=true
+ export YAST2_SSH=false
+ echo 'sshd did NOT start!'
}
+
if [ ! "$SSH_FAILED" ] ; then
- echo
- ip -oneline -family inet link show up | \
- sed -n '/link\/\(ether\|ieee1394\|tr\)/s@^[^ ]\+[ ]\+\([^:]\+\).*@\1@p' | \
- xargs --no-run-if-empty -n1 ip addr show dev | \
- sed 's@^[0-9]\+: *@@'
- export YAST2_SSH=true
- cat <