helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-28 19:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdm: fix postinst-code to unbreak first boot issues

Browse Source 
Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
causes postinst not to finish at first boot (gdm.service is not aliased to
display-manager.service -> started much too early) and is not neccesary:
language preparation can be done offline.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller 2013-04-27 18:33:57 +00:00 committed by Martin Jansa
parent 69f466b5a2
commit ded05523d2
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
View File

@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
PR = "r15" PR = "r16"
inherit gnome update-rc.d systemd inherit gnome update-rc.d systemd useradd
SRC_URI += " \ SRC_URI += " \
file://cross-xdetection.diff \ file://cross-xdetection.diff \
@ -33,8 +33,8 @@ do_configure_prepend() {
} }
do_install_prepend() { do_install_prepend() {
mkdir -p ${D}/var/lib/gdm/.gconf.mandatory install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory
cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/
} }
do_install_append() { do_install_append() {
@ -54,6 +54,9 @@ do_install_append() {
sed -e 's,%sbindir%,${sbindir},g' \ sed -e 's,%sbindir%,${sbindir},g' \
< ${WORKDIR}/gdm.service.in \ < ${WORKDIR}/gdm.service.in \
> ${D}${systemd_unitdir}/system/gdm.service > ${D}${systemd_unitdir}/system/gdm.service
chown -R gdm:gdm ${D}${localstatedir}/lib/gdm
chmod 0750 ${D}${localstatedir}/lib/gdm
} }
FILES_${PN} += "${datadir}/icon* \ FILES_${PN} += "${datadir}/icon* \
@ -72,23 +75,13 @@ SYSTEMD_SERVICE_${PN} = "gdm.service"
INITSCRIPT_NAME = "gdm" INITSCRIPT_NAME = "gdm"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
pkg_postinst_${PN} () { pkg_postinst_${PN} () {
# can't do this offline
if [ "x$D" != "x" ]; then
exit 1
fi
grep "^gdm:" /etc/group > /dev/null || addgroup gdm
grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
if [ -d /var/lib/gdm ]; then
chown -R gdm:gdm /var/lib/gdm
chmod 0750 /var/lib/gdm
fi
# Register up as default dm # Register up as default dm
mkdir -p ${sysconfdir}/X11/ mkdir -p $D${sysconfdir}/X11/
echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
} }
pkg_postrm_${PN} () { pkg_postrm_${PN} () {