diff options
author | Raymond Danks <raymond@edanks.com> | 2006-05-31 22:43:08 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-31 22:43:08 +0000 |
commit | 835efdc055406dbefea949ee55da54db7065cc86 (patch) | |
tree | cb4554a8bc319cab4f6af5c16ba204cad627e6d0 /packages/pdm/pdm-1.0 | |
parent | c6a8090e64b1486ad0e62d89e9409c681de4bdaa (diff) |
pdm - pdm.conf file and a few sessions.
Diffstat (limited to 'packages/pdm/pdm-1.0')
-rw-r--r-- | packages/pdm/pdm-1.0/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/pdm/pdm-1.0/mythtv | 22 | ||||
-rw-r--r-- | packages/pdm/pdm-1.0/pdm-1.0-changes.patch | 209 | ||||
-rw-r--r-- | packages/pdm/pdm-1.0/pdm.conf | 10 | ||||
-rw-r--r-- | packages/pdm/pdm-1.0/setuid.patch | 42 | ||||
-rw-r--r-- | packages/pdm/pdm-1.0/xfce | 24 |
6 files changed, 307 insertions, 0 deletions
diff --git a/packages/pdm/pdm-1.0/.mtn2git_empty b/packages/pdm/pdm-1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pdm/pdm-1.0/.mtn2git_empty diff --git a/packages/pdm/pdm-1.0/mythtv b/packages/pdm/pdm-1.0/mythtv new file mode 100644 index 0000000000..9a9e4f09cb --- /dev/null +++ b/packages/pdm/pdm-1.0/mythtv @@ -0,0 +1,22 @@ +#!/bin/sh + +# Set some variables of some consequence + +export DISPLAY=:0 + +# Because we're not actually logging in, we do this +# FIXME: PDM should do this instead + +export HOME=/root + +# Allow all comers +#/usr/bin/xhost + + +# Start the screen saver +#xscreensaver -no-splash & + +# Start MythTV +#This assumes that mythbackend is running already and +#mythtv-setup +#has been run already +mythfrontend diff --git a/packages/pdm/pdm-1.0/pdm-1.0-changes.patch b/packages/pdm/pdm-1.0/pdm-1.0-changes.patch new file mode 100644 index 0000000000..cb0b72d682 --- /dev/null +++ b/packages/pdm/pdm-1.0/pdm-1.0-changes.patch @@ -0,0 +1,209 @@ +diff -urN pdm-1.0/conf/pdm.conf.example pdm-1.0.new/conf/pdm.conf.example +--- pdm-1.0/conf/pdm.conf.example 2003-12-08 18:23:41.000000000 -0700 ++++ pdm-1.0.new/conf/pdm.conf.example 2004-09-01 13:11:14.519527656 -0700 +@@ -23,3 +23,6 @@ + # for a session + + Session=pixil ++ ++# When the session is completed, then respawn and start again ++SessionPost=respawn +diff -urN pdm-1.0/conf/pdm.conf.x11 pdm-1.0.new/conf/pdm.conf.x11 +--- pdm-1.0/conf/pdm.conf.x11 2003-12-09 10:23:01.000000000 -0700 ++++ pdm-1.0.new/conf/pdm.conf.x11 2004-09-01 13:11:14.520527504 -0700 +@@ -19,3 +19,6 @@ + # for a session + + Session=matchbox ++SessionPost=respawn ++#SessionPost=reboot ++#SessionPost=shutdown +diff -urN pdm-1.0/config.c pdm-1.0.new/config.c +--- pdm-1.0/config.c 2003-12-16 12:23:27.000000000 -0700 ++++ pdm-1.0.new/config.c 2004-09-01 13:11:14.520527504 -0700 +@@ -234,6 +234,23 @@ + return 0; + } + ++static int post_callback(int line, char *key, char *value, dminfo_t *info) { ++ ++ if (info->flags & FLAG_AUTH) { ++ fprintf(stderr, ++ "%d: Post session behavior is ignored when auth is turned on.\n", line); ++ return 0; ++ } ++ ++ if (!value) return -1; ++ ++ if (!strcmpi(value, "reboot")) info->postsession = POST_REBOOT; ++ else if (!strcmpi(value, "respawn")) info->postsession = POST_RESPAWN; ++ else if (!strcmpi(value, "shutdown")) info->postsession = POST_SHUTDOWN; ++ ++ return 0; ++} ++ + /* calibrate_callback() + Callback for the 'TSCalibrate' keyword + */ +@@ -271,20 +288,21 @@ + "NULL" terminated list here to save a bit of room. + */ + +-#define KEYWORD_COUNT 6 +- + struct { + char *keyword; + int (*callback)(int, char *, char *, dminfo_t *); +-} keywords[KEYWORD_COUNT] = { ++} keywords[] = { + { "Server", server_callback }, + { "Auth", auth_callback }, + { "User", user_callback }, + { "Session", session_callback }, ++ { "SessionPost", post_callback }, + { "TSCalibrate", calibrate_callback }, +- { "TSCalBinary", calbin_callback }, ++ { "TSCalBinary", calbin_callback } + }; + ++#define KEYWORD_COUNT (sizeof(keywords)/sizeof(keywords[0])) ++ + /* do_config() + Given a filename, process it and fill out the dminfo_t structure + */ +diff -urN pdm-1.0/main.c pdm-1.0.new/main.c +--- pdm-1.0/main.c 2003-12-09 11:43:22.000000000 -0700 ++++ pdm-1.0.new/main.c 2004-09-01 13:11:14.520527504 -0700 +@@ -29,6 +29,8 @@ + handles authinication through a plugin system. + */ + ++#define _GNU_SOURCE ++ + #include <stdarg.h> + #include <stdio.h> + #include <stdlib.h> +@@ -60,6 +62,29 @@ + + static dminfo_t dminfo; + ++static void exec_external(const char *str) { ++ int argc = 0; ++ char **argv = 0; ++ char *ptr = (char *) str; ++ ++ while(ptr) { ++ char *next = strchr(ptr, ' '); ++ argv = (char **) realloc(argv, (argc + 2) * sizeof (char *)); ++ argv[argc] = ptr; ++ if (next) { ++ *next = 0; ++ ptr = next + 1; ++ } ++ else ptr = 0; ++ argc++; ++ } ++ ++ argv[argc] = 0; ++ ++ /* We're not supposed to come back */ ++ execvp(argv[0], argv); ++} ++ + /* spawn_app() + Spawn the given application. A simple fork() / execvp() is all that + is needed here */ +@@ -80,10 +105,10 @@ + + /* spawn_session() + Spawns a new session based on the given name under the authority +- of the given UID. ++ of the given UID/GID. + */ + +-static pid_t spawn_session(char *app, uid_t uid) { ++static pid_t spawn_session(char *app, uid_t uid, gid_t gid) { + + char *argv[2] = { 0, 0 }; + pid_t pid = 0; +@@ -103,10 +128,13 @@ + /* If a different UID was specified, then try to change to that UID */ + + if (uid != getuid()) { +- if (seteuid(uid) == -1) { ++ if (setresuid(uid, uid, uid) == -1) { + fprintf(stderr, "Error: Unable to set the UID of the process.\n"); + exit(-1); + } ++ if (setresgid(gid,gid,gid) == -1) { ++ fprintf(stderr, "Error: Unable to set the GID of the process.\n"); ++ } + } + + argv[0] = app; +@@ -319,7 +347,10 @@ + + /* Start the session */ + VERBOSE("Spawning session '%s'\n", session); +- session_pid = spawn_session(session, curuser ? curuser->pw_uid : getuid()); ++ ++ session_pid = spawn_session(session, ++ curuser ? curuser->pw_uid : getuid(), ++ curuser ? curuser->pw_gid : getgid()); + + if (session_pid == -1) { + fprintf(stderr, "Fatal: Unable to spawn the session '%s'.\n", session); +@@ -345,6 +376,27 @@ + } + + session_pid = 0; ++ ++ if (dminfo.flags & FLAG_AUTH) ++ continue; ++ ++ /* Check to see what to do after a session dies */ ++ /* This is only if auth isn't enabled */ ++ ++ /* On respawn (default), just come back around */ ++ if (dminfo.postsession == POST_RESPAWN) ++ continue; ++ ++ /* Kill off the server */ ++ if (server_pid > 0) kill_child(server_pid); ++ ++ /* Decide which external function to turn into */ ++ if (dminfo.postsession == POST_REBOOT) ++ exec_external(PDM_REBOOT_COMMAND); ++ else ++ exec_external(PDM_HALT_COMMAND); ++ ++ return 0; + } + + gendm_done: +diff -urN pdm-1.0/pdm.h pdm-1.0.new/pdm.h +--- pdm-1.0/pdm.h 2003-12-08 12:28:50.000000000 -0700 ++++ pdm-1.0.new/pdm.h 2004-09-01 13:11:14.521527352 -0700 +@@ -34,6 +34,13 @@ + #define FLAG_AUTH 0x01 + #define FLAG_CAL 0x02 + ++#define POST_RESPAWN 0x00 ++#define POST_REBOOT 0x01 ++#define POST_SHUTDOWN 0x02 ++ ++#define PDM_HALT_COMMAND "/sbin/halt" ++#define PDM_REBOOT_COMMAND "/sbin/reboot" ++ + typedef struct { + char *server; /* The GUI server to start */ + int argc; +@@ -47,6 +54,8 @@ + struct passwd *user; /* The static user data is stored here */ + char *session; /* The static session to use is stored here */ + ++ int postsession; /* What do do with the session when we are done */ ++ + struct { + char *bin; /* Calibration binary */ + int argc; diff --git a/packages/pdm/pdm-1.0/pdm.conf b/packages/pdm/pdm-1.0/pdm.conf new file mode 100644 index 0000000000..aeece8933c --- /dev/null +++ b/packages/pdm/pdm-1.0/pdm.conf @@ -0,0 +1,10 @@ +# Configuration file for the PDM + +#Server=Xvesa -nolisten inet6 -s 0 -br -noreset -mode 0x118 +Server=/usr/bin/X -noreset + +Auth=none +User=root + +Session=mythtv +#SessionPost=shutdown diff --git a/packages/pdm/pdm-1.0/setuid.patch b/packages/pdm/pdm-1.0/setuid.patch new file mode 100644 index 0000000000..17dbc00279 --- /dev/null +++ b/packages/pdm/pdm-1.0/setuid.patch @@ -0,0 +1,42 @@ +--- pdm-1.0/main.c 2003-12-09 11:43:22.000000000 -0700 ++++ pdm-1.0.new/main.c 2004-05-25 09:01:53.897999256 -0700 +@@ -80,10 +80,10 @@ + + /* spawn_session() + Spawns a new session based on the given name under the authority +- of the given UID. ++ of the given UID/GID. + */ + +-static pid_t spawn_session(char *app, uid_t uid) { ++static pid_t spawn_session(char *app, uid_t uid, gid_t gid) { + + char *argv[2] = { 0, 0 }; + pid_t pid = 0; +@@ -103,10 +103,13 @@ + /* If a different UID was specified, then try to change to that UID */ + + if (uid != getuid()) { +- if (seteuid(uid) == -1) { ++ if (setresuid(uid, uid, uid) == -1) { + fprintf(stderr, "Error: Unable to set the UID of the process.\n"); + exit(-1); + } ++ if (setresgid(gid,gid,gid) == -1) { ++ fprintf(stderr, "Error: Unable to set the GID of the process.\n"); ++ } + } + + argv[0] = app; +@@ -319,7 +322,10 @@ + + /* Start the session */ + VERBOSE("Spawning session '%s'\n", session); +- session_pid = spawn_session(session, curuser ? curuser->pw_uid : getuid()); ++ ++ session_pid = spawn_session(session, ++ curuser ? curuser->pw_uid : getuid(), ++ curuser ? curuser->pw_gid : getgid()); + + if (session_pid == -1) { + fprintf(stderr, "Fatal: Unable to spawn the session '%s'.\n", session); diff --git a/packages/pdm/pdm-1.0/xfce b/packages/pdm/pdm-1.0/xfce new file mode 100644 index 0000000000..ba2582ff54 --- /dev/null +++ b/packages/pdm/pdm-1.0/xfce @@ -0,0 +1,24 @@ +#!/bin/sh + +# Set some variables of some consequence + +export PATH=$PATH:/usr/X11R6/bin:/usr/lib/ICAClient/ +export DISPLAY=:0 + +# Because we're not actually logging in, we do this +# FIXME: PDM should do this instead + +export HOME=/user + +# Allow all comers +/usr/X11R6/bin/xhost + + +# Start the screen saver +xscreensaver -no-splash & + +# Start the rest of the XFCE world +xfce-mcs-manager +xfwm4 --daemon +xftaskbar4 & +xfdesktop & +exec xfce4-panel |