From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- core/systemd/0001-Reinstate-TIMEOUT-handling.patch | 124 --------------------- ...cursively-mark-root-as-private-before-piv.patch | 31 ------ ...tl-fix-issue-with-systemctl-daemon-reexec.patch | 73 ------------ ...mpfiles-restore-previous-behavior-for-F-f.patch | 30 ----- ...dev-systemd-udev-settle.service-fix-After.patch | 26 ----- ...onsole-setup-enable-utf-8-mode-explicitly.patch | 79 ------------- core/systemd/locale.sh | 60 ---------- core/systemd/systemd-tools.install | 35 ------ 8 files changed, 458 deletions(-) delete mode 100644 core/systemd/0001-Reinstate-TIMEOUT-handling.patch delete mode 100644 core/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch delete mode 100644 core/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch delete mode 100644 core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch delete mode 100644 core/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch delete mode 100644 core/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch delete mode 100644 core/systemd/locale.sh delete mode 100644 core/systemd/systemd-tools.install (limited to 'core/systemd') diff --git a/core/systemd/0001-Reinstate-TIMEOUT-handling.patch b/core/systemd/0001-Reinstate-TIMEOUT-handling.patch deleted file mode 100644 index 766dcb87f..000000000 --- a/core/systemd/0001-Reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Fri, 25 May 2012 19:43:24 -0400 -Subject: [PATCH] Reinstate TIMEOUT= handling - -This is mostly to deal with ipw2?00 drivers which have yet to be fixed -in the kernel. ---- - src/libudev/libudev-device.c | 19 +++++++++++++++++++ - src/libudev/libudev-private.h | 1 + - src/udev/udevd.c | 13 ++++++++++--- - 3 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c -index a8277d1..5966189 100644 ---- a/src/libudev/libudev-device.c -+++ b/src/libudev/libudev-device.c -@@ -68,6 +68,7 @@ struct udev_device { - struct udev_list tags_list; - unsigned long long int seqnum; - unsigned long long int usec_initialized; -+ int timeout; - int devlink_priority; - int refcount; - dev_t devnum; -@@ -89,6 +90,21 @@ struct udev_device { - bool db_persist; - }; - -+int udev_device_get_timeout(struct udev_device *udev_device) -+{ -+ return udev_device->timeout; -+} -+ -+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) -+{ -+ char num[32]; -+ -+ udev_device->timeout = timeout; -+ snprintf(num, sizeof(num), "%u", timeout); -+ udev_device_add_property(udev_device, "TIMEOUT", num); -+ return 0; -+} -+ - /** - * udev_device_get_seqnum: - * @udev_device: udev device -@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, - - util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); - udev_device_set_syspath(udev_device, path); -+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { -+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); - } else if (startswith(property, "SUBSYSTEM=")) { - udev_device_set_subsystem(udev_device, &property[10]); - } else if (startswith(property, "DEVTYPE=")) { -@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) - udev_list_init(udev, &udev_device->sysattr_value_list, true); - udev_list_init(udev, &udev_device->sysattr_list, false); - udev_list_init(udev, &udev_device->tags_list, true); -+ udev_device->timeout = -1; - udev_device->watch_handle = -1; - /* copy global properties */ - udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) -diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h -index 4eb4a59..99aefeb 100644 ---- a/src/libudev/libudev-private.h -+++ b/src/libudev/libudev-private.h -@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); - void udev_device_set_is_initialized(struct udev_device *udev_device); - int udev_device_add_tag(struct udev_device *udev_device, const char *tag); - void udev_device_cleanup_tags_list(struct udev_device *udev_device); -+int udev_device_get_timeout(struct udev_device *udev_device); - unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); - void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); - int udev_device_get_devlink_priority(struct udev_device *udev_device); -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 0d85960..cd24462 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -384,7 +384,7 @@ out: - } - } - --static void event_run(struct event *event) -+static void event_run(struct event *event, bool force) - { - struct udev_list_node *loop; - -@@ -410,7 +410,7 @@ static void event_run(struct event *event) - return; - } - -- if (children >= children_max) { -+ if (!force && children >= children_max) { - if (children_max > 1) - log_debug("maximum number (%i) of children reached\n", children); - return; -@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) - - event->state = EVENT_QUEUED; - udev_list_node_append(&event->node, &event_list); -+ -+ /* run all events with a timeout set immediately */ -+ if (udev_device_get_timeout(dev) > 0) { -+ event_run(event, true); -+ return 0; -+ } -+ - return 0; - } - -@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) - if (is_devpath_busy(event)) - continue; - -- event_run(event); -+ event_run(event, false); - } - } - --- -1.7.10.2 - diff --git a/core/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/core/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch deleted file mode 100644 index 5c6085c95..000000000 --- a/core/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Fri, 10 Aug 2012 11:02:03 -0400 -Subject: [PATCH] shutdown: recursively mark root as private before pivot - -Because root is now recursively marked as shared on bootup, we need to -recursively mark root as private. This prevents a pivot_root failure on -shutdown: - - Cannot finalize remaining file systems and devices, giving up. - pivot failed: Invalid argument ---- - src/core/shutdown.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/shutdown.c b/src/core/shutdown.c -index 105a604..0b7cbd8 100644 ---- a/src/core/shutdown.c -+++ b/src/core/shutdown.c -@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) { - It works for pivot_root, but the ref count for the root device - is not decreasing :-/ - */ -- if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) { -+ if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) { - log_error("Failed to make \"/\" private mount %m"); - return -errno; - } --- -1.7.11.4 - diff --git a/core/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch b/core/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch deleted file mode 100644 index 3aec94edc..000000000 --- a/core/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001 -From: Simon Peeters -Date: Fri, 10 Aug 2012 17:32:19 +0200 -Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec - ---- - src/shared/dbus-common.c | 3 ++- - src/systemctl/systemctl.c | 11 ++++++++--- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c -index 7f0dce5..da2dc2e 100644 ---- a/src/shared/dbus-common.c -+++ b/src/shared/dbus-common.c -@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus, - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - dbus_message_unref(m); - if (!reply) { -- log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ if (!return_error) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); - if (bus_error_is_no_service(&error)) - r = -ENOENT; - else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 2e0aaaa..13e0f91 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -1537,11 +1537,12 @@ static int start_unit_one( - DBUS_TYPE_INVALID); - free(n); - if (r) { -- if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) { -+ if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) - /* There's always a fallback possible for - * legacy actions. */ - r = -EADDRNOTAVAIL; -- } -+ else -+ log_error("Failed to issue method call: %s", bus_error_message(error)); - goto finish; - } - -@@ -3143,6 +3144,7 @@ finish: - static int daemon_reload(DBusConnection *bus, char **args) { - int r; - const char *method; -+ DBusError error; - - if (arg_action == ACTION_RELOAD) - method = "Reload"; -@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) { - "org.freedesktop.systemd1.Manager", - method, - NULL, -- NULL, -+ &error, - DBUS_TYPE_INVALID); - - if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL) -@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) { - /* On reexecution, we expect a disconnect, not - * a reply */ - r = 0; -+ else if (r) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ dbus_error_free(&error); - - return r; - } --- -1.7.11.4 - diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch deleted file mode 100644 index 9be6ef28f..000000000 --- a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Thu, 27 Sep 2012 20:48:13 -0400 -Subject: [PATCH] tmpfiles: restore previous behavior for F/f - -d4e9eb91ea changed the behavior for the F and f actions, wrongly sending -them to glob_item(). Restore the old behavior and shortcut straight to -write_one_file(). ---- - src/tmpfiles/tmpfiles.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index f10f908..bf900fa 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -673,6 +673,10 @@ static int create_item(Item *i) { - - case CREATE_FILE: - case TRUNCATE_FILE: -+ r = write_one_file(i, i->path); -+ if (r < 0) -+ return r; -+ break; - case WRITE_FILE: - r = glob_item(i, write_one_file); - if (r < 0) --- -1.7.12.1 - diff --git a/core/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch b/core/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch deleted file mode 100644 index 117b0df57..000000000 --- a/core/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Wed, 6 Jun 2012 14:30:16 +0200 -Subject: [PATCH] udev: systemd-udev-settle.service fix After= - -https://bugs.freedesktop.org/show_bug.cgi?id=50779 ---- - units/systemd-udev-settle.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in -index d637700..2c4c129 100644 ---- a/units/systemd-udev-settle.service.in -+++ b/units/systemd-udev-settle.service.in -@@ -21,7 +21,7 @@ Documentation=man:udev(7) - Documentation=man:systemd-udevd(8) - DefaultDependencies=no - Wants=systemd-udev.service --After=udev-trigger.service -+After=systemd-udev-trigger.service - Before=basic.target - ConditionCapability=CAP_MKNOD - --- -1.7.11 - diff --git a/core/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch b/core/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch deleted file mode 100644 index a2cdf64a7..000000000 --- a/core/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sun, 10 Jun 2012 20:37:14 +0200 -Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Rather than assuming the console is in utf-8 mode if nothing else is -specified, be a bit more robust and enable it explicitly. - -This fixes a regression compared with Arch's initscripts when not -using a framebuffer as the old VGA console would not be in utf-8 -mode by default. - -Furthermore, this would allow vconsole-setup to be used after boot -to change the vconsole into utf-8 mode in case it has been set to -non-utf-8 mode for whatever reason. I.e, the following would leave -the console in utf-8 mode as expected: - - # export LANG=en_US.ISO-8859-1 - # /usr/lib/systemd/systemd-vconsole-setup - # export LANG=en_US.UTF-8 - # /usr/lib/systemd/systemd-vconsole-setup - -Reported-by: Xyne -Reported-by: Thomas Bächler -Cc: Dave Reisner ---- - src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index d04fab4..aa5fa18 100644 ---- a/src/vconsole/vconsole-setup.c -+++ b/src/vconsole/vconsole-setup.c -@@ -80,6 +80,25 @@ static int disable_utf8(int fd) { - return r; - } - -+static int enable_utf8(int fd) { -+ int r = 0, k; -+ -+ if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) -+ r = -errno; -+ -+ if (loop_write(fd, "\033%G", 3, false) < 0) -+ r = -errno; -+ -+ k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); -+ if (k < 0) -+ r = k; -+ -+ if (r < 0) -+ log_warning("Failed to enable UTF-8: %s", strerror(-r)); -+ -+ return r; -+} -+ - static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) { - const char *args[8]; - int i = 0; -@@ -418,9 +437,12 @@ int main(int argc, char **argv) { - - r = EXIT_FAILURE; - -- if (!utf8) -+ if (utf8) -+ enable_utf8(fd); -+ else - disable_utf8(fd); - -+ - if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && - load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) - r = EXIT_SUCCESS; --- -1.7.11 - diff --git a/core/systemd/locale.sh b/core/systemd/locale.sh deleted file mode 100644 index a4c413eed..000000000 --- a/core/systemd/locale.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -if [ ! -r /etc/locale.conf ]; then - return -fi - -. /etc/locale.conf - -if [ "${LANG+x}" = 'x' ]; then - export LANG -fi - -if [ "${LC_CTYPE+x}" = 'x' ]; then - export LC_CTYPE -fi - -if [ "${LC_NUMERIC+x}" = 'x' ]; then - export LC_NUMERIC -fi - -if [ "${LC_TIME+x}" = 'x' ]; then - export LC_TIME -fi - -if [ "${LC_COLLATE+x}" = 'x' ]; then - export LC_COLLATE -fi - -if [ "${LC_MONETARY+x}" = 'x' ]; then - export LC_MONETARY -fi - -if [ "${LC_MESSAGES+x}" = 'x' ]; then - export LC_MESSAGES -fi - -if [ "${LC_PAPER+x}" = 'x' ]; then - export LC_PAPER -fi - -if [ "${LC_NAME+x}" = 'x' ]; then - export LC_NAME -fi - -if [ "${LC_ADDRESS+x}" = 'x' ]; then - export LC_ADDRESS -fi - -if [ "${LC_TELEPHONE+x}" = 'x' ]; then - export LC_TELEPHONE -fi - -if [ "${LC_MEASUREMENT+x}" = 'x' ]; then - export LC_MEASUREMENT -fi - -if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then - export LC_IDENTIFICATION -fi - diff --git a/core/systemd/systemd-tools.install b/core/systemd/systemd-tools.install deleted file mode 100644 index 7d0bd8790..000000000 --- a/core/systemd/systemd-tools.install +++ /dev/null @@ -1,35 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_install() { - systemd-machine-id-setup -} - -post_upgrade() { - systemd-machine-id-setup - - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo " 'scanner' and 'video' groups. Beware of any changes." - echo " * We no longer create symlinks from /dev/ to /dev/0." - echo " * For security reasons, we no longer add devices to the 'storage' group. Use" - echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo " this functionality back." - echo " * We no longer create the static nodes on install needed for an initrd-less" - echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" - echo " installs." - fi - if [ "$(vercmp $2 175)" -lt 0 ]; then - echo " * devtmpfs support is now a hard requirement. Users of the official Arch" - echo " kernels have this enabled." - fi - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo " * udev-compat has been removed, and should be uninstalled." - echo " * Framebuffers are no longer blacklisted by default." - echo " * binaries moved from /sbin to /usr/bin" - fi - if [ "$(vercmp $2 181-3)" -lt 0 ]; then - echo " * if your kernel does not provide /dev/loop-control, you need to manually" - echo " load the 'loop' module before using losetup" - fi -} -- cgit v1.2.3-54-g00ecf