aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-02-07 16:50:52 -0500
committerBill Nottingham <notting@redhat.com>2012-02-07 16:50:52 -0500
commit9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb (patch)
tree71ed2bfd9de32b2bab6fe9fadb7b27e6bdc6a917
parent987cc20e486e5568031f77d04a85e3ca1b732377 (diff)
downloadinitscripts-9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb.tar
initscripts-9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb.tar.gz
initscripts-9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb.tar.bz2
initscripts-9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb.tar.xz
initscripts-9f004dc5c0d73b12d5cd4ff4a8bbd65170b107fb.zip
Move netfs to the -legacy package.
-rw-r--r--initscripts.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index b567f7d5..78b81504 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -142,7 +142,6 @@ chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
chmod 664 /var/log/wtmp /var/run/utmp
chmod 600 /var/log/btmp
-/sbin/chkconfig --add netfs
/sbin/chkconfig --add network
/sbin/chkconfig --add netconsole
%if %{_with_systemd}
@@ -158,6 +157,14 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del netconsole
fi
+%post legacy
+/sbin/chkconfig --add netfs
+
+%preun legacy
+if [ $1 = 0 ; then
+ /sbin/chkconfig --del netfs
+fi
+
%triggerun -- initscripts < 7.62
/sbin/chkconfig --del random
/sbin/chkconfig --del rawdevices
@@ -245,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT
/etc/rc[0-9].d
%dir /etc/rc.d/init.d
/etc/rc.d/init.d/*
+%exclude /etc/rc.d/init.d/netfs
%exclude /etc/rc.d/init.d/halt
%exclude /etc/rc.d/init.d/killall
%exclude /etc/rc.d/init.d/reboot
@@ -283,7 +291,6 @@ 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 static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
/var/lib/stateless
%ghost %attr(0600,root,utmp) /var/log/btmp
@@ -296,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT
%files legacy
%defattr(-,root,root)
%config(noreplace) /etc/inittab
+/etc/NetworkManager/dispatcher.d/05-netfs
%dir /etc/rc.d
%dir /etc/rc.d/rc[0-9].d
%config(missingok) /etc/rc.d/rc[0-9].d/*