helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-27 15:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd-compat-units: move list of disabled services to variable, fix hwclock.sh and output

Browse Source 
* 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@gmail.com>
This commit is contained in:
Martin Jansa 2012-08-06 14:45:37 +02:00 committed by Koen Kooi
parent bf986b802f
commit fc4cadbbb5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-systemd/recipes-core/systemd/systemd-compat-units.bb
View File

@ -3,7 +3,7 @@ DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PR = "r15" PR = "r16"
inherit allarch inherit allarch
@ -26,15 +26,24 @@ do_install() {
chmod 0755 ${D}${bindir}/runlevel chmod 0755 ${D}${bindir}/runlevel
} }
SYSTEMD_DISABLED_SYSV_SERVICES = " \
busybox-udhcpc \
dnsmasq \
hwclock \
networking \
syslog \
syslog.busybox \
"
pkg_postinst_${PN} () { pkg_postinst_${PN} () {
cd $D${sysconfdir}/init.d cd $D${sysconfdir}/init.d
echo -n "Disabling the following sysv scripts: " echo -n "Disabling the following sysv scripts: "
for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog syslog.busybox ; do for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
if [ -e $i ] ; then if [ \( -e $i -o $i.sh \) -a ! -e $D${base_libdir}/systemd/system/$i.service ] ; then
echo -n "$i " ; ln -s /dev/null $D${systemd_unitdir}/system/$i.service echo -n "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service
fi fi
done ; echo done ; echo
} }