From 66d91c199e8668596a286f20abdb74107de220eb45261cd6d5440e5c991c5586 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Tue, 23 Jul 2013 09:21:21 +0000
Subject: [PATCH] Accepting request 184036 from
 home:elvigia:branches:Base:System

- version 206 , highlights:
* Unit files now understand the new %v specifier which
  resolves to the kernel version string as returned by "uname-r".
* "journalctl -b" may now be used to look for boot output of a
   specific boot. Try "journalctl -b -1"
* Creation of "dead" device nodes has been moved from udev
  into kmod and tmpfiles.
*  The udev "keymap" data files and tools to apply keyboard
   specific mappings of scan to key codes, and force-release
   scan code lists have been entirely replaced by a udev
   "keyboard" builtin and a hwdb data file.
- remove patches now in upstream
- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0
- systemd now require the kmod tool in addition to the library.

- version 206 , highlights:
* Unit files now understand the new %v specifier which
  resolves to the kernel version string as returned by "uname-r".
* "journalctl -b" may now be used to look for boot output of a
   specific boot. Try "journalctl -b -1"
* Creation of "dead" device nodes has been moved from udev
  into kmod and tmpfiles.
*  The udev "keymap" data files and tools to apply keyboard
   specific mappings of scan to key codes, and force-release
   scan code lists have been entirely replaced by a udev
   "keyboard" builtin and a hwdb data file.
- remove patches now in upstream
- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0
- systemd now require the kmod tool in addition to the library. (forwarded request 184035 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/184036
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=416
---
 ...enable-by_path-links-for-ata-devices.patch | 10 ++---
 ...ate-by-id-scsi-links-for-ATA-devices.patch |  8 ++--
 1003-udev-netlink-null-rules.patch            |  8 ++--
 1004-fix-devname-prefix.patch                 | 22 ----------
 ...fault-links-for-primary-cd_dvd-drive.patch |  8 ++--
 1006-udev-always-rename-network.patch         |  6 +--
 1007-physical-hotplug-cpu-and-memory.patch    | 12 ++----
 1008-add-msft-compability-rules.patch         | 12 ++----
 ...es-permissions-to-follow-openSUSE-po.patch |  6 +--
 ...-suspend-hibernate-calls-to-pm-utils.patch | 16 ++++----
 ...pport-for-SysV-scripts-for-the-early.patch |  6 +--
 allow-multiple-sulogin-to-be-started.patch    | 18 +++-----
 apply-ACL-for-nvidia-device-nodes.patch       | 14 +++----
 ...alid-address-familily-is-passed-to-g.patch |  8 ++--
 ...etup-after-md-dmraid-lvm-are-started.patch | 12 ++----
 ...le-nss-myhostname-warning-bnc-783841.patch |  6 +--
 ...e-started-before-local-fs-pre-target.patch |  6 +--
 ...assword-wall-starts-after-getty-tty1.patch |  6 +--
 ...rtname-is-set-as-hostname-bnc-820213.patch |  8 ++--
 ...are-applied-after-modules-are-loaded.patch |  8 ++--
 fix-owner-of-var-log-btmp.patch               |  6 +--
 ...-boot-prefixed-initscript-bnc-746506.patch |  8 ++--
 ...t-after-cryptsetup-target-is-reached.patch |  8 ++--
 ...STEMCTL_OPTIONS-environment-variable.patch |  8 ++--
 ...plock-and-compose_table-and-kbd_rate.patch | 10 ++---
 handle-etc-HOSTNAME.patch                     | 22 ++++------
 ...lock-value-in-etc-sysconfig-keyboard.patch | 28 ++++---------
 ...lang-value-in-etc-sysconfig-language.patch | 41 +++++++++----------
 insserv-generator.patch                       | 18 +++-----
 macros.systemd.upstream                       |  4 ++
 ...USE-etc-sysconfig-kernel-module-list.patch | 14 +++----
 ...lly-warn-if-nss-myhostname-is-called.patch | 14 +++----
 ...script-heuristic-and-add-new-LSB-hea.patch | 12 ++----
 ...r-lock-bind-mount-if-they-aren-t-sym.patch | 18 +++-----
 ...vice-with-detected-pid-as-RemainAfte.patch |  6 +--
 ...ndle-boot-sysctl.conf-kernel_release.patch | 12 ++----
 systemd-205.tar.xz                            |  3 --
 systemd-206.tar.xz                            |  3 ++
 systemd-mini.changes                          | 19 +++++++++
 systemd-mini.spec                             | 27 ++----------
 systemd-tmp-safe-defaults.patch               |  6 +--
 systemd.changes                               | 19 +++++++++
 systemd.spec                                  | 27 ++----------
 ...or-openSUSE-version-of-etc-sysconfig.patch |  6 +--
 ...r-sbin-sulogin-for-emergency-service.patch | 12 ++----
 45 files changed, 210 insertions(+), 341 deletions(-)
 delete mode 100644 1004-fix-devname-prefix.patch
 delete mode 100644 systemd-205.tar.xz
 create mode 100644 systemd-206.tar.xz

diff --git a/1001-re-enable-by_path-links-for-ata-devices.patch b/1001-re-enable-by_path-links-for-ata-devices.patch
index 64f01c1f..8d9594ad 100644
--- a/1001-re-enable-by_path-links-for-ata-devices.patch
+++ b/1001-re-enable-by_path-links-for-ata-devices.patch
@@ -7,11 +7,9 @@ Fix by-path links for ATA transport (bnc#770910)
  src/udev/udev-builtin-path_id.c | 92 +++++++++++++++++++++++++++++++++++------
  1 file changed, 80 insertions(+), 12 deletions(-)
 
-diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index da02731..a77d4e8 100644
---- a/src/udev/udev-builtin-path_id.c
-+++ b/src/udev/udev-builtin-path_id.c
-@@ -338,6 +338,85 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char *
+--- systemd-206.orig/src/udev/udev-builtin-path_id.c
++++ systemd-206/src/udev/udev-builtin-path_id.c
+@@ -338,6 +338,85 @@ static struct udev_device *handle_scsi_h
          return parent;
  }
  
@@ -97,7 +95,7 @@ index da02731..a77d4e8 100644
  static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
  {
          const char *devtype;
-@@ -374,19 +453,8 @@ static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
+@@ -374,19 +453,8 @@ static struct udev_device *handle_scsi(s
                  goto out;
          }
  
diff --git a/1002-rules-create-by-id-scsi-links-for-ATA-devices.patch b/1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
index c2f3186c..bd7904c6 100644
--- a/1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
+++ b/1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
@@ -7,11 +7,9 @@ Re-enable creation of by-id scsi links for ATA devices. (bnc#769002)
  rules/60-persistent-storage.rules | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index a4d009a..f720c7e 100644
---- a/rules/60-persistent-storage.rules
-+++ b/rules/60-persistent-storage.rules
-@@ -42,6 +42,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="s
+--- systemd-206.orig/rules/60-persistent-storage.rules
++++ systemd-206/rules/60-persistent-storage.rules
+@@ -42,6 +42,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk",
  KERNEL=="sd*|sr*|cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
  KERNEL=="sd*|cciss*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
  
diff --git a/1003-udev-netlink-null-rules.patch b/1003-udev-netlink-null-rules.patch
index f486a13f..93756c5a 100644
--- a/1003-udev-netlink-null-rules.patch
+++ b/1003-udev-netlink-null-rules.patch
@@ -7,11 +7,9 @@ udevd race for netlink events (bnc#774646)
  src/udev/udevd.c | 2 ++
  1 file changed, 2 insertions(+)
 
-Index: systemd-202/src/udev/udevd.c
-===================================================================
---- systemd-202.orig/src/udev/udevd.c
-+++ systemd-202/src/udev/udevd.c
-@@ -1407,6 +1407,8 @@ int main(int argc, char *argv[])
+--- systemd-206.orig/src/udev/udevd.c
++++ systemd-206/src/udev/udevd.c
+@@ -1337,6 +1337,8 @@ int main(int argc, char *argv[])
                          dev = udev_monitor_receive_device(monitor);
                          if (dev != NULL) {
                                  udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC));
diff --git a/1004-fix-devname-prefix.patch b/1004-fix-devname-prefix.patch
deleted file mode 100644
index 7ab99e97..00000000
--- a/1004-fix-devname-prefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Frederic Crozat <fcrozat@suse.com>
-Date: Wed, 5 Dec 2012 15:13:27 +0000
-Subject: fix devname prefix
-
-fix modules.devname path, it isn't in /usr.
----
- src/udev/udevd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: systemd-202/src/udev/udevd.c
-===================================================================
---- systemd-202.orig/src/udev/udevd.c
-+++ systemd-202/src/udev/udevd.c
-@@ -824,7 +824,7 @@ static void static_dev_create_from_modul
-                 return;
-         }
- 
--        strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL);
-+        strscpyl(modules, sizeof(modules), "/lib/modules/", kernel.release, "/modules.devname", NULL);
-         f = fopen(modules, "re");
-         if (f == NULL)
-                 return;
diff --git a/1005-create-default-links-for-primary-cd_dvd-drive.patch b/1005-create-default-links-for-primary-cd_dvd-drive.patch
index c66a9da0..e70b5758 100644
--- a/1005-create-default-links-for-primary-cd_dvd-drive.patch
+++ b/1005-create-default-links-for-primary-cd_dvd-drive.patch
@@ -7,11 +7,9 @@ cdrom_id: created links for the default cd/dvd drive (bnc#783054).
  rules/60-cdrom_id.rules | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/rules/60-cdrom_id.rules b/rules/60-cdrom_id.rules
-index 6eaf76a..ec0b19a 100644
---- a/rules/60-cdrom_id.rules
-+++ b/rules/60-cdrom_id.rules
-@@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", GOTO="cdr
+--- systemd-206.orig/rules/60-cdrom_id.rules
++++ systemd-206/rules/60-cdrom_id.rules
+@@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdr
  # enable the receiving of media eject button events
  IMPORT{program}="cdrom_id --lock-media $devnode"
  
diff --git a/1006-udev-always-rename-network.patch b/1006-udev-always-rename-network.patch
index d1c61d05..4f91c928 100644
--- a/1006-udev-always-rename-network.patch
+++ b/1006-udev-always-rename-network.patch
@@ -8,10 +8,8 @@ udev: ensure that the network interfaces are renamed even if they exist
  src/udev/udev-event.c | 46 +++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 43 insertions(+), 3 deletions(-)
 
-Index: systemd-204/src/udev/udev-event.c
-===================================================================
---- systemd-204.orig/src/udev/udev-event.c
-+++ systemd-204/src/udev/udev-event.c
+--- systemd-206.orig/src/udev/udev-event.c
++++ systemd-206/src/udev/udev-event.c
 @@ -750,6 +750,7 @@ static int rename_netif(struct udev_even
          struct udev_device *dev = event->dev;
          int sk;
diff --git a/1007-physical-hotplug-cpu-and-memory.patch b/1007-physical-hotplug-cpu-and-memory.patch
index 175fb9b3..7daebb20 100644
--- a/1007-physical-hotplug-cpu-and-memory.patch
+++ b/1007-physical-hotplug-cpu-and-memory.patch
@@ -1,7 +1,5 @@
-Index: systemd-205/rules/80-hotplug-cpu-mem.rules
-===================================================================
 --- /dev/null
-+++ systemd-205/rules/80-hotplug-cpu-mem.rules
++++ systemd-206/rules/80-hotplug-cpu-mem.rules
 @@ -0,0 +1,9 @@
 +# do not edit this file, it will be overwritten on update
 +
@@ -12,11 +10,9 @@ Index: systemd-205/rules/80-hotplug-cpu-mem.rules
 +# Hotplug physical memory
 +SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", \
 + ATTR{state}="online"
-Index: systemd-205/Makefile.am
-===================================================================
---- systemd-205.orig/Makefile.am
-+++ systemd-205/Makefile.am
-@@ -2389,6 +2389,10 @@ dist_udevrules_DATA += \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -2480,6 +2480,10 @@ dist_udevrules_DATA += \
  	rules/73-seat-numlock.rules
  
  # ------------------------------------------------------------------------------
diff --git a/1008-add-msft-compability-rules.patch b/1008-add-msft-compability-rules.patch
index d482f026..d0117371 100644
--- a/1008-add-msft-compability-rules.patch
+++ b/1008-add-msft-compability-rules.patch
@@ -1,8 +1,6 @@
-Index: systemd-205/Makefile.am
-===================================================================
---- systemd-205.orig/Makefile.am
-+++ systemd-205/Makefile.am
-@@ -2393,6 +2393,10 @@ dist_udevrules_DATA += \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -2484,6 +2484,10 @@ dist_udevrules_DATA += \
  	rules/80-hotplug-cpu-mem.rules
  
  # ------------------------------------------------------------------------------
@@ -13,10 +11,8 @@ Index: systemd-205/Makefile.am
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
  SUBDIRS += \
-Index: systemd-205/rules/61-msft.rules
-===================================================================
 --- /dev/null
-+++ systemd-205/rules/61-msft.rules
++++ systemd-206/rules/61-msft.rules
 @@ -0,0 +1,9 @@
 +# MSFT compability rules
 +ACTION!="add|change", GOTO="msft_end"
diff --git a/Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch b/Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch
index 2cc1bb48..db366fca 100644
--- a/Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch
+++ b/Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch
@@ -8,10 +8,8 @@ disable /var/lock/{subsys,lockdev} and change default permissions on
  tmpfiles.d/legacy.conf | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
-index 3fff347..81d5e47 100644
---- a/tmpfiles.d/legacy.conf
-+++ b/tmpfiles.d/legacy.conf
+--- systemd-206.orig/tmpfiles.d/legacy.conf
++++ systemd-206/tmpfiles.d/legacy.conf
 @@ -10,12 +10,13 @@
  # These files are considered legacy and are unnecessary on legacy-free
  # systems.
diff --git a/Forward-suspend-hibernate-calls-to-pm-utils.patch b/Forward-suspend-hibernate-calls-to-pm-utils.patch
index 7e6b7b44..3b50d50b 100644
--- a/Forward-suspend-hibernate-calls-to-pm-utils.patch
+++ b/Forward-suspend-hibernate-calls-to-pm-utils.patch
@@ -7,10 +7,8 @@ forward suspend/hibernation calls to pm-utils, if installed (bnc#790157)
  src/sleep/sleep.c | 26 ++++++++++++++++++++++----
  1 file changed, 22 insertions(+), 4 deletions(-)
 
-diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index a56ab89..232ab67 100644
---- a/src/sleep/sleep.c
-+++ b/src/sleep/sleep.c
+--- systemd-206.orig/src/sleep/sleep.c
++++ systemd-206/src/sleep/sleep.c
 @@ -24,6 +24,7 @@
  #include <errno.h>
  #include <string.h>
@@ -38,7 +36,7 @@ index a56ab89..232ab67 100644
  
          return r;
  }
-@@ -90,6 +90,8 @@ static int execute(char **modes, char **states) {
+@@ -90,6 +90,8 @@ static int execute(char **modes, char **
          FILE *f;
          const char* note = strappenda("SLEEP=", arg_verb);
  
@@ -47,7 +45,7 @@ index a56ab89..232ab67 100644
          /* This file is opened first, so that if we hit an error,
           * we can abort before modyfing any state. */
          f = fopen("/sys/power/state", "we");
-@@ -102,6 +104,7 @@ static int execute(char **modes, char **states) {
+@@ -102,6 +104,7 @@ static int execute(char **modes, char **
          r = write_mode(modes);
          if (r < 0)
                  return r;
@@ -55,7 +53,7 @@ index a56ab89..232ab67 100644
  
          arguments[0] = NULL;
          arguments[1] = (char*) "pre";
-@@ -114,8 +117,10 @@ static int execute(char **modes, char **states) {
+@@ -114,8 +117,10 @@ static int execute(char **modes, char **
                     "MESSAGE=Suspending system...",
                     note,
                     NULL);
@@ -67,7 +65,7 @@ index a56ab89..232ab67 100644
          if (r < 0)
                  return r;
  
-@@ -158,6 +163,7 @@ static int parse_argv(int argc, char *argv[]) {
+@@ -158,6 +163,7 @@ static int parse_argv(int argc, char *ar
          };
  
          int c;
@@ -75,7 +73,7 @@ index a56ab89..232ab67 100644
  
          assert(argc >= 0);
          assert(argv);
-@@ -196,6 +202,18 @@ static int parse_argv(int argc, char *argv[]) {
+@@ -196,6 +202,18 @@ static int parse_argv(int argc, char *ar
                  return -EINVAL;
          }
  
diff --git a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
index fbca9564..137a4824 100644
--- a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
+++ b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
@@ -10,10 +10,8 @@ Conflicts:
  src/core/service.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 46 insertions(+), 5 deletions(-)
 
-Index: systemd-205/src/core/service.c
-===================================================================
---- systemd-205.orig/src/core/service.c
-+++ systemd-205/src/core/service.c
+--- systemd-206.orig/src/core/service.c
++++ systemd-206/src/core/service.c
 @@ -51,7 +51,8 @@
  
  typedef enum RunlevelType {
diff --git a/allow-multiple-sulogin-to-be-started.patch b/allow-multiple-sulogin-to-be-started.patch
index 297b5792..507d8fc2 100644
--- a/allow-multiple-sulogin-to-be-started.patch
+++ b/allow-multiple-sulogin-to-be-started.patch
@@ -9,10 +9,8 @@ allows multiple sulogin instance (bnc#793182).
  units/serial-getty@.service.m4 | 1 +
  3 files changed, 3 insertions(+)
 
-diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 083eb97..243fea5 100644
---- a/units/getty@.service.m4
-+++ b/units/getty@.service.m4
+--- systemd-206.orig/units/getty@.service.m4
++++ systemd-206/units/getty@.service.m4
 @@ -9,6 +9,7 @@
  Description=Getty on %I
  Documentation=man:agetty(8) man:systemd-getty-generator(8)
@@ -21,10 +19,8 @@ index 083eb97..243fea5 100644
  After=systemd-user-sessions.service plymouth-quit-wait.service
  m4_ifdef(`HAVE_SYSV_COMPAT',
  After=rc-local.service
-diff --git a/units/rescue.target b/units/rescue.target
-index 3f59b14..20f6841 100644
---- a/units/rescue.target
-+++ b/units/rescue.target
+--- systemd-206.orig/units/rescue.target
++++ systemd-206/units/rescue.target
 @@ -10,6 +10,7 @@ Description=Rescue Mode
  Documentation=man:systemd.special(7)
  Requires=sysinit.target rescue.service
@@ -33,10 +29,8 @@ index 3f59b14..20f6841 100644
  AllowIsolate=yes
  
  [Install]
-diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index 60d7737..2b18dbf 100644
---- a/units/serial-getty@.service.m4
-+++ b/units/serial-getty@.service.m4
+--- systemd-206.orig/units/serial-getty@.service.m4
++++ systemd-206/units/serial-getty@.service.m4
 @@ -10,6 +10,7 @@ Description=Serial Getty on %I
  Documentation=man:agetty(8) man:systemd-getty-generator(8)
  Documentation=http://0pointer.de/blog/projects/serial-console.html
diff --git a/apply-ACL-for-nvidia-device-nodes.patch b/apply-ACL-for-nvidia-device-nodes.patch
index e89708a3..44d90f35 100644
--- a/apply-ACL-for-nvidia-device-nodes.patch
+++ b/apply-ACL-for-nvidia-device-nodes.patch
@@ -7,10 +7,8 @@ set ACL on nvidia devices (bnc#808319).
  src/login/logind-acl.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
-index cb045a9..51093f2 100644
---- a/src/login/logind-acl.c
-+++ b/src/login/logind-acl.c
+--- systemd-206.orig/src/login/logind-acl.c
++++ systemd-206/src/login/logind-acl.c
 @@ -24,6 +24,7 @@
  #include <acl/libacl.h>
  #include <errno.h>
@@ -19,8 +17,8 @@ index cb045a9..51093f2 100644
  
  #include "logind-acl.h"
  #include "util.h"
-@@ -240,6 +241,22 @@ int devnode_acl_all(struct udev *udev,
-                         goto finish;
+@@ -287,6 +288,22 @@ int devnode_acl_all(struct udev *udev,
+                 r = devnode_acl(n, flush, del, old_uid, add, new_uid);
          }
  
 +        /* only search for nvidia* if /dev/nvidiactl exists */
@@ -40,5 +38,5 @@ index cb045a9..51093f2 100644
 +        }
 +
  finish:
-         if (e)
-                 udev_enumerate_unref(e);
+         udev_enumerate_unref(e);
+         set_free_free(nodes);
diff --git a/avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch b/avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
index b33c5589..fdc7b9d0 100644
--- a/avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
+++ b/avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
@@ -7,11 +7,9 @@ Subject: avoid assertion if invalid address familily is passed to
  src/nss-myhostname/nss-myhostname.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
-index 60e256d..e97d4e5 100644
---- a/src/nss-myhostname/nss-myhostname.c
-+++ b/src/nss-myhostname/nss-myhostname.c
-@@ -442,6 +442,12 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
+--- systemd-206.orig/src/nss-myhostname/nss-myhostname.c
++++ systemd-206/src/nss-myhostname/nss-myhostname.c
+@@ -442,6 +442,12 @@ enum nss_status _nss_myhostname_gethostb
          uint32_t local_address_ipv4 = LOCALADDRESS_IPV4;
          const char *canonical = NULL, *additional = NULL;
  
diff --git a/delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch b/delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch
index 4cf66998..026de00c 100644
--- a/delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch
+++ b/delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch
@@ -7,10 +7,8 @@ Subject: delay fsck / cryptsetup after md / dmraid / lvm are started
  units/systemd-fsck@.service.in        | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 9b8e229..0949287 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
+--- systemd-206.orig/src/cryptsetup/cryptsetup-generator.c
++++ systemd-206/src/cryptsetup/cryptsetup-generator.c
 @@ -160,6 +160,7 @@ static int create_disk(
                  "Conflicts=umount.target\n"
                  "DefaultDependencies=no\n"
@@ -19,10 +17,8 @@ index 9b8e229..0949287 100644
                  "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
                  f);
  
-diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
-index b3c71eb..c66a411 100644
---- a/units/systemd-fsck@.service.in
-+++ b/units/systemd-fsck@.service.in
+--- systemd-206.orig/units/systemd-fsck@.service.in
++++ systemd-206/units/systemd-fsck@.service.in
 @@ -10,7 +10,7 @@ Description=File System Check on %f
  Documentation=man:systemd-fsck@.service(8)
  DefaultDependencies=no
diff --git a/disable-nss-myhostname-warning-bnc-783841.patch b/disable-nss-myhostname-warning-bnc-783841.patch
index c0365d7c..c20aad94 100644
--- a/disable-nss-myhostname-warning-bnc-783841.patch
+++ b/disable-nss-myhostname-warning-bnc-783841.patch
@@ -6,10 +6,8 @@ Subject: disable nss-myhostname warning (bnc#783841)
  src/hostname/hostnamed.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 0437e33..c7f454c 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
+--- systemd-206.orig/src/hostname/hostnamed.c
++++ systemd-206/src/hostname/hostnamed.c
 @@ -134,6 +134,7 @@ static int read_data(void) {
  
  static bool check_nss(void) {
diff --git a/ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch b/ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch
index c4e313aa..e095da13 100644
--- a/ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch
+++ b/ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch
@@ -8,10 +8,8 @@ if fsck was disabled for them (bnc#733283).
  units/local-fs-pre.target | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target
-index 809f2ed..05fcbd4 100644
---- a/units/local-fs-pre.target
-+++ b/units/local-fs-pre.target
+--- systemd-206.orig/units/local-fs-pre.target
++++ systemd-206/units/local-fs-pre.target
 @@ -9,3 +9,4 @@
  Description=Local File Systems (Pre)
  Documentation=man:systemd.special(7)
diff --git a/ensure-ask-password-wall-starts-after-getty-tty1.patch b/ensure-ask-password-wall-starts-after-getty-tty1.patch
index a0c005f8..6d6a3346 100644
--- a/ensure-ask-password-wall-starts-after-getty-tty1.patch
+++ b/ensure-ask-password-wall-starts-after-getty-tty1.patch
@@ -7,10 +7,8 @@ ensure passphrase is handled before starting getty on tty1.
  units/systemd-ask-password-wall.service.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service.in
-index 0eaa274..ca51e4e 100644
---- a/units/systemd-ask-password-wall.service.in
-+++ b/units/systemd-ask-password-wall.service.in
+--- systemd-206.orig/units/systemd-ask-password-wall.service.in
++++ systemd-206/units/systemd-ask-password-wall.service.in
 @@ -8,7 +8,7 @@
  [Unit]
  Description=Forward Password Requests to Wall
diff --git a/ensure-shortname-is-set-as-hostname-bnc-820213.patch b/ensure-shortname-is-set-as-hostname-bnc-820213.patch
index 007e6010..3f6b0eb4 100644
--- a/ensure-shortname-is-set-as-hostname-bnc-820213.patch
+++ b/ensure-shortname-is-set-as-hostname-bnc-820213.patch
@@ -7,10 +7,8 @@ strip hostname so the domain part isn't set as part of the hostname
  src/core/hostname-setup.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
-index 0ce683b..1c8e555 100644
---- a/src/core/hostname-setup.c
-+++ b/src/core/hostname-setup.c
+--- systemd-206.orig/src/core/hostname-setup.c
++++ systemd-206/src/core/hostname-setup.c
 @@ -32,7 +32,7 @@
  #include "fileio.h"
  
@@ -20,7 +18,7 @@ index 0ce683b..1c8e555 100644
          int r;
  
          assert(path);
-@@ -49,6 +49,11 @@ static int read_and_strip_hostname(const char *path, char **hn) {
+@@ -49,6 +49,11 @@ static int read_and_strip_hostname(const
                  return -ENOENT;
          }
  
diff --git a/ensure-sysctl-are-applied-after-modules-are-loaded.patch b/ensure-sysctl-are-applied-after-modules-are-loaded.patch
index 186e09e0..4912449c 100644
--- a/ensure-sysctl-are-applied-after-modules-are-loaded.patch
+++ b/ensure-sysctl-are-applied-after-modules-are-loaded.patch
@@ -7,11 +7,9 @@ Subject: ensure sysctl are applied after modules are loaded
  units/systemd-sysctl.service.in | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
-index 45e1ceb..caaaa9a 100644
---- a/units/systemd-sysctl.service.in
-+++ b/units/systemd-sysctl.service.in
-@@ -11,6 +11,7 @@ Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
+--- systemd-206.orig/units/systemd-sysctl.service.in
++++ systemd-206/units/systemd-sysctl.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-sysctl.service
  DefaultDependencies=no
  Conflicts=shutdown.target
  After=systemd-readahead-collect.service systemd-readahead-replay.service
diff --git a/fix-owner-of-var-log-btmp.patch b/fix-owner-of-var-log-btmp.patch
index a28f4937..9f5bfea1 100644
--- a/fix-owner-of-var-log-btmp.patch
+++ b/fix-owner-of-var-log-btmp.patch
@@ -7,10 +7,8 @@ ensure btmp is owned only by root (bnc#777405).
  tmpfiles.d/systemd.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
-index ee86f2e..29d6e97 100644
---- a/tmpfiles.d/systemd.conf
-+++ b/tmpfiles.d/systemd.conf
+--- systemd-206.orig/tmpfiles.d/systemd.conf
++++ systemd-206/tmpfiles.d/systemd.conf
 @@ -11,7 +11,7 @@ d /run/user 0755 root root ~10d
  F /run/utmp 0664 root utmp -
  
diff --git a/fix-support-for-boot-prefixed-initscript-bnc-746506.patch b/fix-support-for-boot-prefixed-initscript-bnc-746506.patch
index 2ccb95a7..dddcefe5 100644
--- a/fix-support-for-boot-prefixed-initscript-bnc-746506.patch
+++ b/fix-support-for-boot-prefixed-initscript-bnc-746506.patch
@@ -6,11 +6,9 @@ Subject: fix support for boot prefixed initscript (bnc#746506)
  src/systemctl/systemctl.c | 22 +++++++++++++++++++++-
  1 file changed, 21 insertions(+), 1 deletion(-)
 
-Index: systemd-205/src/systemctl/systemctl.c
-===================================================================
---- systemd-205.orig/src/systemctl/systemctl.c
-+++ systemd-205/src/systemctl/systemctl.c
-@@ -4192,8 +4192,28 @@ static int enable_sysv_units(char **args
+--- systemd-206.orig/src/systemctl/systemctl.c
++++ systemd-206/src/systemctl/systemctl.c
+@@ -4238,8 +4238,28 @@ static int enable_sysv_units(char **args
                  p[strlen(p) - sizeof(".service") + 1] = 0;
                  found_sysv = access(p, F_OK) >= 0;
  
diff --git a/force-lvm-restart-after-cryptsetup-target-is-reached.patch b/force-lvm-restart-after-cryptsetup-target-is-reached.patch
index 8b4f879c..d40fda5a 100644
--- a/force-lvm-restart-after-cryptsetup-target-is-reached.patch
+++ b/force-lvm-restart-after-cryptsetup-target-is-reached.patch
@@ -6,10 +6,8 @@ Subject: force lvm restart after cryptsetup target is reached
  src/cryptsetup/cryptsetup-generator.c | 57 ++++++++++++++++++++++++++++++++++-
  1 file changed, 56 insertions(+), 1 deletion(-)
 
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 81b7708..1940985 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
+--- systemd-206.orig/src/cryptsetup/cryptsetup-generator.c
++++ systemd-206/src/cryptsetup/cryptsetup-generator.c
 @@ -22,6 +22,7 @@
  #include <string.h>
  #include <errno.h>
@@ -18,7 +16,7 @@ index 81b7708..1940985 100644
  
  #include "log.h"
  #include "util.h"
-@@ -64,6 +65,54 @@ static bool has_option(const char *haystack, const char *needle) {
+@@ -64,6 +65,54 @@ static bool has_option(const char *hayst
          return false;
  }
  
diff --git a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch
index cc5239bf..79b99a67 100644
--- a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch
+++ b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch
@@ -7,11 +7,9 @@ Subject: handle SYSTEMCTL_OPTIONS environment variable
  src/systemctl/systemctl.c | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-Index: systemd-205/src/systemctl/systemctl.c
-===================================================================
---- systemd-205.orig/src/systemctl/systemctl.c
-+++ systemd-205/src/systemctl/systemctl.c
-@@ -6131,6 +6131,28 @@ int main(int argc, char*argv[]) {
+--- systemd-206.orig/src/systemctl/systemctl.c
++++ systemd-206/src/systemctl/systemctl.c
+@@ -6197,6 +6197,28 @@ int main(int argc, char*argv[]) {
          log_parse_environment();
          log_open();
  
diff --git a/handle-disable_caplock-and-compose_table-and-kbd_rate.patch b/handle-disable_caplock-and-compose_table-and-kbd_rate.patch
index 050f9216..d2116163 100644
--- a/handle-disable_caplock-and-compose_table-and-kbd_rate.patch
+++ b/handle-disable_caplock-and-compose_table-and-kbd_rate.patch
@@ -7,10 +7,8 @@ Subject: handle disable_caplock and compose_table and kbd_rate
  src/vconsole/vconsole-setup.c | 156 +++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 153 insertions(+), 3 deletions(-)
 
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index 1bbf737..384f936 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
+--- systemd-206.orig/src/vconsole/vconsole-setup.c
++++ systemd-206/src/vconsole/vconsole-setup.c
 @@ -40,6 +40,7 @@
  #include "macro.h"
  #include "virt.h"
@@ -30,7 +28,7 @@ index 1bbf737..384f936 100644
          int i = 0;
          pid_t pid;
  
-@@ -119,6 +120,8 @@ static int keymap_load(const char *vc, const char *map, const char *map_toggle,
+@@ -119,6 +120,8 @@ static int keymap_load(const char *vc, c
          args[i++] = map;
          if (map_toggle)
                  args[i++] = map_toggle;
@@ -39,7 +37,7 @@ index 1bbf737..384f936 100644
          args[i++] = NULL;
  
          pid = fork();
-@@ -212,6 +215,101 @@ static void font_copy_to_all_vcs(int fd) {
+@@ -212,6 +215,101 @@ static void font_copy_to_all_vcs(int fd)
          }
  }
  
diff --git a/handle-etc-HOSTNAME.patch b/handle-etc-HOSTNAME.patch
index 075d67d8..cdcb932e 100644
--- a/handle-etc-HOSTNAME.patch
+++ b/handle-etc-HOSTNAME.patch
@@ -8,10 +8,8 @@ Subject: handle /etc/HOSTNAME
  src/hostname/hostnamed.c  | 12 +++++++++++-
  2 files changed, 28 insertions(+), 6 deletions(-)
 
-diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
-index 8aa1cff..0ce683b 100644
---- a/src/core/hostname-setup.c
-+++ b/src/core/hostname-setup.c
+--- systemd-206.orig/src/core/hostname-setup.c
++++ systemd-206/src/core/hostname-setup.c
 @@ -61,12 +61,24 @@ int hostname_setup(void) {
  
          r = read_and_strip_hostname("/etc/hostname", &b);
@@ -19,6 +17,7 @@ index 8aa1cff..0ce683b 100644
 -                if (r == -ENOENT)
 -                        enoent = true;
 -                else
+-                        log_warning("Failed to read configured hostname: %s", strerror(-r));
 +                if (r == -ENOENT) {
 +                        /* use SUSE fallback */
 +                        r = read_and_strip_hostname("/etc/HOSTNAME", &b);
@@ -31,21 +30,18 @@ index 8aa1cff..0ce683b 100644
 +                        }
 +                        else
 +                                hn = b;
-+
+ 
+-                hn = NULL;
 +                }
 +                else {
-                         log_warning("Failed to read configured hostname: %s", strerror(-r));
--
--                hn = NULL;
++                        log_warning("Failed to read configured hostname: %s", strerror(-r));
 +                        hn = NULL;
 +                }
          } else
                  hn = b;
  
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index c7f454c..cfbd706 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
+--- systemd-206.orig/src/hostname/hostnamed.c
++++ systemd-206/src/hostname/hostnamed.c
 @@ -129,6 +129,10 @@ static int read_data(void) {
          if (r < 0 && r != -ENOENT)
                  return r;
@@ -65,7 +61,7 @@ index c7f454c..cfbd706 100644
          if (isempty(data[PROP_STATIC_HOSTNAME])) {
  
                  if (unlink("/etc/hostname") < 0)
-@@ -290,7 +295,12 @@ static int write_data_static_hostname(void) {
+@@ -290,7 +295,12 @@ static int write_data_static_hostname(vo
  
                  return 0;
          }
diff --git a/handle-numlock-value-in-etc-sysconfig-keyboard.patch b/handle-numlock-value-in-etc-sysconfig-keyboard.patch
index ab735884..284686b2 100644
--- a/handle-numlock-value-in-etc-sysconfig-keyboard.patch
+++ b/handle-numlock-value-in-etc-sysconfig-keyboard.patch
@@ -6,10 +6,8 @@ Authors:
 Stanislav Brabec <sbrabec@suse.cz>
 Cristian Rodríguez <crrodriguez@opensuse.org>
 
-Index: systemd-205/src/vconsole/vconsole-setup.c
-===================================================================
---- systemd-205.orig/src/vconsole/vconsole-setup.c
-+++ systemd-205/src/vconsole/vconsole-setup.c
+--- systemd-206.orig/src/vconsole/vconsole-setup.c
++++ systemd-206/src/vconsole/vconsole-setup.c
 @@ -42,6 +42,10 @@
  #include "fileio.h"
  #include "strv.h"
@@ -100,11 +98,9 @@ Index: systemd-205/src/vconsole/vconsole-setup.c
  #ifdef HAVE_SYSV_COMPAT
          free(vc_kbd_delay);
          free(vc_kbd_rate);
-Index: systemd-205/Makefile.am
-===================================================================
---- systemd-205.orig/Makefile.am
-+++ systemd-205/Makefile.am
-@@ -2361,6 +2361,19 @@ dist_udevrules_DATA += \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -2452,6 +2452,19 @@ dist_udevrules_DATA += \
  	rules/61-accelerometer.rules
  
  # ------------------------------------------------------------------------------
@@ -124,10 +120,8 @@ Index: systemd-205/Makefile.am
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
  SUBDIRS += \
-Index: systemd-205/rules/73-seat-numlock.rules
-===================================================================
 --- /dev/null
-+++ systemd-205/rules/73-seat-numlock.rules
++++ systemd-206/rules/73-seat-numlock.rules
 @@ -0,0 +1,8 @@
 +#  This file is part of SUSE customization of systemd.
 +#
@@ -137,10 +131,8 @@ Index: systemd-205/rules/73-seat-numlock.rules
 +#  (at your option) any later version.
 +
 +SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}"
-Index: systemd-205/src/login/numlock-on.c
-===================================================================
 --- /dev/null
-+++ systemd-205/src/login/numlock-on.c
++++ systemd-206/src/login/numlock-on.c
 @@ -0,0 +1,34 @@
 +/*
 + * numlock-on.c: Turn numlock-on
@@ -176,10 +168,8 @@ Index: systemd-205/src/login/numlock-on.c
 +
 +	exit(0);
 +}
-Index: systemd-205/units/systemd-vconsole-setup.service.in
-===================================================================
---- systemd-205.orig/units/systemd-vconsole-setup.service.in
-+++ systemd-205/units/systemd-vconsole-setup.service.in
+--- systemd-206.orig/units/systemd-vconsole-setup.service.in
++++ systemd-206/units/systemd-vconsole-setup.service.in
 @@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup
  DefaultDependencies=no
  Conflicts=shutdown.target
diff --git a/handle-root_uses_lang-value-in-etc-sysconfig-language.patch b/handle-root_uses_lang-value-in-etc-sysconfig-language.patch
index e2ac6c77..df273d04 100644
--- a/handle-root_uses_lang-value-in-etc-sysconfig-language.patch
+++ b/handle-root_uses_lang-value-in-etc-sysconfig-language.patch
@@ -7,11 +7,9 @@ handle ROOT_USES_LANG=ctype (bnc#792182).
  src/core/locale-setup.c | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
-diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
-index d7113b9..b3fb603 100644
---- a/src/core/locale-setup.c
-+++ b/src/core/locale-setup.c
-@@ -70,6 +70,11 @@ static const char * const variable_names[_VARIABLE_MAX] = {
+--- systemd-206.orig/src/core/locale-setup.c
++++ systemd-206/src/core/locale-setup.c
+@@ -70,6 +70,11 @@ static const char * const variable_names
  int locale_setup(void) {
          char *variables[_VARIABLE_MAX] = {};
          int r = 0, i;
@@ -23,32 +21,31 @@ index d7113b9..b3fb603 100644
  
          if (detect_container(NULL) <= 0) {
                  r = parse_env_file("/proc/cmdline", WHITESPACE,
-@@ -117,6 +122,28 @@ int locale_setup(void) {
+@@ -116,6 +121,27 @@ int locale_setup(void) {
+                 if (r < 0 && r != -ENOENT)
                          log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
          }
- 
 +#ifdef HAVE_SYSV_COMPAT
-+        if (r <= 0 &&
++        if (r <= 0 && 
 +            (r = parse_env_file("/etc/sysconfig/language", NEWLINE,
 +                                "ROOT_USES_LANG", &root_uses_lang,
 +                                "RC_LANG", &variables[VARIABLE_LANG],
-+                                NULL)) < 0) {
++                                 NULL)) < 0) {
++            if (r != -ENOENT)
++                    log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
 +
-+                if (r != -ENOENT)
-+                        log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
 +        } else {
-+                if (!root_uses_lang || (root_uses_lang && !strcaseeq(root_uses_lang,"yes"))) {
-+                        if (root_uses_lang && strcaseeq(root_uses_lang,"ctype"))
-+                                variables[VARIABLE_LC_CTYPE]=variables[VARIABLE_LANG];
-+                        else
-+                                free(variables[VARIABLE_LANG]);
++             if (!root_uses_lang || (root_uses_lang && !strcaseeq(root_uses_lang,"yes"))) {
++                     if (root_uses_lang && strcaseeq(root_uses_lang,"ctype"))
++                            variables[VARIABLE_LC_CTYPE]=variables[VARIABLE_LANG];
++                     else
++                            free(variables[VARIABLE_LANG]);
 +
-+                        variables[VARIABLE_LANG]=strdup("POSIX");
-+               }
++                    variables[VARIABLE_LANG]=strdup("POSIX");
 +        }
++      }
 +
 +#endif
-+
-         if (!variables[VARIABLE_LANG]) {
-                 variables[VARIABLE_LANG] = strdup("C");
-                 if (!variables[VARIABLE_LANG]) {
+ 
+         for (i = 0; i < _VARIABLE_MAX; i++) {
+                 if (variables[i]) {
diff --git a/insserv-generator.patch b/insserv-generator.patch
index 578f387b..d53876b7 100644
--- a/insserv-generator.patch
+++ b/insserv-generator.patch
@@ -13,11 +13,9 @@ systemd unit drop-in files to add dependencies
  create mode 100644 src/insserv-generator/Makefile
  create mode 100644 src/insserv-generator/insserv-generator.c
 
-Index: systemd-205/Makefile.am
-===================================================================
---- systemd-205.orig/Makefile.am
-+++ systemd-205/Makefile.am
-@@ -316,6 +316,7 @@ rootlibexec_PROGRAMS = \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -321,6 +321,7 @@ rootlibexec_PROGRAMS = \
  	systemd-sleep
  
  systemgenerator_PROGRAMS = \
@@ -25,7 +23,7 @@ Index: systemd-205/Makefile.am
  	systemd-getty-generator \
  	systemd-fstab-generator \
  	systemd-system-update-generator
-@@ -1578,6 +1579,14 @@ systemd_delta_LDADD = \
+@@ -1642,6 +1643,14 @@ systemd_delta_LDADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -40,10 +38,8 @@ Index: systemd-205/Makefile.am
  systemd_getty_generator_SOURCES = \
  	src/getty-generator/getty-generator.c
  
-Index: systemd-205/src/insserv-generator/Makefile
-===================================================================
 --- /dev/null
-+++ systemd-205/src/insserv-generator/Makefile
++++ systemd-206/src/insserv-generator/Makefile
 @@ -0,0 +1,28 @@
 +#  This file is part of systemd.
 +#
@@ -73,10 +69,8 @@ Index: systemd-205/src/insserv-generator/Makefile
 +	$(MAKE) -C .. clean
 +
 +.PHONY: all clean
-Index: systemd-205/src/insserv-generator/insserv-generator.c
-===================================================================
 --- /dev/null
-+++ systemd-205/src/insserv-generator/insserv-generator.c
++++ systemd-206/src/insserv-generator/insserv-generator.c
 @@ -0,0 +1,309 @@
 +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 +
diff --git a/macros.systemd.upstream b/macros.systemd.upstream
index f76d6f12..323d1d48 100644
--- a/macros.systemd.upstream
+++ b/macros.systemd.upstream
@@ -72,3 +72,7 @@ fi \
 %journal_catalog_update() \
 @rootbindir@/journalctl --update-catalog >/dev/null 2>&1 || : \
 %{nil}
+
+%tmpfiles_create() \
+@rootbindir@/systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
+%{nil}
diff --git a/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch b/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch
index 238d23be..dfa7cd97 100644
--- a/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch
+++ b/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch
@@ -7,11 +7,9 @@ Subject: module-load: handle SUSE /etc/sysconfig/kernel module list
  units/systemd-modules-load.service.in |  1 +
  2 files changed, 27 insertions(+), 1 deletion(-)
 
-diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 7b19ee0..36b1a68 100644
---- a/src/modules-load/modules-load.c
-+++ b/src/modules-load/modules-load.c
-@@ -262,6 +262,9 @@ static int parse_argv(int argc, char *argv[]) {
+--- systemd-206.orig/src/modules-load/modules-load.c
++++ systemd-206/src/modules-load/modules-load.c
+@@ -262,6 +262,9 @@ static int parse_argv(int argc, char *ar
  int main(int argc, char *argv[]) {
          int r, k;
          struct kmod_ctx *ctx;
@@ -52,10 +50,8 @@ index 7b19ee0..36b1a68 100644
  finish:
          kmod_unref(ctx);
          strv_free(arg_proc_cmdline_modules);
-diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
-index 32deb52..2e26d2f 100644
---- a/units/systemd-modules-load.service.in
-+++ b/units/systemd-modules-load.service.in
+--- systemd-206.orig/units/systemd-modules-load.service.in
++++ systemd-206/units/systemd-modules-load.service.in
 @@ -13,6 +13,7 @@ Conflicts=shutdown.target
  After=systemd-readahead-collect.service systemd-readahead-replay.service
  Before=sysinit.target shutdown.target
diff --git a/optionally-warn-if-nss-myhostname-is-called.patch b/optionally-warn-if-nss-myhostname-is-called.patch
index 55e9ed17..41661df8 100644
--- a/optionally-warn-if-nss-myhostname-is-called.patch
+++ b/optionally-warn-if-nss-myhostname-is-called.patch
@@ -7,11 +7,9 @@ Subject: optionally warn if nss-myhostname is called
  src/nss-myhostname/nss-myhostname.c | 32 ++++++++++++++++++++++++++++++++
  2 files changed, 43 insertions(+)
 
-Index: systemd-205/configure.ac
-===================================================================
---- systemd-205.orig/configure.ac
-+++ systemd-205/configure.ac
-@@ -772,6 +772,17 @@ if test "x$enable_myhostname" != "xno";
+--- systemd-206.orig/configure.ac
++++ systemd-206/configure.ac
+@@ -803,6 +803,17 @@ if test "x$enable_myhostname" != "xno";
  fi
  AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
  
@@ -29,10 +27,8 @@ Index: systemd-205/configure.ac
  # ------------------------------------------------------------------------------
  AC_ARG_WITH(firmware-path,
         AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
-Index: systemd-205/src/nss-myhostname/nss-myhostname.c
-===================================================================
---- systemd-205.orig/src/nss-myhostname/nss-myhostname.c
-+++ systemd-205/src/nss-myhostname/nss-myhostname.c
+--- systemd-206.orig/src/nss-myhostname/nss-myhostname.c
++++ systemd-206/src/nss-myhostname/nss-myhostname.c
 @@ -29,6 +29,9 @@
  #include <net/if.h>
  #include <stdlib.h>
diff --git a/remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch b/remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch
index 6f4f62e6..3ff05deb 100644
--- a/remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch
+++ b/remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch
@@ -11,10 +11,8 @@ PIDFile: and X-Systemd-RemainAfterExit to control it.
  src/core/service.h |  1 +
  2 files changed, 33 insertions(+), 2 deletions(-)
 
-Index: systemd-205/src/core/service.c
-===================================================================
---- systemd-205.orig/src/core/service.c
-+++ systemd-205/src/core/service.c
+--- systemd-206.orig/src/core/service.c
++++ systemd-206/src/core/service.c
 @@ -135,6 +135,7 @@ static void service_init(Unit *u) {
  #ifdef HAVE_SYSV_COMPAT
          s->sysv_start_priority = -1;
@@ -77,10 +75,8 @@ Index: systemd-205/src/core/service.c
                          s->remain_after_exit = false;
  #endif
                  service_set_state(s, SERVICE_RUNNING);
-Index: systemd-205/src/core/service.h
-===================================================================
---- systemd-205.orig/src/core/service.h
-+++ systemd-205/src/core/service.h
+--- systemd-206.orig/src/core/service.h
++++ systemd-206/src/core/service.h
 @@ -177,6 +177,7 @@ struct Service {
          bool is_sysv:1;
          bool sysv_has_lsb:1;
diff --git a/restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch b/restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch
index 8432cd38..c9f3fc9d 100644
--- a/restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch
+++ b/restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch
@@ -10,11 +10,9 @@ Subject: restore /var/run and /var/lock bind mount if they aren't symlink
  create mode 100644 units/var-lock.mount
  create mode 100644 units/var-run.mount
 
-Index: systemd-205/Makefile.am
-===================================================================
---- systemd-205.orig/Makefile.am
-+++ systemd-205/Makefile.am
-@@ -402,6 +402,12 @@ dist_systemunit_DATA = \
+--- systemd-206.orig/Makefile.am
++++ systemd-206/Makefile.am
+@@ -407,6 +407,12 @@ dist_systemunit_DATA = \
  	units/system-update.target \
  	units/initrd-switch-root.target
  
@@ -27,7 +25,7 @@ Index: systemd-205/Makefile.am
  nodist_systemunit_DATA = \
  	units/getty@.service \
  	units/serial-getty@.service \
-@@ -4268,6 +4274,9 @@ RUNLEVEL4_TARGET_WANTS += \
+@@ -4277,6 +4283,9 @@ RUNLEVEL4_TARGET_WANTS += \
  	systemd-update-utmp-runlevel.service
  RUNLEVEL5_TARGET_WANTS += \
  	systemd-update-utmp-runlevel.service
@@ -37,10 +35,8 @@ Index: systemd-205/Makefile.am
  endif
  SYSINIT_TARGET_WANTS += \
  	systemd-update-utmp.service
-Index: systemd-205/units/var-lock.mount
-===================================================================
 --- /dev/null
-+++ systemd-205/units/var-lock.mount
++++ systemd-206/units/var-lock.mount
 @@ -0,0 +1,19 @@
 +#  This file is part of systemd.
 +#
@@ -61,10 +57,8 @@ Index: systemd-205/units/var-lock.mount
 +Where=/var/lock
 +Type=bind
 +Options=bind
-Index: systemd-205/units/var-run.mount
-===================================================================
 --- /dev/null
-+++ systemd-205/units/var-run.mount
++++ systemd-206/units/var-run.mount
 @@ -0,0 +1,19 @@
 +#  This file is part of systemd.
 +#
diff --git a/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch b/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch
index 589069aa..ca2c8271 100644
--- a/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch
+++ b/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch
@@ -12,10 +12,8 @@ Fixes https://bugzilla.novell.com/show_bug.cgi?id=721426
  src/core/service.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-Index: systemd-205/src/core/service.c
-===================================================================
---- systemd-205.orig/src/core/service.c
-+++ systemd-205/src/core/service.c
+--- systemd-206.orig/src/core/service.c
++++ systemd-206/src/core/service.c
 @@ -2092,8 +2092,13 @@ static void service_enter_running(Servic
          cgroup_ok = cgroup_good(s);
  
diff --git a/sysctl-handle-boot-sysctl.conf-kernel_release.patch b/sysctl-handle-boot-sysctl.conf-kernel_release.patch
index 3ca7dc2a..45f1ad52 100644
--- a/sysctl-handle-boot-sysctl.conf-kernel_release.patch
+++ b/sysctl-handle-boot-sysctl.conf-kernel_release.patch
@@ -10,10 +10,8 @@ configuration), needed by openSUSE (bnc#809420).
  units/systemd-sysctl.service.in | 1 +
  2 files changed, 9 insertions(+)
 
-Index: systemd-204/src/sysctl/sysctl.c
-===================================================================
---- systemd-204.orig/src/sysctl/sysctl.c
-+++ systemd-204/src/sysctl/sysctl.c
+--- systemd-206.orig/src/sysctl/sysctl.c
++++ systemd-206/src/sysctl/sysctl.c
 @@ -26,6 +26,7 @@
  #include <stdio.h>
  #include <limits.h>
@@ -36,10 +34,8 @@ Index: systemd-204/src/sysctl/sysctl.c
  
                  r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                  if (r < 0) {
-Index: systemd-204/units/systemd-sysctl.service.in
-===================================================================
---- systemd-204.orig/units/systemd-sysctl.service.in
-+++ systemd-204/units/systemd-sysctl.service.in
+--- systemd-206.orig/units/systemd-sysctl.service.in
++++ systemd-206/units/systemd-sysctl.service.in
 @@ -20,6 +20,7 @@ ConditionDirectoryNotEmpty=|/usr/lib/sys
  ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d
  ConditionDirectoryNotEmpty=|/etc/sysctl.d
diff --git a/systemd-205.tar.xz b/systemd-205.tar.xz
deleted file mode 100644
index e97037a3..00000000
--- a/systemd-205.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54d6d3e1e9e66b6a484f68a3323cb489f0a8f50bdeb1d5465c3a48c6fc1e0058
-size 2237640
diff --git a/systemd-206.tar.xz b/systemd-206.tar.xz
new file mode 100644
index 00000000..5702098a
--- /dev/null
+++ b/systemd-206.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de
+size 2340536
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 2eba47e2..c1c8c94d 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org
+
+- version 206 , highlights:
+* Unit files now understand the new %v specifier which
+  resolves to the kernel version string as returned by "uname-r".
+* "journalctl -b" may now be used to look for boot output of a
+   specific boot. Try "journalctl -b -1"
+* Creation of "dead" device nodes has been moved from udev
+  into kmod and tmpfiles.
+*  The udev "keymap" data files and tools to apply keyboard
+   specific mappings of scan to key codes, and force-release
+   scan code lists have been entirely replaced by a udev
+   "keyboard" builtin and a hwdb data file.
+
+- remove patches now in upstream
+- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0
+- systemd now require the kmod tool in addition to the library.
+
 -------------------------------------------------------------------
 Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 27abe6b8..28a44bb6 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -25,7 +25,7 @@
 
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        205
+Version:        206
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1+
@@ -65,9 +65,9 @@ BuildRequires:  pkgconfig(dbus-1) >= 1.3.2
 %if ! 0%{?bootstrap}
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(glib-2.0) >= 2.22.0
-BuildRequires:  pkgconfig(libcryptsetup) >= 1.4.2
+BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 %endif
-BuildRequires:  pkgconfig(libkmod) >= 5
+BuildRequires:  pkgconfig(libkmod) >= 14
 BuildRequires:  pkgconfig(liblzma)
 %if ! 0%{?bootstrap}
 BuildRequires:  pkgconfig(libmicrohttpd)
@@ -90,6 +90,7 @@ Conflicts:      kiwi
 Requires:       %{udevpkgname} >= 172
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
+Requires:       kmod >= 14
 Requires:       pam-config >= 0.79-5
 Requires:       pwdutils
 Requires:       systemd-presets-branding
@@ -156,14 +157,6 @@ Patch40:        sysctl-handle-boot-sysctl.conf-kernel_release.patch
 # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcrozat@suse.com -- Do not set anything beyond first dot as hostname
 Patch41:        ensure-shortname-is-set-as-hostname-bnc-820213.patch
 
-# PATCH-FIX-UPSTREAM 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch crrodriguez@opensuse.org -- fix segfault at shutdown
-Patch42:        0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch
-# PATCH-FIX-UPSTREAM 0004-disable-the-cgroups-release-agent-when-shutting-down.patch crrodriguez@opensuse.org -- disable the cgroups release agent when shutting down
-Patch43:        0004-disable-the-cgroups-release-agent-when-shutting-down.patch
-# PATCH-FIX-UPSTREAM 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch crrodriguez@opensuse.org -- remove ancient fallback code; turn connection error into warning
-Patch44:        0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch
-# PATCH-FIX-UPSTREAM 006-suppress-status-message-output-at-shutdown-when-quie.patch crrodriguez@opensuse.org -- make shutdown honour "quiet"
-Patch45:        0006-suppress-status-message-output-at-shutdown-when-quie.patch
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
 # in the patch. Any patches added here without a very good reason to make
@@ -186,8 +179,6 @@ Patch1001:      1001-re-enable-by_path-links-for-ata-devices.patch
 Patch1002:      1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
 # PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch
 Patch1003:      1003-udev-netlink-null-rules.patch
-# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr
-Patch1004:      1004-fix-devname-prefix.patch
 # PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch
 Patch1005:      1005-create-default-links-for-primary-cd_dvd-drive.patch
 # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch
@@ -411,17 +402,12 @@ cp %{SOURCE7} m4/
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
 %patch46 -p1
 
 # udev patches
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1
-%patch1004 -p1
 %patch1005 -p1
 %patch1006 -p1
 # don't apply when bootstrapping to not modify Makefile.am
@@ -988,15 +974,10 @@ fi
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
 %{_prefix}/lib/udev/collect
-%{_prefix}/lib/udev/findkeyboards
-%{_prefix}/lib/udev/keymap
 %{_prefix}/lib/udev/mtd_probe
 %{_prefix}/lib/udev/scsi_id
 %{_prefix}/lib/udev/v4l_id
 %{_prefix}/lib/udev/write_dev_root_rule
-%dir %{_prefix}/lib/udev/keymaps
-%{_prefix}/lib/udev/keymaps/*
-%{_prefix}/lib/udev/keyboard-force-release.sh
 %dir %{_prefix}/lib/udev/rules.d/
 %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules
 %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules
diff --git a/systemd-tmp-safe-defaults.patch b/systemd-tmp-safe-defaults.patch
index 4c957df7..492ab22b 100644
--- a/systemd-tmp-safe-defaults.patch
+++ b/systemd-tmp-safe-defaults.patch
@@ -8,10 +8,8 @@ SUSE policy is to not clean /tmp by default.
  tmpfiles.d/tmp.conf | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
-index 3b534a1..99eb6f2 100644
---- a/tmpfiles.d/tmp.conf
-+++ b/tmpfiles.d/tmp.conf
+--- systemd-206.orig/tmpfiles.d/tmp.conf
++++ systemd-206/tmpfiles.d/tmp.conf
 @@ -8,8 +8,9 @@
  # See tmpfiles.d(5) for details
  
diff --git a/systemd.changes b/systemd.changes
index 2eba47e2..c1c8c94d 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org
+
+- version 206 , highlights:
+* Unit files now understand the new %v specifier which
+  resolves to the kernel version string as returned by "uname-r".
+* "journalctl -b" may now be used to look for boot output of a
+   specific boot. Try "journalctl -b -1"
+* Creation of "dead" device nodes has been moved from udev
+  into kmod and tmpfiles.
+*  The udev "keymap" data files and tools to apply keyboard
+   specific mappings of scan to key codes, and force-release
+   scan code lists have been entirely replaced by a udev
+   "keyboard" builtin and a hwdb data file.
+
+- remove patches now in upstream
+- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0
+- systemd now require the kmod tool in addition to the library.
+
 -------------------------------------------------------------------
 Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com
 
diff --git a/systemd.spec b/systemd.spec
index 7b368d0d..f31c660b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -23,7 +23,7 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        205
+Version:        206
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1+
@@ -60,9 +60,9 @@ BuildRequires:  pkgconfig(dbus-1) >= 1.3.2
 %if ! 0%{?bootstrap}
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig(glib-2.0) >= 2.22.0
-BuildRequires:  pkgconfig(libcryptsetup) >= 1.4.2
+BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 %endif
-BuildRequires:  pkgconfig(libkmod) >= 5
+BuildRequires:  pkgconfig(libkmod) >= 14
 BuildRequires:  pkgconfig(liblzma)
 %if ! 0%{?bootstrap}
 BuildRequires:  pkgconfig(libmicrohttpd)
@@ -85,6 +85,7 @@ Conflicts:      kiwi
 Requires:       %{udevpkgname} >= 172
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
+Requires:       kmod >= 14
 Requires:       pam-config >= 0.79-5
 Requires:       pwdutils
 Requires:       systemd-presets-branding
@@ -151,14 +152,6 @@ Patch40:        sysctl-handle-boot-sysctl.conf-kernel_release.patch
 # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcrozat@suse.com -- Do not set anything beyond first dot as hostname
 Patch41:        ensure-shortname-is-set-as-hostname-bnc-820213.patch
 
-# PATCH-FIX-UPSTREAM 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch crrodriguez@opensuse.org -- fix segfault at shutdown
-Patch42:        0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch
-# PATCH-FIX-UPSTREAM 0004-disable-the-cgroups-release-agent-when-shutting-down.patch crrodriguez@opensuse.org -- disable the cgroups release agent when shutting down
-Patch43:        0004-disable-the-cgroups-release-agent-when-shutting-down.patch
-# PATCH-FIX-UPSTREAM 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch crrodriguez@opensuse.org -- remove ancient fallback code; turn connection error into warning
-Patch44:        0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch
-# PATCH-FIX-UPSTREAM 006-suppress-status-message-output-at-shutdown-when-quie.patch crrodriguez@opensuse.org -- make shutdown honour "quiet"
-Patch45:        0006-suppress-status-message-output-at-shutdown-when-quie.patch
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
 # in the patch. Any patches added here without a very good reason to make
@@ -181,8 +174,6 @@ Patch1001:      1001-re-enable-by_path-links-for-ata-devices.patch
 Patch1002:      1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
 # PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch
 Patch1003:      1003-udev-netlink-null-rules.patch
-# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr
-Patch1004:      1004-fix-devname-prefix.patch
 # PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch
 Patch1005:      1005-create-default-links-for-primary-cd_dvd-drive.patch
 # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch
@@ -406,17 +397,12 @@ cp %{SOURCE7} m4/
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
 %patch46 -p1
 
 # udev patches
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1
-%patch1004 -p1
 %patch1005 -p1
 %patch1006 -p1
 # don't apply when bootstrapping to not modify Makefile.am
@@ -983,15 +969,10 @@ fi
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
 %{_prefix}/lib/udev/collect
-%{_prefix}/lib/udev/findkeyboards
-%{_prefix}/lib/udev/keymap
 %{_prefix}/lib/udev/mtd_probe
 %{_prefix}/lib/udev/scsi_id
 %{_prefix}/lib/udev/v4l_id
 %{_prefix}/lib/udev/write_dev_root_rule
-%dir %{_prefix}/lib/udev/keymaps
-%{_prefix}/lib/udev/keymaps/*
-%{_prefix}/lib/udev/keyboard-force-release.sh
 %dir %{_prefix}/lib/udev/rules.d/
 %exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules
 %exclude %{_prefix}/lib/udev/rules.d/71-seat.rules
diff --git a/timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch b/timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch
index 8a67df99..01f96bde 100644
--- a/timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch
+++ b/timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch
@@ -6,10 +6,8 @@ Subject: timedate: add support for openSUSE version of /etc/sysconfig/clock
  src/timedate/timedated.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index cdb6e5b..7246452 100644
---- a/src/timedate/timedated.c
-+++ b/src/timedate/timedated.c
+--- systemd-206.orig/src/timedate/timedated.c
++++ systemd-206/src/timedate/timedated.c
 @@ -182,6 +182,13 @@ static int read_data(void) {
                          goto have_timezone;
                  }
diff --git a/use-usr-sbin-sulogin-for-emergency-service.patch b/use-usr-sbin-sulogin-for-emergency-service.patch
index 6dbd5882..2c932c6c 100644
--- a/use-usr-sbin-sulogin-for-emergency-service.patch
+++ b/use-usr-sbin-sulogin-for-emergency-service.patch
@@ -3,10 +3,8 @@ Subject: use /usr/sbin/sulogin in emergency service
 
 In current Factory sulogin is in /usr/sbin which makes it impossible
 to enter emergency service.
-Index: systemd-205/units/emergency.service
-===================================================================
---- systemd-205.orig/units/emergency.service
-+++ systemd-205/units/emergency.service
+--- systemd-206.orig/units/emergency.service
++++ systemd-206/units/emergency.service
 @@ -17,7 +17,7 @@ Environment=HOME=/root
  WorkingDirectory=/root
  ExecStartPre=-/bin/plymouth quit
@@ -16,10 +14,8 @@ Index: systemd-205/units/emergency.service
  ExecStopPost=/usr/bin/systemctl --fail --no-block default
  Type=idle
  StandardInput=tty-force
-Index: systemd-205/units/emergency.service.in
-===================================================================
---- systemd-205.orig/units/emergency.service.in
-+++ systemd-205/units/emergency.service.in
+--- systemd-206.orig/units/emergency.service.in
++++ systemd-206/units/emergency.service.in
 @@ -17,7 +17,7 @@ Environment=HOME=/root
  WorkingDirectory=/root
  ExecStartPre=-/bin/plymouth quit