summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-09-07 08:38:50 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-09-07 08:38:50 -0700
commit7f37bac8fa7c36f751d3e3cc9aa9cbafeb3076c5 (patch)
treebec971f7f6f04783d99c28e8a71ee8a453675244
parent94ba42b1ecb1db5571ae90397aeb69bde92cbda6 (diff)
downloadvyatta-cfg-quagga-7f37bac8fa7c36f751d3e3cc9aa9cbafeb3076c5.tar.gz
vyatta-cfg-quagga-7f37bac8fa7c36f751d3e3cc9aa9cbafeb3076c5.zip
Change modprobe.d files to .conf
In squeeze, modprobe wants config files named .conf or it will generate warning.
-rw-r--r--debian/vyatta-cfg-system.postinst.in2
-rw-r--r--templates/system/ipv6/blacklist/node.def4
-rw-r--r--templates/system/ipv6/disable/node.def4
3 files changed, 5 insertions, 5 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 3e8ef1e0..16ad9d2d 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -177,7 +177,7 @@ password requisite pam_succeed_if.so user = root
fi
# Block pc speaker driver to keep system quiet
-[ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist
+[ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist.conf
#
# Ask mdadm to call our own event handling daemon
diff --git a/templates/system/ipv6/blacklist/node.def b/templates/system/ipv6/blacklist/node.def
index b19214db..ce8dafd1 100644
--- a/templates/system/ipv6/blacklist/node.def
+++ b/templates/system/ipv6/blacklist/node.def
@@ -2,9 +2,9 @@ help: Prevent the IPv6 kernel module from being loaded
create:
sudo sh -c "echo blacklist ipv6 > \
- /etc/modprobe.d/vyatta_blacklist_ipv6"
+ /etc/modprobe.d/vyatta_blacklist_ipv6.conf"
echo "This change will take affect when the system is rebooted."
delete:
- sudo sh -c "rm -f /etc/modprobe.d/vyatta_blacklist_ipv6"
+ sudo sh -c "rm -f /etc/modprobe.d/vyatta_blacklist_ipv6.conf"
echo "This change will take affect when the system is rebooted."
diff --git a/templates/system/ipv6/disable/node.def b/templates/system/ipv6/disable/node.def
index 50aaa420..be1ce2f5 100644
--- a/templates/system/ipv6/disable/node.def
+++ b/templates/system/ipv6/disable/node.def
@@ -2,9 +2,9 @@ help: Disable assignment of IPv6 addresses on all interfaces
create:
sudo sh -c "echo options ipv6 disable_ipv6=1 > \
- /etc/modprobe.d/vyatta_disable_ipv6"
+ /etc/modprobe.d/vyatta_disable_ipv6.conf"
echo "This change will take affect when the system is rebooted."
delete:
- sudo sh -c "rm -f /etc/modprobe.d/vyatta_disable_ipv6"
+ sudo sh -c "rm -f /etc/modprobe.d/vyatta_disable_ipv6.conf"
echo "This change will take affect when the system is rebooted."