diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/rc.d/init.d/fbsetfont startup-0.9.7/rc.d/init.d/fbsetfont --- startup-0.9.6.1/rc.d/init.d/fbsetfont 2004-05-26 18:22:42 +0700 +++ startup-0.9.7/rc.d/init.d/fbsetfont 2005-04-08 16:11:48 +0700 @@ -48,12 +48,12 @@ sed -ne 's,^\([0-9]\+\):[0-9]\+:respawn:/sbin/mingetty.*,/dev/tty\1,pg' >"$t" 2>&1 + ExecIfExecutable /sbin/setsysfont <"$t" >>"$t" 2>&1 done for i in $TTYS; do t="/dev/tty$i" [ ! -c "$t" ] || - /sbin/setsysfont <"$t" >>"$t" 2>&1 + ExecIfExecutable /sbin/setsysfont <"$t" >>"$t" 2>&1 done fi touch "$LOCKFILE" diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/rc.d/rc.sysinit startup-0.9.7/rc.d/rc.sysinit --- startup-0.9.6.1/rc.d/rc.sysinit 2005-04-03 06:20:25 +0700 +++ startup-0.9.7/rc.d/rc.sysinit 2005-04-08 16:11:48 +0700 @@ -39,7 +39,7 @@ fi # Set system font -setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE= +ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE= PrintMargin() { @@ -259,7 +259,7 @@ # Set system font again, if required if [ "$OLD_COLUMNS" != "$COLUMNS" ]; then - setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE= + ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1 && SETSYSFONT_DONE=1 || SETSYSFONT_DONE= fi # Load device-mapper, create its device file @@ -447,7 +447,7 @@ # At this point everything should be mounted # Set system font again, if required -[ -n "$SETSYSFONT_DONE" ] || setsysfont >/dev/null 2>&1 +[ -n "$SETSYSFONT_DONE" ] || ExecIfExecutable /sbin/setsysfont >/dev/null 2>&1 if [ "$_RUN_QUOTACHECK" = 1 -a -x "$QUOTACHECK" ]; then action "Checking filesystem quotas:" "$QUOTACHECK" -v -R -a Only in startup-0.9.6.1: setsysfont diff -dur --exclude='.emacs*' --exclude=RCS startup-0.9.6.1/startup.spec startup-0.9.7/startup.spec --- startup-0.9.6.1/startup.spec 2005-04-03 06:20:39 +0700 +++ startup-0.9.7/startup.spec 2005-04-08 16:15:22 +0700 @@ -1,7 +1,7 @@ # $Id: startup.spec,v 1.39 2005/04/02 23:20:39 ldv Exp $ Name: startup -Version: 0.9.6.1 +Version: 0.9.7 Release: alt1 Summary: The system startup scripts @@ -32,6 +32,8 @@ Conflicts: kernel-headers-common < 0:1.1 # due to netfs Conflicts: net-scripts < 0:0.5.4-alt1 +# due to /sbin/setsysfont's package change +Conflicts: interactivesystem < 1:sisyphus-alt12 %description This package contains scripts used to boot your system, @@ -43,7 +45,6 @@ %install %__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/rc.d/rc{0,1,2,3,4,5,6}.d %__install -p -m644 inittab modules sysctl.conf $RPM_BUILD_ROOT%_sysconfdir/ -%__install -pD -m755 setsysfont $RPM_BUILD_ROOT/sbin/setsysfont %__cp -a rc.d sysconfig $RPM_BUILD_ROOT%_sysconfdir/ # these services do not support chkconfig: @@ -62,10 +63,9 @@ %__mkdir_p $RPM_BUILD_ROOT/var/{log,run} touch $RPM_BUILD_ROOT/var/{log/wtmp,run/utmp} -touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{clock,i18n,keyboard,mouse,system} +touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{clock,i18n,mouse,system} chmod -R +x $RPM_BUILD_ROOT%_sysconfdir/rc.d -%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/sysconfig/{console,harddisk} -touch $RPM_BUILD_ROOT%_sysconfdir/sysconfig/console/setterm +%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/sysconfig/harddisk %__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/firsttime.d %__mkdir_p $RPM_BUILD_ROOT%_localstatedir/rsbac @@ -112,7 +112,7 @@ fi %triggerpostun -- initscripts < 1:5.49.1-alt1 -for f in %_sysconfdir/{inittab,modules,sysctl.conf,sysconfig/{clock,console/setterm,framebuffer,i18n,init,keyboard,mouse,rawdevices,system}}; do +for f in %_sysconfdir/{inittab,modules,sysctl.conf,sysconfig/{clock,framebuffer,i18n,init,mouse,rawdevices,system}}; do if [ ! -f "$f" ]; then if [ -f "$f".rpmsave ]; then %__cp -pf "$f".rpmsave "$f" @@ -144,13 +144,19 @@ %config %_sysconfdir/rc.d/rc %config %_sysconfdir/rc.d/rc.sysinit %config %_sysconfdir/rc.d/rc.powerfail -/sbin/setsysfont %ghost %attr(664,root,utmp) /var/log/wtmp %ghost %attr(664,root,utmp) /var/run/utmp %dir %_sysconfdir/firsttime.d %dir %_localstatedir/rsbac %changelog +* Mon Apr 4 2005 Ivan Zakharyaschev 0.9.7-alt1 +- Moved console-related files to console-common-scripts package: + /sbin/setsysfont, %_sysconfdir/sysconfig/console/setterm, + %_sysconfdir/sysconfig/keyboard + (no extra dependency on console-common-scripts required, it belongs + to interactivesystem). + * Sun Apr 03 2005 Dmitry V. Levin 0.9.6.1-alt1 - rc.sysinit: reverted previous change.