diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | initscripts.spec | 37 | ||||
| -rw-r--r-- | inittab.upstart | 26 | ||||
| -rw-r--r-- | udev/rules.d/60-net.rules | 1 |
4 files changed, 66 insertions, 4 deletions
@@ -19,10 +19,12 @@ install: mkdir -p $(ROOT)/var/lib/stateless/writable mkdir -p $(ROOT)/var/lib/stateless/state - install -m644 inittab adjtime $(ROOT)/etc + install -m644 adjtime $(ROOT)/etc + install -m644 inittab $(ROOT)/etc/inittab.sysv if uname -m | grep -q s390 ; then \ - install -m644 inittab.s390 $(ROOT)/etc/inittab ; \ + install -m644 inittab.s390 $(ROOT)/etc/inittab.sysv ; \ fi + install -m644 inittab.upstart $(ROOT)/etc/inittab.upstart install -m644 rwtab statetab networks $(ROOT)/etc install -m755 service setsysfont $(ROOT)/sbin install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d diff --git a/initscripts.spec b/initscripts.spec index 1314cfdb..6ada8419 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,8 @@ +%define with_upstart 1%{nil} + Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.67 +Version: 8.68 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -13,7 +15,12 @@ Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l -Requires: bash >= 3.0, SysVinit >= 2.85-38 +Requires: bash >= 3.0 +%if with_upstart +Requires: upstart +%else +Requires: SysVinit >= 2.85-38 +%endif Requires: /sbin/ip, /sbin/arping, net-tools Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser @@ -51,6 +58,13 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %find_lang %{name} +%if with_upstart + mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab +%else + mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab +%endif +rm -f $RPM_BUILD_ROOT/etc/inittab.* + %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ @@ -210,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport +/etc/NetworkManager/dispatcher.d/05-netfs %doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp @@ -217,6 +232,24 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Apr 4 2008 Bill Nottingham <notting@redhat.com> - 8.68-1 +- netfs: umount 'ncp' filesystems as well (#437117) +- improve performance of s390 ccw rules (#437110, <mernst@de.ibm.com>) +- fix consoletype environment leak (#439546) +- ifdown-eth: make sure NEWCONFIG exists before grepping for it (#390271, continued) +- console_check: always open with NONBLOCK, clear the serial structs first, + handle non-16550 ports (<dwmw2@infradead.org>) +- halt: don't use /etc/sysconfig/clock (#438337) +- ifup: don't attempt to re-enslave already-enslaved devices (#440077) +- netfs: run as a NetworkManagerDispatcher script (#439242) +- netfs: remove $local_fs from the list of provides (making it implicitly provided + by booting) +- serial: add a crude hack to wait for runlevels to finish (#437379) +- serial: frob /etc/securetty when necessary (#437381) +- add a upstart-specific inittab +- translation updates: as, bn_IN, cs, de, es, fi, fr, gu, hi, it, ja, kn, ml, mr, nb, + nl, pa, pl, pt_BR, ru, sk, sr, ta, te, zh_CN + * Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> - 8.67-1 - actually, don't diff --git a/inittab.upstart b/inittab.upstart new file mode 100644 index 00000000..95d359ca --- /dev/null +++ b/inittab.upstart @@ -0,0 +1,26 @@ +# inittab is only used by upstart for the default runlevel. +# +# ADDING OTHER CONFIGURATION HERE WILL HAVE NO EFFECT ON YOUR SYSTEM. +# +# System initialization is started by /etc/event.d/rcS +# +# Individual runlevels are started by /etc/event.d/rc[0-6] +# +# Ctrl-Alt-Delete is handled by /etc/event.d/control-alt-delete +# +# Terminal gettys (tty[1-6]) are handled by /etc/event.d/tty[1-6] and +# /etc/event.d/serial +# +# For information on how to write upstart event handlers, or how +# upstart works, see init(8), initctl(8), and events(5). +# +# Default runlevel. The runlevels used are: +# 0 - halt (Do NOT set initdefault to this) +# 1 - Single user mode +# 2 - Multiuser, without NFS (The same as 3, if you do not have networking) +# 3 - Full multiuser mode +# 4 - unused +# 5 - X11 +# 6 - reboot (Do NOT set initdefault to this) +# +id:3:initdefault: diff --git a/udev/rules.d/60-net.rules b/udev/rules.d/60-net.rules index 718ad5d9..5a2146d9 100644 --- a/udev/rules.d/60-net.rules +++ b/udev/rules.d/60-net.rules @@ -1,2 +1,3 @@ +ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/virtual/net/lo", RUN+="/sbin/ifup $env{INTERFACE}" ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/rename_device", RESULT=="?*", ENV{INTERFACE_NAME}="$result" SUBSYSTEM=="net", RUN+="/etc/sysconfig/network-scripts/net.hotplug" |