[packages/systemd] - updated patches to 198

[baggins]

commit d31498aabb04a8122e767ad2c00024c1ff82f643
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 11 14:05:06 2013 +0100

    - updated patches to 198

 net-rename-revert.patch |  8 +++---
 target-pld.patch        | 75 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 55 insertions(+), 28 deletions(-)
---
diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 2a8561e..c7c59ce 100644
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -61,8 +61,8 @@ index 2ade0ab..aff1487 100644
  
          log_debug("changing net interface name from '%s' to '%s'\n",
 @@ -766,12 +787,49 @@ static int rename_netif(struct udev_event *event)
-         util_strscpy(ifr.ifr_name, IFNAMSIZ, udev_device_get_sysname(dev));
-         util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
+         strscpy(ifr.ifr_name, IFNAMSIZ, udev_device_get_sysname(dev));
+         strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
          err = ioctl(sk, SIOCSIFNAME, &ifr);
 -        if (err >= 0) {
 -                print_kmsg("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
@@ -90,8 +90,8 @@ index 2ade0ab..aff1487 100644
 +        rename_netif_kernel_log(ifr);
 +
 +        /* wait a maximum of 90 seconds for our target to become available */
-+        util_strscpy(ifr.ifr_name, IFNAMSIZ, ifr.ifr_newname);
-+        util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
++        strscpy(ifr.ifr_name, IFNAMSIZ, ifr.ifr_newname);
++        strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
 +        loop = 90 * 20;
 +        while (loop--) {
 +                const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
diff --git a/target-pld.patch b/target-pld.patch
index b2975ce..b766050 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -2,28 +2,52 @@ diff --git a/Makefile.am b/Makefile.am
 index 170465a..bce467d 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -4083,6 +4083,21 @@ if TARGET_FEDORA
- 		$(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
- endif
+@@ -196,6 +196,8 @@
+ SYSINIT_TARGET_WANTS =
+ BASIC_TARGET_WANTS =
+ SOCKETS_TARGET_WANTS =
++FINAL_TARGET_WANTS =
++GRAPHICAL_TARGET_WANTS =
  
-+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-+		rm -f rc-local.service && \
-+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
-+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-+		rm -f halt-local.service && \
-+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+ SYSTEM_UNIT_ALIASES =
+ USER_UNIT_ALIASES =
+@@ -214,6 +216,8 @@
+ 	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
+ 	what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
+ 	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
++	what="$(FINAL_TARGET_WANTS)" && wants=final.target && $(add-wants)
++	what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && $(add-wants)
+ 
+ define add-wants
+ 	[ -z "$$what" ] || ( \
+@@ -3388,9 +3392,16 @@
+ 	$(systemdstatedir)
+ 
+ MULTI_USER_TARGET_WANTS += \
++	rc-local.service \
+ 	systemd-logind.service \
+ 	systemd-user-sessions.service
+ 
++FINAL_TARGET_WANTS += \
++	halt-local.service
++
++GRAPHICAL_TARGET_WANTS += \
++	display-manager.service
++
+ SYSTEM_UNIT_ALIASES += \
+ 	systemd-logind.service dbus-org.freedesktop.login1.service
+ 
+@@ -3790,6 +3801,10 @@
+ uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
+ 
+ install-data-hook: $(INSTALL_DATA_HOOKS)
 +	( cd $(DESTDIR)$(systemunitdir) && \
 +		rm -f display-manager.service single.service && \
 +		$(LN_S) prefdm.service display-manager.service && \
 +		$(LN_S) rescue.service single.service )
-+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-+		rm -f display-manager.service && \
-+		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-+
- install-exec-hook: $(INSTALL_EXEC_HOOKS)
  
- uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
+ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+ 
 diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
 index 2c2f10c..754f0c7 100644
 --- a/src/core/hostname-setup.c
@@ -155,17 +179,19 @@ index 7f692e9..0a45854 100644
 +		if (r != -ENOENT)
 +			log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
 +	}
- #ifdef HAVE_DEBIAN
-         r = read_one_line_file("/etc/timezone", &tz.zone);
-         if (r < 0) {
+ have_timezone:
+         if (isempty(tz.zone)) {
+                 free(tz.zone);
 diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
 index 9196789..1d1a916 100644
 --- a/src/vconsole/vconsole-setup.c
 +++ b/src/vconsole/vconsole-setup.c
-@@ -358,6 +358,14 @@
+@@ -358,6 +358,17 @@
+                 if (r < 0 && r != -ENOENT)
+                         log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
          }
- 
-         if (r <= 0) {
++
++        if (r <= 0) {
 +                r = parse_env_file("/etc/sysconfig/console", NEWLINE,
 +                                   "CONSOLEFONT", &vc_font,
 +                                   "CONSOLEMAP", &vc_font_map,
@@ -174,6 +200,7 @@ index 9196789..1d1a916 100644
 +                                   NULL);
 +                if (r < 0 && r != -ENOENT)
 +                        log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
-         }
++        }
  
-         r = EXIT_FAILURE;
+         if (utf8)
+                 enable_utf8(fd);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/864041a0c9b7b7dd1f923d786f58811cc0e5d16f