mirror of https://github.com/fairyglade/ly.git
added .xsession/display-setup support
This commit is contained in:
parent
24ab6ed55f
commit
53d147c4e2
1
makefile
1
makefile
|
@ -5,6 +5,7 @@ build/ly :
|
||||||
install : build/ly
|
install : build/ly
|
||||||
install -d ${DESTDIR}/etc/ly
|
install -d ${DESTDIR}/etc/ly
|
||||||
install -D build/ly -t ${DESTDIR}/usr/bin
|
install -D build/ly -t ${DESTDIR}/usr/bin
|
||||||
|
install -D xsetup.sh -t ${DESTDIR}/etc/ly
|
||||||
install -D ly.service -t ${DESTDIR}/usr/lib/systemd/system
|
install -D ly.service -t ${DESTDIR}/usr/lib/systemd/system
|
||||||
ln -sf /usr/lib/security/pam_loginuid.so ${DESTDIR}/usr/lib/pam_loginuid.so
|
ln -sf /usr/lib/security/pam_loginuid.so ${DESTDIR}/usr/lib/pam_loginuid.so
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#define LY_CMD_HALT "/sbin/shutdown"
|
#define LY_CMD_HALT "/sbin/shutdown"
|
||||||
#define LY_CMD_XINITRC "~/.xinitrc"
|
#define LY_CMD_XINITRC "~/.xinitrc"
|
||||||
#define LY_CMD_MCOOKIE "/usr/bin/mcookie"
|
#define LY_CMD_MCOOKIE "/usr/bin/mcookie"
|
||||||
|
#define LY_CMD_XSETUP "/etc/ly/xsetup.sh"
|
||||||
#define LY_XAUTHORITY ".lyxauth"
|
#define LY_XAUTHORITY ".lyxauth"
|
||||||
|
|
||||||
/* paths */
|
/* paths */
|
||||||
|
|
|
@ -483,7 +483,9 @@ int xinitrc)
|
||||||
waitpid(child, &status, 0);
|
waitpid(child, &status, 0);
|
||||||
reset_terminal(pwd);
|
reset_terminal(pwd);
|
||||||
snprintf(cmd, sizeof(cmd),
|
snprintf(cmd, sizeof(cmd),
|
||||||
"exec xinit %s%s -- %s %s %s -auth %s", xinitrc ? "" : "/usr/bin/",
|
"exec xinit %s %s%s -- %s %s %s -auth %s",
|
||||||
|
LY_CMD_XSETUP,
|
||||||
|
xinitrc ? "" : "/usr/bin/",
|
||||||
de_command, LY_CMD_X,
|
de_command, LY_CMD_X,
|
||||||
display_name, vt, getenv("XAUTHORITY"));
|
display_name, vt, getenv("XAUTHORITY"));
|
||||||
execve(pwd->pw_shell, argv, environ);
|
execve(pwd->pw_shell, argv, environ);
|
||||||
|
|
|
@ -10,7 +10,8 @@ struct pam_response** resp, void* appdata_ptr);
|
||||||
int start_env(const char* username, const char* password,
|
int start_env(const char* username, const char* password,
|
||||||
const char* de_command, enum deserv_t display_server);
|
const char* de_command, enum deserv_t display_server);
|
||||||
void launch_xorg(struct passwd* pwd, pam_handle_t* pam_handle,
|
void launch_xorg(struct passwd* pwd, pam_handle_t* pam_handle,
|
||||||
const char* de_command, const char* display_name, const char* vt, int xinitrc);
|
const char* de_command, const char* display_name, const char* vt,
|
||||||
|
int xinitrc);
|
||||||
void launch_wayland(struct passwd* pwd, pam_handle_t* pam_handle,
|
void launch_wayland(struct passwd* pwd, pam_handle_t* pam_handle,
|
||||||
const char* de_command);
|
const char* de_command);
|
||||||
void launch_shell(struct passwd* pwd, pam_handle_t* pam_handle);
|
void launch_shell(struct passwd* pwd, pam_handle_t* pam_handle);
|
||||||
|
|
Loading…
Reference in New Issue