diff -ruN e-smith-base-5.4.0.old/createlinks e-smith-base-5.4.0/createlinks
--- e-smith-base-5.4.0.old/createlinks	2013-03-16 09:26:44.627415245 -0600
+++ e-smith-base-5.4.0/createlinks	2013-03-16 09:27:45.036615400 -0600
@@ -70,15 +70,6 @@
     templates2events($_, qw(console-save bootstrap-console-save));
 }
 
-# conf-modules
-
-templates2events("/etc/modprobe.conf", qw(
-	console-save
-	bootstrap-console-save
-	post-install
-	post-upgrade
-	));
-
 # conf-other
 
 templates2events("/etc/crontab",  qw(
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10blockdev-aliases	1969-12-31 17:00:00.000000000 -0700
@@ -1,13 +0,0 @@
-{
-    foreach my $line
-	(
-	    "alias block-major-3 off",
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10bonding e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10bonding
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10bonding	2006-03-14 09:20:43.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10bonding	1969-12-31 17:00:00.000000000 -0700
@@ -1,16 +0,0 @@
-{
-    my $options = ${InternalInterface}{NICBondingOptions} || '';
-    foreach my $line
-	(
-	    "alias bond0 bonding",
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    @lines = grep !/^options bond0/, @lines;
-    push @lines, "options bond0 $options" if($options);
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10EthernetDrivers	1969-12-31 17:00:00.000000000 -0700
@@ -1,12 +0,0 @@
-{
-    @lines = grep { !/^\s*alias\s*eth[01]/ } @lines;
-    if (defined $EthernetDriver1 && $EthernetDriver1 ne "unknown")
-    {
-	push @lines, "alias eth0 ${EthernetDriver1}";
-    }
-    if (defined $EthernetDriver2 && $EthernetDriver2 ne "unknown")
-    {
-	push @lines, "alias eth1 ${EthernetDriver2}";
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10hisax e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10hisax
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10hisax	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10hisax	1969-12-31 17:00:00.000000000 -0700
@@ -1,25 +0,0 @@
-{
-    @lines = grep { !/^\s*options\s*hisax/ } @lines;
-    my $hisax_alias = "alias char-major-43 hisax";
-    unless (exists $lines{$hisax_alias})
-    {
-	push @lines, $hisax_alias;
-    }
-    my $hisax = $isdn{'HisaxOptions'} || "";
-    my $type = $isdn{'Type'} || "";
-    my $protocol = $isdn{'Protocol'} || "";
-    if ($type)
-    {
-	$hisax .= " type=$type";
-    }
-    if ($protocol)
-    {
-	$hisax .= " protocol=$protocol";
-    }
-    if ($hisax)
-    {
-	push @lines, "options hisax $hisax";
-    }
-    "";
-}
-
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases	2006-02-16 20:41:51.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-aliases	1969-12-31 17:00:00.000000000 -0700
@@ -1,26 +0,0 @@
-{
-    foreach my $line
-	(
-	    # alias IPX off
-	    "alias net-pf-4 off",
-	    # alias IPV6 off
-	    "alias net-pf-10 off",
-	    "alias net-pf-47 ip_gre",
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    foreach my $line
-	(
-	    "alias net-pf-15 ipsec",
-	    "alias net-pf-50 ipsec",
-	)
-    {
-	@lines = grep { !/^$line$/ } @lines;
-    }
-
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10net-fp-pppoe	1969-12-31 17:00:00.000000000 -0700
@@ -1,9 +0,0 @@
-{
-    # Ensure that pppoe module can be autoloaded
-    my $line = "alias net-pf-24 pppoe";
-    unless (exists $lines{$line})
-    {
-	push @lines, $line;
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10parport-aliases	1969-12-31 17:00:00.000000000 -0700
@@ -1,13 +0,0 @@
-{
-    foreach my $line
-	(
-	    "alias parport_lowlevel parport_pc"
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp	1969-12-31 17:00:00.000000000 -0700
@@ -1,21 +0,0 @@
-{
-    # Obsolete the aliasing of ppp module name if we find it
-    # We no longer need to use the alias, we use a module
-    # search path instead
-    @lines = grep { !/^alias ppp ppp-4mppe$/ } @lines;
-    foreach my $line
-	(
-	    "alias ppp ppp_generic",
-	    "alias char-major-108 ppp",
-	    "alias /dev/ppp ppp",
-	    "alias tty-ldisc-3 ppp_async",
-	    "alias tty-ldisc-14 ppp_synctty",
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10ppp-compress-aliases	1969-12-31 17:00:00.000000000 -0700
@@ -1,16 +0,0 @@
-{
-    foreach my $line
-	(
-	    "alias ppp-compress-18 ppp_mppe",
-	    "alias ppp-compress-21 bsd_comp",
-	    "alias ppp-compress-24 ppp_deflate",
-	    "alias ppp-compress-26 ppp_deflate"
-	)
-    {
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10tap-aliases	1969-12-31 17:00:00.000000000 -0700
@@ -1,11 +0,0 @@
-{
-    foreach my $i (0..15)
-    {
-	my $line = "alias tap${i} off";
-	unless (exists $lines{$line})
-	{
-	    push @lines, $line;
-	}
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10usb e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10usb
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/10usb	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/10usb	1969-12-31 17:00:00.000000000 -0700
@@ -1,8 +0,0 @@
-{
-    my $usb_alias = "alias char-major-180 usbcore";
-    unless (exists $lines{$usb_alias})
-    {
-	push @lines, $usb_alias;
-    }
-    "";
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/99writefile e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/99writefile
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/99writefile	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/99writefile	1969-12-31 17:00:00.000000000 -0700
@@ -1,7 +0,0 @@
-{
-    $OUT .= "";
-    foreach my $line (@lines)
-    {
-	$OUT .= "$line\n";
-    }
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/template-begin e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/template-begin
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates/etc/modprobe.conf/template-begin	2005-11-20 21:28:07.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/etc/modprobe.conf/template-begin	1969-12-31 17:00:00.000000000 -0700
@@ -1,34 +0,0 @@
-{
-    %lines = ();
-    @lines = ();
-    open (RD, "</etc/modprobe.conf")
-    || warn "Cannot open input file /etc/modprobe.conf: $!\n";
-    while (<RD>)
-    {
-	chop;
-	push @lines, $_;
-	$lines{$_} = 1;
-    }
-    close(RD);
-    my @header = (
-	"#------------------------------------------------------------",
-	"# BE CAREFUL WHEN MODIFYING THIS FILE! It is updated automatically",
-	"# by the SME server software. Various aliases are added and/or",
-	"# deleted by the template processing of the file and white space",
-	"# is removed, but otherwise changes to the file are preserved.",
-	"# For more information, see http://www.e-smith.org/custom/ and",
-	"# the template fragments in /etc/e-smith/templates/etc/modprobe.conf/.",
-	"# ",
-	"# copyright (C) 2002-2005 Mitel Networks Corporation",
-	"#------------------------------------------------------------",
-    );
-    foreach my $line (@header)
-    {
-	# Print the header banner, and delete any of its lines from the
-	# buffer, so that it isn't repeated.
-	my $test = $line;
-	$test =~ tr/()/../; # Avoid special interpretation of () in pattern
-	@lines = grep { !/^$test$/ } @lines;
-	$OUT .= "$line\n";
-    }
-}
diff -ruN e-smith-base-5.4.0.old/root/etc/e-smith/templates.metadata/etc/modprobe.conf e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/modprobe.conf
--- e-smith-base-5.4.0.old/root/etc/e-smith/templates.metadata/etc/modprobe.conf	2005-11-20 21:28:09.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/modprobe.conf	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-FILTER=sub { $_[0] =~ /^\s*$/ ? '' : $_[0] }