Assorted stuff #3392

poettering · 2016-05-30T17:38:02Z

No description provided.

…ll() and make use of it everywhere

…anymore This is redundant as SysV services get DefaultDependencides=yes anyway, and thus conflict with shutdown.target anyway. Hence, let's simplify our code here.

…priate Let's make sure SYSTEMD_COLORS is honour by more tools

As suggested here: https://bugs.freedesktop.org/show_bug.cgi?id=64737#c8 This adds a new call terminal_is_dumb() and makes use of this where appropriate.

Let's better ignore an invalid message size parameter, than assume ridiculously larger sizes.

…pletion

martinpitt · 2016-05-31T07:41:55Z

The autokpgtest logs are inaccessible, I'll investigate/fix this. -- Indeed it seems there are problems with Openstack swift in our cloud, our admins are working on this.

martinpitt · 2016-05-31T11:11:56Z

Swift is back, thus the logs work again. The failure is

======================================================================
FAIL: test_tmp_mount (__main__.ServicesTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/autopkgtest.TTV0xS/build.1pH/systemd/debian/tests/boot-and-services", line 130, in test_tmp_mount
    self.assertEqual(status, 3, status_out)
AssertionError: 4 != 3 : Failed to dump process list, ignoring: Unit tmp.mount not found.
● tmp.mount
   Loaded: not-found (Reason: No such file or directory)
   Active: inactive (dead)

from this test: http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/tests/boot-and-services#n111 .

This was introduced in PR #3385 (which got merged despite a test regression), so it doesn't affect this PR.

martinpitt · 2016-05-31T11:47:11Z

@poettering : What do you think about adding a label "ignore-ci-failure" for such cases where we reviewed CI regressions and justified them to be okay/good enough to land the PR?

keszybz · 2016-06-04T22:46:12Z

src/libsystemd-network/sd-dhcp-server.c

@@ -633,7 +633,8 @@ static int parse_request(uint8_t code, uint8_t len, const void *option, void *us

                break;
        case SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE:
-                if (len == 2)
+
+                if (len == 2 && unaligned_read_be16(option) >= sizeof(DHCPPacket))
                        req->max_optlen = unaligned_read_be16(option) - sizeof(DHCPPacket);



I wonder if we shouldn't reject the packet instead. But maybe that's too harsh. Simply ignoring the invalid option sounds OK too.

poettering added 8 commits May 30, 2016 17:59

util-lib: make localed's nonempty() generic, rename it to empty_to_nu…

3c6f7c3

…ll() and make use of it everywhere

sysv-generator: don't create Conflicts= deps towards shutdown.target …

788d2b0

…anymore This is redundant as SysV services get DefaultDependencides=yes anyway, and thus conflict with shutdown.target anyway. Hence, let's simplify our code here.

tree-wide: use ansi_highlight() instead of ANSI_HIGHLIGHT where appro…

54f8c95

…priate Let's make sure SYSTEMD_COLORS is honour by more tools

tree-wide: check colors_enabled() before outputting ANSI color strings

7565bb9

pager: don't start pager if the terminal is explicitly set to TERM=dumb

ac96418

As suggested here: https://bugs.freedesktop.org/show_bug.cgi?id=64737#c8 This adds a new call terminal_is_dumb() and makes use of this where appropriate.

dhcp-server: fix integer underflow

76a9d0f

Let's better ignore an invalid message size parameter, than assume ridiculously larger sizes.

bash: use the actual journal fields used in the journal files for com…

67044a2

…pletion

update TODO

ac83514

poettering added shell completion tree-wide sysv-generator dhcp labels May 30, 2016

poettering mentioned this pull request Jun 3, 2016

sysv-generator: fix dependencies generated for services in runlevels … #3430

Closed

keszybz reviewed Jun 4, 2016
View reviewed changes

keszybz merged commit 20f8477 into systemd:master Jun 4, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Assorted stuff #3392

Assorted stuff #3392

poettering commented May 30, 2016

martinpitt commented May 31, 2016 •

edited

martinpitt commented May 31, 2016

martinpitt commented May 31, 2016

keszybz Jun 4, 2016

Assorted stuff #3392

Assorted stuff #3392

Conversation

poettering commented May 30, 2016

martinpitt commented May 31, 2016 • edited

martinpitt commented May 31, 2016

martinpitt commented May 31, 2016

keszybz Jun 4, 2016

Choose a reason for hiding this comment

martinpitt commented May 31, 2016 •

edited