rpms/sysvinit/devel change_console, NONE, 1.1 sysvinit.spec, 1.66, 1.67

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4476

Modified Files:
	sysvinit.spec 
Added Files:
	change_console 
Log Message:
replace change_console with a shell script that calls initctl
push-tty...



--- NEW FILE change_console ---
#!/bin/sh

if [ "$1" = "-r" ]; then
        /sbin/initctl pop-tty
        exit 0
fi

SHOULD_BLOCK=0
if [ "$1" = "-f" ]; then
        SHOULD_BLOCK=1
        shift
fi

if [ $# -ge 1 ]; then
        TTY="$1"
else
        TTY="$(/usr/bin/tty)"
fi

/sbin/initctl push-tty $TTY

if [ $SHOULD_BLOCK -ne 0 ]; then
        while read; do sleep 1; done 
fi


Index: sysvinit.spec
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sysvinit.spec	7 Mar 2008 18:23:11 -0000	1.66
+++ sysvinit.spec	11 Mar 2008 21:38:35 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
 Version: 2.86
-Release: 23
+Release: 24
 License: GPLv2+
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -28,7 +28,7 @@
 Patch20: sysvinit-selinux.patch
 Patch21: sysvinit-no-abort.patch
 Patch22: 81_killall_avoid_init.dpatch
-Source1: change_console.c
+Source1: change_console
 Source2: change_console.8
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.66-5
@@ -105,8 +105,6 @@
 %build
 make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -C src
 
-%{__cc} $RPM_OPT_FLAGS -o change_console -I./src %{SOURCE1}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 for I in bin sbin usr/{bin,include} %{_mandir}/man{1,3,5,8} etc var/run dev; do
@@ -119,7 +117,7 @@
 
 chmod 755 $RPM_BUILD_ROOT/usr/bin/utmpdump
 
-install -m 755 change_console $RPM_BUILD_ROOT/sbin/change_console
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/change_console
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/change_console.8
 
 rm -f $RPM_BUILD_ROOT/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
@@ -178,6 +176,8 @@
 %{_mandir}/man8/sulogin*
 
 %changelog
+* Tue Mar 11 2008 Bill Nottingham <notting at redhat.com> - 2.86-24
+- 
 * Fri Mar  7 2008 Bill Nottingham <notting at redhat.com> - 2.86-23
 - move mountpoint to -tools subpackage
 - don't build sysvinit package itself