commit installation-images-openSUSE for openSUSE:Factory

2 Jul 2014

Hello community,

here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-07-02 15:04:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-27 06:53:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes	2014-07-02 15:04:30.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jul  1 11:31:11 CEST 2014 - snwint@suse.de
+
+- added network start script
+- cleaned up udev start script
+- moved udev start script to /scripts dir
+- service_start: stop services that don't have ExecStop
+- 14.110
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.Ejioyk/_old	2014-07-02 15:04:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Ejioyk/_new	2014-07-02 15:04:31.000000000 +0200
@@ -353,10 +353,10 @@
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.109
+Version:        14.110
 Release:        0
 Provides:       installation-images = %version-%release
-Source:         installation-images-14.109.tar.xz
+Source:         installation-images-14.110.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _binary_payload w.ufdio
 

++++++ installation-images-14.109.tar.xz -> installation-images-14.110.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/VERSION new/installation-images-14.110/VERSION
--- old/installation-images-14.109/VERSION	2014-06-26 12:51:30.000000000 +0200
+++ new/installation-images-14.110/VERSION	2014-07-01 11:31:03.000000000 +0200
@@ -1 +1 @@
-14.109
+14.110
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/changelog new/installation-images-14.110/changelog
--- old/installation-images-14.109/changelog	2014-06-26 12:51:35.000000000 +0200
+++ new/installation-images-14.110/changelog	2014-07-01 11:31:09.000000000 +0200
@@ -1,4 +1,10 @@
-2014-06-26:	HEAD
+2014-07-01:	HEAD
+	- added network start script
+	- cleaned up udev start script
+	- moved udev start script to /scripts dir
+	- service_start: stop services that don't have ExecStop
+
+2014-06-26:	14.109
 	- adjust module config (bnc #882942)
 
 2014-06-25:	14.108
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/data/initrd/etc/myudevstart new/installation-images-14.110/data/initrd/etc/myudevstart
--- old/installation-images-14.109/data/initrd/etc/myudevstart	2014-01-16 11:21:01.000000000 +0100
+++ new/installation-images-14.110/data/initrd/etc/myudevstart	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PATH="/sbin:/bin:/usr/bin:/usr/sbin:/lbin"
-
-# disable hotplug helper, udevd listens to netlink
-echo "" > /proc/sys/kernel/hotplug
-
-# create min devices
-# ########
-#   Note: this is different from the usual 'cp -a'!
-# ######## 
-/lbin/cp -a /lib/udev/devices /dev
-
-# start udevd
-echo -n "Starting udevd "
-udevd --daemon
-
-# cleanup some stuff
-rm -f /var/run/sysconfig/network
-
-# unlikely, but we may be faster than the first event
-mkdir /dev/.udev
-mkdir /dev/.udev/queue
-
-# create devices
-/usr/bin/udevadm trigger
-
-# 10 min - just long enough
-/usr/bin/udevadm settle --timeout=100
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/data/initrd/initrd.file_list new/installation-images-14.110/data/initrd/initrd.file_list
--- old/installation-images-14.109/data/initrd/initrd.file_list	2014-06-25 14:50:58.000000000 +0200
+++ new/installation-images-14.110/data/initrd/initrd.file_list	2014-07-01 11:20:00.000000000 +0200
@@ -565,9 +565,6 @@
 # our own rules file which loads only pnp subsystem mods
 x etc/80-drivers.rules /usr/lib/udev/80-drivers.rules.no_modprobe
 
-# our own udevd start script
-x etc/myudevstart /bin
-
 # systemd service start script
 x service_start /bin
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/data/initrd/scripts/network_setup new/installation-images-14.110/data/initrd/scripts/network_setup
--- old/installation-images-14.109/data/initrd/scripts/network_setup	1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.110/data/initrd/scripts/network_setup	2014-06-30 15:18:42.000000000 +0200
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+exec >&2
+
+# activate all pre-configured interfaces
+# (lo + everything setup via 'ifcfg' option)
+wicked ifup all
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/data/initrd/scripts/udev_setup new/installation-images-14.110/data/initrd/scripts/udev_setup
--- old/installation-images-14.109/data/initrd/scripts/udev_setup	1970-01-01 01:00:00.000000000 +0100
+++ new/installation-images-14.110/data/initrd/scripts/udev_setup	2014-07-01 11:19:25.000000000 +0200
@@ -0,0 +1,19 @@
+#! /bin/bash
+
+exec >&2
+
+PATH="/sbin:/bin:/usr/bin:/usr/sbin:/lbin"
+
+# disable hotplug helper, udevd listens to netlink
+echo "" > /proc/sys/kernel/hotplug
+
+# start udevd
+echo -n "Starting udevd "
+udevd --daemon
+
+# create devices
+/usr/bin/udevadm trigger
+
+# 10 min - just long enough
+/usr/bin/udevadm settle --timeout=100
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.109/data/initrd/service_start new/installation-images-14.110/data/initrd/service_start
--- old/installation-images-14.109/data/initrd/service_start	2014-04-16 13:37:26.000000000 +0200
+++ new/installation-images-14.110/data/initrd/service_start	2014-07-01 10:41:20.000000000 +0200
@@ -45,8 +45,17 @@
 for (@todo) { $cmd .= ". $_\n" if s/^EnvironmentFile=[\-@]*// }
 for (@todo) { $cmd .= "export $1\n" if /^Environment=(.+)/ }
 if($opt_stop) {
-  for (@todo) { $cmd .= "$_\n" if s/^ExecStop=[\-@]*// }
+  my $has_stop;
+  for (@todo) { $cmd .= "$_\n", $has_stop = 1 if s/^ExecStop=[\-@]*// }
   for (@todo) { $cmd .= "$_\n" if s/^ExecStopPost=[\-@]*// }
+  if(!$has_stop) {
+    undef $cmd;
+    for (@todo) { $cmd .= "killproc $1\n" if /^ExecStart=[\-@]*(\S+)/ }
+    if($cmd) {
+      $cmd .= "sleep 1\n";
+      for (@todo) { $cmd .= "killproc -KILL $1\n" if /^ExecStart=[\-@]*(\S+)/ }
+    }
+  }
 }
 else {
   for (@todo) { $cmd .= "$_\n" if s/^ExecStartPre=[\-@]*// }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)