rpms/mingetty/OLPC-2 mingetty-1.07-loginpause.patch, NONE, 1.1 mingetty-1.00-opt.patch, 1.2, 1.3 mingetty.spec, 1.16, 1.17
Bernardo Innocenti (bernie)
fedora-extras-commits at redhat.com
Thu Jan 10 04:06:58 UTC 2008
Author: bernie
Update of /cvs/pkgs/rpms/mingetty/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17021
Modified Files:
mingetty-1.00-opt.patch mingetty.spec
Added Files:
mingetty-1.07-loginpause.patch
Log Message:
* Wed Jan 09 2008 Bernardo Innocenti <bernie at codewiz.org> - 1.07-9
- add mingetty-1.07-loginpause.patch
- improve mingetty-1.00-opt.patch to enable cross building on a 64bit host
mingetty-1.07-loginpause.patch:
--- NEW FILE mingetty-1.07-loginpause.patch ---
diff -rup mingetty-1.07.orig/mingetty.8 mingetty-1.07/mingetty.8
--- mingetty-1.07.orig/mingetty.8 2003-05-14 04:55:43.000000000 -0400
+++ mingetty-1.07/mingetty.8 2008-01-09 18:17:06.000000000 -0500
@@ -6,6 +6,7 @@ mingetty \- minimal getty for consoles
[\-\-noclear] [\-\-nonewline] [\-\-noissue] [\-\-nohangup] [\-\-nohostname]
[\-\-long\-hostname] [\-\-loginprog=/bin/login] [\-\-nice=10] [\-\-delay=5]
[\-\-chdir=/home] [\-\-chroot=/chroot] [\-\-autologin username]
+[\-\-loginpause]
.I tty
.PP
.SH DESCRIPTION
@@ -62,6 +63,11 @@ Log the specified user automatically in
a login name and password. Check the \-f option from
.B /bin/login
for this.
+.TP
+.B \-\-loginpause
+Wait for any key before dropping to the login prompt.
+Can be combined with \fB\-\-autologin\fR to save memory by lazily spawning
+shells.
.PP
.SH "ISSUE ESCAPES"
.B mingetty
diff -rup mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c
--- mingetty-1.07.orig/mingetty.c 2004-01-03 08:15:56.000000000 -0500
+++ mingetty-1.07/mingetty.c 2008-01-09 18:10:15.000000000 -0500
@@ -74,6 +74,8 @@ static char *ch_dir = NULL;
static int priority = 0;
/* automatic login with this user */
static char *autologin = NULL;
+/* try to read a char before dropping to login prompt */
+static int loginpause = 0;
/* error() - output error messages */
static void error (const char *fmt, ...)
@@ -283,6 +285,10 @@ static void do_prompt (int showlogin)
}
fclose (fd);
}
+ if (loginpause) {
+ puts("[press ENTER to login]");
+ getc(stdin);
+ }
if (nohostname == 0)
printf ("%s ", hn);
if (showlogin)
@@ -327,11 +333,13 @@ static void usage (void)
"[--nohangup] [--nohostname] [--long-hostname] "
"[--loginprog=/bin/login] [--nice=10] [--delay=10] "
"[--chdir=/home] [--chroot=/chroot] [--autologin=user] "
+ "[--loginpause] "
"tty' with e.g. tty=tty1", progname);
}
static struct option const long_options[] = {
{ "autologin", required_argument, NULL, 'a' },
+ { "loginpause", no_argument, &loginpause, 'p' },
{ "chdir", required_argument, NULL, 'w' },
{ "chroot", required_argument, NULL, 'r' },
{ "delay", required_argument, NULL, 'd' },
@@ -366,7 +374,7 @@ int main (int argc, char **argv)
putenv ("TERM=linux");
#endif
- while ((c = getopt_long (argc, argv, "a:d:l:n:w:r:", long_options,
+ while ((c = getopt_long (argc, argv, "a:p:d:l:n:w:r:", long_options,
(int *) 0)) != EOF) {
switch (c) {
case 0:
mingetty-1.00-opt.patch:
Index: mingetty-1.00-opt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingetty/OLPC-2/mingetty-1.00-opt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingetty-1.00-opt.patch 9 Sep 2004 08:31:33 -0000 1.2
+++ mingetty-1.00-opt.patch 10 Jan 2008 04:06:49 -0000 1.3
@@ -1,10 +1,11 @@
--- mingetty-1.00/Makefile.rpm Mon Mar 4 15:27:11 2002
+++ mingetty-1.00/Makefile Mon Mar 4 15:27:34 2002
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,7 @@
DESTDIR=
CC=gcc
-CFLAGS=-O2 -Wall -W -pipe -D_GNU_SOURCE
+CFLAGS=$(RPM_OPTS) -Wall -D_GNU_SOURCE
++LDFLAGS=$(RPM_OPTS)
MANDIR=/usr/share/man/man8
SBINDIR=/sbin
Index: mingetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingetty/OLPC-2/mingetty.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mingetty.spec 12 Jul 2006 07:21:04 -0000 1.16
+++ mingetty.spec 10 Jan 2008 04:06:50 -0000 1.17
@@ -1,11 +1,13 @@
-Summary: A compact getty program for virtual consoles only.
+Summary: A compact getty program for virtual consoles only
Name: mingetty
Version: 1.07
-License: GPL
-Release: 5.2.2
+License: GPLv2+
+Release: 9%{?dist}
Group: System Environment/Base
+URL: http://sourceforge.net/projects/mingetty/
Source: mingetty-%{version}.tar.gz
-Patch: mingetty-1.00-opt.patch
+Patch0: mingetty-1.00-opt.patch
+Patch1: mingetty-1.07-loginpause.patch
BuildRoot: %{_tmppath}/%{name}-root
%description
@@ -14,8 +16,10 @@
lines (you should use the mgetty program in that case).
%prep
+rm -rf $RPM_BUILD_ROOT
%setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
%build
make "RPM_OPTS=$RPM_OPT_FLAGS"
@@ -37,6 +41,20 @@
%{_mandir}/man8/mingetty.*
%changelog
+* Wed Jan 09 2008 Bernardo Innocenti <bernie at codewiz.org> - 1.07-9
+- add mingetty-1.07-loginpause.patch
+- improve mingetty-1.00-opt.patch to enable cross building on a 64bit host
+
+* Tue Jan 08 2008 Florian La Roche <laroche at redhat.com> - 1.07-8
+- add sf.net project url
+- add dist macro to release
+
+* Sun Jan 06 2008 Florian La Roche <laroche at redhat.com> - 1.07-7
+- add rpmlint changes to .spec file from Jon Ciesla limb at jcomserv.net
+
+* Tue Aug 21 2007 Florian La Roche <laroche at redhat.com> - 1.07-6
+- rebuild
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2.2
- rebuild
More information about the fedora-extras-commits
mailing list