+Fixes needed before 217:
+
+* sd_session_get_desktop() yells at me?
+
+* change startup timeout to not cover the full bootup, but only sysinit part (see below)
+
+* remove Discard= in .mount units and replace it by Options=, to prepare for later swapon fix