diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | initscripts.spec | 17 |
2 files changed, 20 insertions, 3 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..b99c2398 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,3 +1,5 @@ +%define with_upstart 1%{nil} + Summary: The inittab file and the /etc/init.d scripts Name: initscripts Version: 8.67 @@ -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 |