cleanup + use latest diya-session-manager
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
DESCRIPTION = "Auto configuration deployment from media"
|
||||
DEPENDS = ""
|
||||
RDEPENDS:${PN} = "bash"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
|
||||
|
||||
@ -7,7 +8,9 @@ SRC_URI += "file://confd \
|
||||
file://expandfs.sh \
|
||||
file://80_diya \
|
||||
file://fs_resize \
|
||||
file://boot-to-recovery"
|
||||
file://boot-to-recovery \
|
||||
file://diya.pam \
|
||||
file://xdg-terminal-exec"
|
||||
|
||||
|
||||
inherit update-rc.d useradd
|
||||
@ -30,7 +33,10 @@ do_install() {
|
||||
install -m 0755 ${WORKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
|
||||
install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
|
||||
install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
|
||||
|
||||
install -d ${D}/etc/pam.d
|
||||
install -m 0644 ${WORKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
|
||||
install -d ${D}/usr/bin
|
||||
install -m 0755 ${WORKDIR}/xdg-terminal-exec ${D}/usr/bin
|
||||
cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
|
||||
recovery=false
|
||||
recovery_image=recovery-${MACHINE}.cpio.gz
|
||||
|
5
recipes-diya/diya-overlay/files/diya.pam
Normal file
5
recipes-diya/diya-overlay/files/diya.pam
Normal file
@ -0,0 +1,5 @@
|
||||
#%PAM-1.0
|
||||
|
||||
auth include common-auth
|
||||
account include common-account
|
||||
session include common-session
|
@ -21,4 +21,7 @@ login_session_user = xdg
|
||||
# login session is successful
|
||||
# the logged in user will own this session
|
||||
|
||||
user_session_command = diya-session-launch diyac -x diya-shell
|
||||
user_session_command = diya-session-launch diyac -x diya-shell
|
||||
|
||||
# PAM service used by the daemon for authentication
|
||||
pam_service = diya
|
Reference in New Issue
Block a user