I have made the following changes intended for : CE:MW:Shared / dsme Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7738 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 7738: Messages from BOSS: State: review at 2013-01-25T12:57:50 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:MW:Shared / dsme -> CE:MW:Shared / dsme changes files: -------------- --- dsme.changes +++ dsme.changes @@ -0,0 +1,3 @@ +* Fri Jan 25 2013 Pekka Lundstrom <[email protected]> - 0.62.8 +- Enabled runlevels Fixes NEMO#608 : dsme should support ACTDEAD runlevel + old: ---- dsme-0.62.7.tar.gz new: ---- dsme-0.62.8.tar.gz spec files: ----------- --- dsme.spec +++ dsme.spec @@ -9,7 +9,7 @@ # << macros Summary: Device State Management Entity -Version: 0.62.7 +Version: 0.62.8 Release: 0 Group: System/System Control License: LGPLv2+ @@ -30,7 +30,6 @@ BuildRequires: pkgconfig(systemd) BuildRequires: python BuildRequires: libcreds2-devel -BuildRequires: libdsme-devel %description Device State Management Entity (with debug symbols). This package contains the Device State Management Entity which provides state management features such as service monitoring, process watchdog and inactivity tracking. other changes: -------------- ++++++ dsme-0.62.7.tar.gz -> dsme-0.62.8.tar.gz --- configure.ac +++ configure.ac @@ -1,5 +1,5 @@ # Package name and version -AC_INIT(dsme, 0.62.7) +AC_INIT(dsme, 0.62.8) AM_INIT_AUTOMAKE --- modules/runlevel.h +++ modules/runlevel.h @@ -29,11 +29,11 @@ typedef enum { DSME_RUNLEVEL_SHUTDOWN = 0, - DSME_RUNLEVEL_LOCAL = 0, /* MeeGo -> map to 'halt' */ - DSME_RUNLEVEL_ACTDEAD = 0, /* MeeGo -> map to 'halt' */ - DSME_RUNLEVEL_MALF = 0, /* MeeGo -> map to 'halt' */ - DSME_RUNLEVEL_TEST = 3, /* MeeGo -> map to 'multiuser' */ - DSME_RUNLEVEL_USER = 5, /* MeeGo -> map to 'X11' */ + DSME_RUNLEVEL_MALF = 2, /* Not used, multiuser.target */ + DSME_RUNLEVEL_LOCAL = 3, /* Not used, multiuser.target */ + DSME_RUNLEVEL_TEST = 3, /* Not used, multiuser.target */ + DSME_RUNLEVEL_ACTDEAD = 4, /* actdead.target */ + DSME_RUNLEVEL_USER = 5, /* graphical.target */ DSME_RUNLEVEL_REBOOT = 6, } dsme_runlevel_t; ++++++ dsme.service --- dsme.service +++ dsme.service @@ -4,9 +4,14 @@ [Service] Type=notify +# When starting dsme gets initial runlevel from the bootstate file +# If it doesn't exist, we default to USER +# This works because EnvironmentFile overrides Environment Environment=BOOTSTATE=USER +EnvironmentFile=-/run/systemd/boot-status/bootstate ExecStart=/usr/sbin/dsme -p /usr/lib/dsme/libstartup.so --systemd -Restart=always +# No restart, we want WD to bite +Restart=no [Install] WantedBy=multi-user.target ++++++ dsme.yaml --- dsme.yaml +++ dsme.yaml @@ -1,6 +1,6 @@ Name: dsme Summary: Device State Management Entity -Version: 0.62.7 +Version: 0.62.8 Release: 0 Group: System/System Control License: LGPLv2+ @@ -35,7 +35,6 @@ PkgBR: - python - libcreds2-devel - - libdsme-devel UseAsNeeded: no
