aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2007-01-17 19:32:07 +0000
committerBill Nottingham <notting@redhat.com>2007-01-17 19:32:07 +0000
commitafa6fe867bc758b2fb7da6728d27fc80ea1a308f (patch)
tree7f607135a3ca6dd64ed27cd2e30d0927ca21e26a
parentdbed14a14732e5fd1c465b3951c184523b42ff8a (diff)
downloadinitscripts-afa6fe867bc758b2fb7da6728d27fc80ea1a308f.tar
initscripts-afa6fe867bc758b2fb7da6728d27fc80ea1a308f.tar.gz
initscripts-afa6fe867bc758b2fb7da6728d27fc80ea1a308f.tar.bz2
initscripts-afa6fe867bc758b2fb7da6728d27fc80ea1a308f.tar.xz
initscripts-afa6fe867bc758b2fb7da6728d27fc80ea1a308f.zip
add ipv6 modprobe rule that reads NETWORKING_IPV6 (#198045)
-rw-r--r--Makefile3
-rw-r--r--initscripts.spec3
-rw-r--r--ipv6.mod1
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ed11c559..1e92279a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ install:
mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin
mkdir -p $(ROOT)$(mandir)/man{5,8}
mkdir -p $(ROOT)/etc/rwtab.d $(ROOT)/var/lib/stateless/writable
+ mkdir -p $(ROOT)/etc/modprobe.d
install -m644 inittab adjtime $(ROOT)/etc
if uname -m | grep -q s390 ; then \
@@ -35,6 +36,8 @@ install:
mkdir -p $(ROOT)/etc/X11
install -m755 prefdm $(ROOT)/etc/X11/prefdm
+
+ install -m644 ipv6.mod $(ROOT)/etc/modprobe.d/ipv6
cp -af rc.d sysconfig ppp udev $(ROOT)/etc
mkdir -p $(ROOT)/etc/ppp/peers
diff --git a/initscripts.spec b/initscripts.spec
index b584ee46..7a6fe015 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -92,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%dir /etc/sysconfig/network-scripts
+%config(missingok) /etc/modprobe.d/ipv6
%config(noreplace) %verify(not md5 mtime size) /etc/adjtime
%config(noreplace) /etc/sysconfig/init
%config(noreplace) /etc/sysconfig/readonly-root
@@ -201,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
- set MACADDR, MTU before initializing slave devices (#218792)
- reset alarm so ppp-watch works with ONBOOT=yes (#216749)
-
+- add modprobe rule for ipv6 that reads NETWORKING_IPV6 (#198045)
* Tue Nov 28 2006 Bill Nottingham <notting@redhat.com> 8.45.7-1
- add a step to rename any temporarily renamed devices (#208740, #214817)
diff --git a/ipv6.mod b/ipv6.mod
new file mode 100644
index 00000000..96dc676c
--- /dev/null
+++ b/ipv6.mod
@@ -0,0 +1 @@
+install ipv6 { . /etc/sysconfig/network ; [ -n "$NETWORKING_IPV6" -a "$NETWORKING_IPV6" != "yes" ] || /sbin/modprobe --ignore-install ipv6 $CMDLINE_OPTS ; }