rpms/gdm/devel gdm-2.6.0.5-wait-for-bootup.patch, 1.4, 1.5 gdm.spec, 1.60, 1.61 gdm-2.6.0.0-pie.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 29 15:07:27 UTC 2005
- Previous message (by thread): rpms/netpbm/devel netpbm-10.27-badlink.patch, NONE, 1.1 netpbm.spec, 1.32, 1.33
- Next message (by thread): rpms/device-mapper/devel device-mapper.1.01.01.tgz.asc, NONE, 1.1 .cvsignore, 1.8, 1.9 device-mapper.spec, 1.11, 1.12 sources, 1.9, 1.10 upstream, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23204
Modified Files:
gdm-2.6.0.5-wait-for-bootup.patch gdm.spec
Removed Files:
gdm-2.6.0.0-pie.patch
Log Message:
- Add a --wait-for-bootup cmdline option.
gdm-2.6.0.5-wait-for-bootup.patch:
daemon/gdm.c | 10 ++++
daemon/gdm.h | 8 +++
daemon/slave.c | 101 +++++++++++++++++++++++++++++++++++++++++---------
daemon/slave.h | 3 +
daemon/verify-pam.c | 53 +++++++++++++++++++++++---
gui/greeter/greeter.c | 9 +++-
6 files changed, 159 insertions(+), 25 deletions(-)
Index: gdm-2.6.0.5-wait-for-bootup.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.6.0.5-wait-for-bootup.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.6.0.5-wait-for-bootup.patch 28 Mar 2005 20:35:35 -0000 1.4
+++ gdm-2.6.0.5-wait-for-bootup.patch 29 Mar 2005 15:07:25 -0000 1.5
@@ -4,7 +4,7 @@
pid_t gdm_main_pid = 0; /* PID of the main daemon */
gboolean gdm_wait_for_go = FALSE; /* wait for a GO in the fifo */
-+gboolean gdm_wait_for_system_started = FALSE; /* wait for a SYSTEM_STARTED event in the fifo */
++gboolean gdm_wait_for_bootup = FALSE; /* wait for a BOOTUP_COMPLETE event in the fifo */
gboolean print_version = FALSE; /* print version number and quit */
gboolean preserve_ld_vars = FALSE; /* Preserve the ld environment variables */
@@ -12,8 +12,8 @@
&print_version, 0, N_("Print GDM version"), NULL },
{ "wait-for-go", '\0', POPT_ARG_NONE,
&gdm_wait_for_go, 0, N_("Start the first X server but then halt until we get a GO in the fifo"), NULL },
-+ { "wait-for-system-started", '\0', POPT_ARG_NONE,
-+ &gdm_wait_for_system_started, 0, N_("Don't allow the user to login until we get a SYSTEM_STARTED in the fifo"), NULL },
++ { "wait-for-bootup", '\0', POPT_ARG_NONE,
++ &gdm_wait_for_bootup, 0, N_("Don't allow the user to login until we get a BOOTUP_COMPLETE in the fifo"), NULL },
{ "monte-carlo-sqrt2", 0, POPT_ARG_NONE,
&monte_carlo_sqrt2, 0, NULL, NULL },
POPT_AUTOHELP
@@ -21,26 +21,18 @@
gdm_xdmcp_run();
}
}
-+ } else if (strcmp (msg, GDM_SOP_SYSTEM_STARTED) == 0) {
++ } else if (strcmp (msg, GDM_SOP_BOOTUP_COMPLETE) == 0) {
+ GSList *li;
-+ gdm_wait_for_system_started = FALSE;
++ gdm_wait_for_bootup = FALSE;
+ for (li = displays; li != NULL; li = li->next) {
+ GdmDisplay *d = li->data;
-+ send_slave_command (d, GDM_NOTIFY_SYSTEM_STARTED);
++ send_slave_command (d, GDM_NOTIFY_BOOTUP_COMPLETE);
+ }
} else if (strncmp (msg, GDM_SOP_WRITE_X_SERVERS " ",
strlen (GDM_SOP_WRITE_X_SERVERS " ")) == 0) {
GdmDisplay *d;
--- gdm-2.6.0.7/daemon/gdm.h.wait-for-bootup 2005-03-28 15:31:30.000000000 -0500
+++ gdm-2.6.0.7/daemon/gdm.h 2005-03-28 15:31:31.000000000 -0500
-@@ -107,6 +107,7 @@
- #define GDM_FOCUS 'F' /* Allow focus on the login window again (optional) */
- #define GDM_SAVEDIE '!' /* Save wm order and die (and set busy cursor) */
- #define GDM_QUERY_CAPSLOCK 'Q' /* Is capslock on? */
-+#define GDM_ALLOW_LOGIN 'a' /* Allow login to take place (when system is fully started) */
-
- /* Different login interruptions */
- #define GDM_INTERRUPT_TIMED_LOGIN 'T'
@@ -115,6 +116,7 @@
#define GDM_INTERRUPT_SELECT_USER 'U'
#define GDM_INTERRUPT_LOGIN_SOUND 'L'
@@ -54,8 +46,8 @@
#define GDM_SOP_GO "GO" /* no arguments */
+/* stop waiting for this and go on with login, useful with
-+ the --wait-for-system-started command line option */
-+#define GDM_SOP_SYSTEM_STARTED "SYSTEM_STARTED" /* no arguments */
++ the --wait-for-bootup command line option */
++#define GDM_SOP_BOOTUP_COMPLETE "BOOTUP_COMPLETE" /* no arguments */
+
/* sometimes we can't do a syslog so we tell the main daemon */
#define GDM_SOP_SYSLOG "SYSLOG" /* <pid> <type> <message> */
@@ -64,7 +56,7 @@
#define GDM_NOTIFY_DIRTY_SERVERS "DIRTY_SERVERS"
#define GDM_NOTIFY_SOFT_RESTART_SERVERS "SOFT_RESTART_SERVERS"
#define GDM_NOTIFY_GO "GO"
-+#define GDM_NOTIFY_SYSTEM_STARTED "SYSTEM_STARTED"
++#define GDM_NOTIFY_BOOTUP_COMPLETE "BOOTUP_COMPLETE"
#define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
/* Ack for a slave message */
@@ -97,8 +89,8 @@
/* wait for a GO in the SOP protocol */
extern gboolean gdm_wait_for_go;
-+/* wait for a SYSTEM_STARTED in the SOP protocol */
-+extern gboolean gdm_wait_for_system_started;
++/* wait for a BOOTUP_COMPLETE in the SOP protocol */
++extern gboolean gdm_wait_for_bootup;
+
/* Configuration option variables */
extern gchar *GdmUser;
@@ -151,11 +143,11 @@
+}
+
+gboolean
-+gdm_slave_wait_for_system_started (void)
++gdm_slave_wait_for_bootup (void)
+{
+ gchar *message;
+
-+ while (gdm_wait_for_system_started && !gdm_login_is_canceled) {
++ while (gdm_wait_for_bootup && !gdm_login_is_canceled) {
+
+ if (pending_greeter_message ())
+ {
@@ -167,7 +159,7 @@
+ }
+ }
+
-+ return gdm_wait_for_system_started;
++ return gdm_wait_for_bootup;
}
/* If path starts with a "trusted" directory, don't sanity check things */
@@ -175,8 +167,8 @@
}
} else if (strcmp (&s[1], GDM_NOTIFY_GO) == 0) {
gdm_wait_for_go = FALSE;
-+ } else if (strcmp (&s[1], GDM_NOTIFY_SYSTEM_STARTED) == 0) {
-+ gdm_wait_for_system_started = FALSE;
++ } else if (strcmp (&s[1], GDM_NOTIFY_BOOTUP_COMPLETE) == 0) {
++ gdm_wait_for_bootup = FALSE;
} else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
gdm_twiddle_pointer (d);
}
@@ -261,7 +253,7 @@
void gdm_slave_child_handler (int sig);
+/* This function blocks until the system is started or the user cancels login attempt */
-+gboolean gdm_slave_wait_for_system_started (void);
++gboolean gdm_slave_wait_for_bootup (void);
+
#endif /* GDM_SLAVE_H */
@@ -272,7 +264,7 @@
extern gid_t GdmGroupId;
extern gboolean no_console;
-+extern gboolean gdm_wait_for_system_started;
++extern gboolean gdm_wait_for_bootup;
+extern gboolean gdm_login_is_canceled;
/* Evil, but this way these things are passed to the child session */
@@ -284,7 +276,7 @@
- reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies].resp = strdup (ve_sure_string (s));
+
-+ if (gdm_wait_for_system_started) {
++ if (gdm_wait_for_bootup) {
+ gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, _("The system is not fully booted "
+ "yet. Login will procede when the "
+ "system is ready."));
@@ -292,14 +284,14 @@
+
+ }
+
-+ /* gdm_slave_wait_for_system_started () waits for
++ /* gdm_slave_wait_for_bootup () waits for
+ * the system to be started far enough to allow login.
+ * It returns TRUE if we are still waiting. This occurs
+ * only if the user pressed escape to cancel the login
+ * attempt.
+ * We then need to reset the login_canceled variable.
+ */
-+ if (!gdm_slave_wait_for_system_started ()) {
++ if (!gdm_slave_wait_for_bootup ()) {
+ gdm_slave_greeter_ctl_no_ret (GDM_MSG, "");
+ gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, "");
+ reply[replies].resp = strdup (ve_sure_string (s));
@@ -364,16 +356,6 @@
if ( ! ve_string_empty (selected_user)) {
pam_handle_t *tmp_pamh;
-@@ -827,7 +869,8 @@
- gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, login);
-
- goto authenticate_again;
-- }
-+ }
-+
- if (started_timer)
- gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
- if (gdm_slave_action_pending ()) {
@@ -901,6 +944,7 @@
}
@@ -382,14 +364,6 @@
pamerr = pam_acct_mgmt (pamh, null_tok);
switch (pamerr) {
case PAM_SUCCESS :
-@@ -1148,6 +1192,7 @@
- /* Start authentication session */
- did_we_ask_for_password = FALSE;
- if ((pamerr = pam_authenticate (pamh, null_tok)) != PAM_SUCCESS) {
-+
- if (gdm_slave_action_pending ()) {
- gdm_error (_("Couldn't authenticate user"));
- gdm_error_box (cur_gdm_disp,
--- gdm-2.6.0.7/gui/greeter/greeter.c.wait-for-bootup 2005-01-13 21:07:57.000000000 -0500
+++ gdm-2.6.0.7/gui/greeter/greeter.c 2005-03-28 15:31:31.000000000 -0500
@@ -567,9 +567,15 @@
Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gdm.spec 28 Mar 2005 20:04:25 -0000 1.60
+++ gdm.spec 29 Mar 2005 15:07:25 -0000 1.61
@@ -30,7 +30,6 @@
Patch13: gdm-selinux.patch
Patch14: gdm-2.6.0.0-session-errors-in-tmp.patch
Patch15: gdm-2.6.0.0-update-switchdesk-location.patch
-Patch16: gdm-2.6.0.0-pie.patch
Patch18: gdm-2.6.0.5-wait-for-bootup.patch
Patch19: gdm-2.6.0.5-cleanup-xses.patch
Patch20: gdm-2.6.0.5-sort-session-list.patch
@@ -95,7 +94,6 @@
%patch13 -p1 -b .selinux
%patch14 -p1 -b .session-errors
%patch15 -p1 -b .update-switchdesk-location
-%patch16 -p1 -b .pie
%patch18 -p1 -b .wait-for-bootup
%patch19 -p1 -b .cleanup-xses
%patch20 -p1 -b .sort-session-list
@@ -262,8 +260,8 @@
%attr(1770, root, gdm) %dir %{_localstatedir}/gdm
%changelog
-* Mon Mar 28 2005 Matthias Clasen <mclasen at redhat.com> 1:2.6.0.7-8
-- Add a --wait-for-system-startup cmdline option.
+* Tue Mar 29 2005 Ray Strode <rstrode at redhat.com> 1:2.6.0.7-8
+- Add a --wait-for-bootup cmdline option.
* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
- rebuilt
--- gdm-2.6.0.0-pie.patch DELETED ---
- Previous message (by thread): rpms/netpbm/devel netpbm-10.27-badlink.patch, NONE, 1.1 netpbm.spec, 1.32, 1.33
- Next message (by thread): rpms/device-mapper/devel device-mapper.1.01.01.tgz.asc, NONE, 1.1 .cvsignore, 1.8, 1.9 device-mapper.spec, 1.11, 1.12 sources, 1.9, 1.10 upstream, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list