[oe] [meta-oe][PATCH 09/12] systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

[Martin Jansa]

On Mon, Aug 06, 2012 at 06:13:46PM +0200, Martin Jansa wrote:
> On Mon, Aug 06, 2012 at 04:33:06PM +0200, Martin Jansa wrote:
> > On Mon, Aug 06, 2012 at 04:25:58PM +0200, Koen Kooi wrote:
> > > -----BEGIN PGP SIGNED MESSAGE-----
> > > Hash: SHA1
> > > 
> > > Op 06-08-12 15:37, Martin Jansa schreef:
> > > > * variable allows to add items in .bbappend without overwritting whole 
> > > > postinst * hwclock.service should be used to blacklist SYSV hwclock.sh
> > > > (not hwclock.sh.service) * show only newly disabled SYSV scripts
> > > > 
> > > > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com> --- 
> > > > .../recipes-core/systemd/systemd-compat-units.bb   |   19
> > > > ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
> > > > 
> > > > diff --git a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
> > > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb index
> > > > c9a6b67..2973208 100644 ---
> > > > a/meta-systemd/recipes-core/systemd/systemd-compat-units.bb +++
> > > > b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7
> > > > @@ DESCRIPTION = "Units to make systemd work better with existing
> > > > sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM =
> > > > "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> > > > 
> > > > -PR = "r15" +PR = "r16"
> > > > 
> > > > inherit allarch
> > > > 
> > > > @@ -26,15 +26,24 @@ do_install() { chmod 0755 ${D}${bindir}/runlevel }
> > > > 
> > > > +SYSTEMD_DISABLED_SYSV_SERVICES = " \ +  busybox-udhcpc \ +  dnsmasq \ +
> > > > hwclock \ +  networking \ +  syslog \ +  syslog.busybox \ +" + 
> > > > pkg_postinst_${PN} () { cd $D${sysconfdir}/init.d
> > > > 
> > > > echo -n "Disabling the following sysv scripts: "
> > > > 
> > > > -for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog
> > > > syslog.busybox ; do -	if [ -e $i ] ; then -		echo -n "$i " ; ln -s
> > > > /dev/null $D${systemd_unitdir}/system/$i.service -	fi +for i in
> > > > ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do +    if [ \( -e $i -o $i.sh \) -a
> > > > ! -e $D${base_libdir}/systemd/system/$i.service ] ; then +        echo -n
> > > > "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service +
> > > > fi done ; echo }
> > > 
> > > Doing something like this should work a bit better:
> > > 
> > > for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
> > > 	systemctl mask $i
> > > done
> > 
> > Thanks for info.
> > 
> > It needs .service suffis so
> > systemctl mask $i.service
> > 
> > and I'll send v2 after testing if this works also in do_rootfs time.
> 
> Doesn't seem to work in do_rootfs
> http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=0a30b3b26081ab6f543d280874c2ecff43cbe0fa
> http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=7b690a71c50e07a685fb31ef4a5295fdb5c2f853
> but no error in log.do_rootfs
> 
> Configuring systemd-speed-hacks.
> Configuring systemd-compat-units.
> Configuring udev-extraconf.
> 
> (even the line "Disabling the following sysv scripts:" is missing,
> weird)

Oh it was a lot above Configuring lines..

Disabling the following sysv scripts: Started
/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/systemctl mask
busybox-udhcpc.service
'mask' is an unkown option; exiting with error
Started /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/systemctl
mask dnsmasq.service
'mask' is an unkown option; exiting with error

So it needs to extend 
meta-openembedded/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
to support mask operation first.. which would mean to move this "ln -s"
logic there, which would be better in follow-up patch IMHO.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20120806/de3bb1e4/attachment-0002.sig>