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

[Koen Kooi]

-----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

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQH9P2MkyGM64RGpERAlt0AKC5RPAcFlS5DKhIBjnGptlWCuuN9gCfVZ/Y
jcUARKDAfbMatCrQx2ELcAw=
=qvM6
-----END PGP SIGNATURE-----