Hello community,

here is the log from the commit of package installation-images-openSUSE for 
openSUSE:Factory checked in at 2016-05-23 16:36:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
        2016-05-13 09:22:10.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
   2016-05-23 16:36:37.000000000 +0200
@@ -1,0 +2,20 @@
+Thu May 19 07:45:21 UTC 2016 - [email protected]
+
+- remove the Ruby gem cache files to save some space
+- Fix byebug (Ruby debugger) symlinks if it is present (fate#318421)
+- 14.245
+
+-------------------------------------------------------------------
+Sat May 17 13:20:39 UTC 2016 - [email protected]
+
+- remove lilo from Recomends. 
+
+-------------------------------------------------------------------
+Tue May 17 12:50:18 UTC 2016 - [email protected]
+
+- add sample wicked output
+- adjust hostip_from_wicked script to take real arguments
+- sanitize hostname handling (fate#319639)
+- 14.244
+
+-------------------------------------------------------------------

Old:
----
  installation-images-14.243.tar.xz

New:
----
  installation-images-14.245.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.uhL26m/_old  2016-05-23 16:36:38.000000000 +0200
+++ /var/tmp/diff_new_pack.uhL26m/_new  2016-05-23 16:36:38.000000000 +0200
@@ -313,7 +313,6 @@
 BuildRequires:  dmidecode
 BuildRequires:  elilo
 BuildRequires:  firmwarekit
-BuildRequires:  lilo
 BuildRequires:  memtest86+
 BuildRequires:  syslinux
 %if %with_vbox
@@ -372,7 +371,7 @@
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.243
+Version:        14.245
 Release:        0
 Provides:       installation-images = %version-%release
 Source:         installation-images-%{version}.tar.xz

++++++ installation-images-14.243.tar.xz -> installation-images-14.245.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.243/VERSION 
new/installation-images-14.245/VERSION
--- old/installation-images-14.243/VERSION      2016-05-10 10:01:39.000000000 
+0200
+++ new/installation-images-14.245/VERSION      2016-05-19 09:43:47.000000000 
+0200
@@ -1 +1 @@
-14.243
+14.245
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.243/changelog 
new/installation-images-14.245/changelog
--- old/installation-images-14.243/changelog    2016-05-10 10:01:39.000000000 
+0200
+++ new/installation-images-14.245/changelog    2016-05-19 09:43:47.000000000 
+0200
@@ -1,3 +1,12 @@
+2016-05-19:    14.245
+       - remove the Ruby gem cache files to save some space
+       - Fix byebug (Ruby debugger) symlinks if it is present (FATE#318421)
+
+2016-05-12:    14.244
+       - add sample wicked output
+       - adjust hostip_from_wicked script to take real arguments
+       - sanitize hostname handling (fate #319639)
+
 2016-05-09:    14.243
        - Mount efivarfs automatically (bsc #978593)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.243/data/initrd/scripts/prepare_rescue 
new/installation-images-14.245/data/initrd/scripts/prepare_rescue
--- old/installation-images-14.243/data/initrd/scripts/prepare_rescue   
2016-05-10 10:01:39.000000000 +0200
+++ new/installation-images-14.245/data/initrd/scripts/prepare_rescue   
2016-05-19 09:43:47.000000000 +0200
@@ -38,6 +38,9 @@
 # create machine id
 a=`dd if=/dev/urandom bs=1 count=10 2>/dev/null | md5sum` ; echo ${a%% *} 
>/etc/machine-id
 
+# preserve hostname
+hostname >/etc/hostname
+
 # bash >/dev/console 2>&1
 
 rm -f /mounts/initrd/{*,.*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.243/data/rescue/rescue.file_list 
new/installation-images-14.245/data/rescue/rescue.file_list
--- old/installation-images-14.243/data/rescue/rescue.file_list 2016-05-10 
10:01:39.000000000 +0200
+++ new/installation-images-14.245/data/rescue/rescue.file_list 2016-05-19 
09:43:47.000000000 +0200
@@ -234,7 +234,6 @@
 netcfg:
   /etc
   r /etc/{diphosts,ftpusers,hosts.*}
-  e echo Rescue.local >etc/HOSTNAME
 
 ntfs-3g:
   /
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.243/data/root/etc/inst_setup 
new/installation-images-14.245/data/root/etc/inst_setup
--- old/installation-images-14.243/data/root/etc/inst_setup     2016-05-10 
10:01:39.000000000 +0200
+++ new/installation-images-14.245/data/root/etc/inst_setup     2016-05-19 
09:43:47.000000000 +0200
@@ -54,16 +54,9 @@
 unset SSH_FAILED
 stty sane 2>/dev/null
 
-# 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
+# get hostname & hostips
+hostip_from_wicked /tmp/host_ips /tmp/host_name
+host_name=`cat /tmp/host_name`
 
 #
 # a few files should be restored when installation has completed if we
@@ -186,7 +179,7 @@
   bash -l
 }
 
-[ -f /tmp/hostips ] && cat /tmp/hostips
+[ -f /tmp/host_ips ] && cat /tmp/host_ips
 
 [ "$START_SHELL" ] && start_shell
 
@@ -197,7 +190,7 @@
   if test "$ec" = "0" ; then
     (
     sleep 3
-    /usr/bin/slptool register 
"service:YaST.installation.suse:vnc://${hostname}:5901"
+    /usr/bin/slptool register 
"service:YaST.installation.suse:vnc://${host_name}:5901"
     ) &> /tmp/slptool_register.txt &
   else
     echo "slpd returned with exit code $ec, VNC will not be announced"
@@ -212,7 +205,7 @@
 if [ "$YAST2_SSH" = "true" ] ; then
   cat <<EOF
 
-***  login using 'ssh -X root@${hostname}'  ***
+***  login using 'ssh -X root@${host_name}'  ***
 ***  run '${yast}.ssh' to start the installation  ***
 
 EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.243/data/root/hostip_from_wicked 
new/installation-images-14.245/data/root/hostip_from_wicked
--- old/installation-images-14.243/data/root/hostip_from_wicked 2016-05-10 
10:01:39.000000000 +0200
+++ new/installation-images-14.245/data/root/hostip_from_wicked 2016-05-19 
09:43:47.000000000 +0200
@@ -1,7 +1,45 @@
 #! /usr/bin/perl
 
+# helper script that
+#
+# (1) writes a list of assigned IP adresses to ARG1, and
+#
+# (2) writes the FQDN or, if not available, the first IP to ARG2
+#
+# The address in (2) should be something we can be reached by via network.
+#
+# usage:
+#
+# hostip_from_wicked ARG1 ARG2
+
 $up = 0;
 
+# 'wicked show all' is expected to look like this:
+=comment
+lo              up
+      link:     #1, state up
+      type:     loopback
+      config:   compat:suse:/etc/sysconfig/network/ifcfg-lo
+      leases:   ipv4 static granted
+      leases:   ipv6 static granted
+      addr:     ipv4 127.0.0.1/8 [static]
+      addr:     ipv6 ::1/128 [static]
+
+ens7            up
+      link:     #2, state up, mtu 1500
+      type:     ethernet, hwaddr 52:54:00:05:0a:2c
+      config:   compat:suse:/etc/sysconfig/network/ifcfg-ens7
+
+eth1            up
+      link:     #3, state up, mtu 1500
+      type:     ethernet, hwaddr 52:54:00:d7:57:86
+      config:   compat:suse:/etc/sysconfig/network/ifcfg-eth1
+      leases:   ipv4 dhcp granted
+      leases:   ipv6 dhcp requesting
+      addr:     ipv4 10.230.34.112/18 [dhcp]
+      route:    ipv4 default via 10.230.63.254
+=cut
+
 for (`wicked show all 2>/dev/null`) {
   chomp;
   if(/^(\S+)\s*(\S+)/) {
@@ -18,9 +56,18 @@
 }
 
 if(@addr) {
-  system "hostname $addr[0]";
+  chomp ($host = `hostname -f 2>/dev/null`);
+  $host = $addr[0] if $host !~ /\./;
 
-  print "IP addresses:\n";
-  print "  $_\n" for @addr;
+  if($ARGV[0] && open $f, ">$ARGV[0]") {
+    print $f "IP addresses:\n";
+    print $f "  $_\n" for @addr;
+    close $f;
+  }
+
+  if($ARGV[1] && open $f, ">$ARGV[1]") {
+    print $f "$host\n";
+    close $f;
+  }
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.243/data/root/root.file_list 
new/installation-images-14.245/data/root/root.file_list
--- old/installation-images-14.243/data/root/root.file_list     2016-05-10 
10:01:39.000000000 +0200
+++ new/installation-images-14.245/data/root/root.file_list     2016-05-19 
09:43:47.000000000 +0200
@@ -186,6 +186,12 @@
 ?skelcd-control-SLES-for-VMware:
 ?skelcd-control-SLED:
 
+# fix the symlinks for the Ruby debugger if it is present
+?ruby*.*-rubygem-byebug:
+  /
+  # avoid update-alternatives, remove the dangling symlinks and create a new 
one
+  e cd usr/bin ; find . -type l | grep byebug | xargs rm -rf ; ln -snf 
byebug.ruby* byebug
+
 rpm:
   /bin
   /etc
@@ -645,6 +651,9 @@
 e rm -f `find var/log -type f`
 e rm -f `find var/cache -type f`
 
+# remove the Ruby gem cache files
+r /usr/lib*/ruby/gems/*/cache/*.gem
+
 # show remaining files in /var
 e find var -type f
 


Reply via email to