Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-07-31 10:04:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-23 22:05:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-07-31 10:04:24.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 13:12:49 CEST 2014 - snwint@suse.de + +- set hostname and get ip from wicked (bnc #889374) +- 14.121 + +------------------------------------------------------------------- Old: ---- installation-images-14.120.tar.xz New: ---- installation-images-14.121.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.uZ4qmj/_old 2014-07-31 10:04:26.000000000 +0200 +++ /var/tmp/diff_new_pack.uZ4qmj/_new 2014-07-31 10:04:26.000000000 +0200 @@ -354,10 +354,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.120 +Version: 14.121 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.120.tar.xz +Source: installation-images-14.121.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.120.tar.xz -> installation-images-14.121.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/VERSION new/installation-images-14.121/VERSION --- old/installation-images-14.120/VERSION 2014-07-21 09:43:51.000000000 +0200 +++ new/installation-images-14.121/VERSION 2014-07-30 13:12:36.000000000 +0200 @@ -1 +1 @@ -14.120 +14.121 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/changelog new/installation-images-14.121/changelog --- old/installation-images-14.120/changelog 2014-07-21 09:43:55.000000000 +0200 +++ new/installation-images-14.121/changelog 2014-07-30 13:12:44.000000000 +0200 @@ -1,4 +1,7 @@ -2014-07-21: HEAD +2014-07-30: HEAD + - set hostname and get ip from wicked (bnc #889374) + +2014-07-21: 14.120 - adjust module config 2014-07-18: 14.119 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/data/root/etc/inst_setup new/installation-images-14.121/data/root/etc/inst_setup --- old/installation-images-14.120/data/root/etc/inst_setup 2014-06-17 12:51:31.000000000 +0200 +++ new/installation-images-14.121/data/root/etc/inst_setup 2014-07-30 12:40:31.000000000 +0200 @@ -54,43 +54,17 @@ unset SSH_FAILED stty sane -# hostname may come from cmdline -if test -z "$hostname" ; then - hostname=`hostname` -else - hostname "$hostname" -fi -if [ -s /etc/install.inf ]; then -# # fix fonts for japanese -# lang=`awk '{ if(/^Locale:/) print $2 }' /etc/install.inf` -# if [ "$lang" = ja_JP ]; then -# rm -f /usr/X11R6/lib/X11/fonts/truetype/FZSongTi.ttf -# rm -f /usr/X11R6/lib/X11/fonts/truetype/gulim.ttf -# fi - if [ "$hostname" = "(none)" ] ; then - hostname= - - # hostname and domainname may come from cmdline - if test -z "$hostname" ; then - hostname=$(awk ' /^Hostname:/ { print $2 }' < /etc/install.inf) - fi - if test -z "$hostname" ; then - hostname=$(awk ' /^IP:/ { print $2 }' < /etc/install.inf) - fi - if test -z "$hostname" ; then - hostname=linux - fi - - if test -z "$domain" ; then - domain=$(awk ' /^Domain:/ { print $2 }' < /etc/install.inf) - fi - if test -z "$domain" ; then - domain=local - fi - hostname $hostname - domainname $domain - fi -fi +# set hostname and domainname +hostip_from_wicked >/tmp/hostips + +hostname=$(awk ' /^Hostname:/ { print $2 }' < /etc/install.inf) +[ -n "$hostname" ] && hostname $hostname +hostname=`hostname` + +domain=$(awk ' /^Domain:/ { print $2 }' < /etc/install.inf) +[ -z "$domain" ] && domain=local +domainname $domain + # # a few files should be restored when installation has completed if we # return to linuxrc. @@ -211,6 +185,9 @@ echo "ATTENTION: Starting shell... (use 'exit' to proceed with installation)" bash -l } + +[ -f /tmp/hostips ] && cat /tmp/hostips + [ "$START_SHELL" ] && start_shell # anounce VNC via slpd @@ -235,8 +212,8 @@ if [ "$YAST2_SSH" = "true" ] ; then cat <<EOF - *** login using 'ssh -X root@${hostname}' *** - *** run '${yast}.ssh' to start the installation *** +*** login using 'ssh -X root@${hostname}' *** +*** run '${yast}.ssh' to start the installation *** EOF cp /etc/issue /etc/motd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/data/root/etc/inst_setup_ssh new/installation-images-14.121/data/root/etc/inst_setup_ssh --- old/installation-images-14.120/data/root/etc/inst_setup_ssh 2014-03-12 11:28:10.000000000 +0100 +++ new/installation-images-14.121/data/root/etc/inst_setup_ssh 2014-07-30 12:39:18.000000000 +0200 @@ -45,26 +45,17 @@ /usr/sbin/sshd-gen-keys-start -echo "Starting SSH daemon ... " +echo -n "Starting SSH daemon... " /usr/sbin/sshd || { export SSH_FAILED=true export YAST2_SSH=false - echo 'sshd did NOT start!' + echo failed } 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]\+: *@@' + echo ok export YAST2_SSH=true - cat <<EOF - - *** sshd has been started *** - -EOF fi [ -f /proc/splash ] && echo verbose >/proc/splash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/data/root/hostip_from_wicked new/installation-images-14.121/data/root/hostip_from_wicked --- old/installation-images-14.120/data/root/hostip_from_wicked 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.121/data/root/hostip_from_wicked 2014-07-30 12:01:08.000000000 +0200 @@ -0,0 +1,26 @@ +#! /usr/bin/perl + +$up = 0; + +for (`wicked show all 2>/dev/null`) { + chomp; + if(/^(\S+)\s*(\S+)/) { + $up = $1 ne 'lo' && $2 eq 'up'; + next; + } + next unless $up; + + if(/^\s+addr:\s+ipv\S+\s+(\S+)/) { + $addr = $1; + $addr =~ s#/.*$##; + push @addr, $addr; + } +} + +if(@addr) { + system "hostname $addr[0]"; + + print "IP addresses:\n"; + print " $_\n" for @addr; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.120/data/root/root.file_list new/installation-images-14.121/data/root/root.file_list --- old/installation-images-14.120/data/root/root.file_list 2014-07-14 11:58:21.000000000 +0200 +++ new/installation-images-14.121/data/root/root.file_list 2014-07-30 12:26:41.000000000 +0200 @@ -619,8 +619,10 @@ x /usr/lib/YaST/.Reh /usr/lib/YaST2 x etc/inst_setup /sbin/inst_setup x etc/adddir /sbin/adddir +x hostip_from_wicked /sbin/hostip_from_wicked c 755 0 0 /sbin/inst_setup c 755 0 0 /sbin/adddir +c 755 0 0 /sbin/hostip_from_wicked if instsys_complain_root e echo "InstsysComplain: <instsys_complain_root>" >>.instsys.config -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org