diff --git a/config/backup/includes/watchdog b/config/backup/includes/watchdog index a708771aa..3ef13592a 100644 --- a/config/backup/includes/watchdog +++ b/config/backup/includes/watchdog @@ -1 +1 @@ -etc/watchdog.conf +/etc/watchdog.conf diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files index 5ef91c8ab..024bd7216 100644 --- a/config/rootfiles/core/37/filelists/files +++ b/config/rootfiles/core/37/filelists/files @@ -3,5 +3,9 @@ lib/modules/2.6.27.42-ipfire/kernel/net lib/modules/2.6.27.42-ipfire-xen/kernel/net lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko +lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko +lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko +lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko +lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/outgoingfw.cgi \ No newline at end of file diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 027de07f5..c6696feea 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -98,6 +98,8 @@ * elinks-0.11.6 * esniper-2-19-0 * espgs-8.15.1 +* et131x-kmod-2.6.27.42-ipfire +* et131x-kmod-2.6.27.42-ipfire-xen * etherwake-1.09 * ethtool-3 * expat-2.0.0 @@ -229,7 +231,7 @@ * module-init-tools-3.5 * motion-3.2.11 * mpc-0.19 -* mpd-0.15.6 +* mpd-0.15.8 * mpeg2dec-0.4.0b * mpfire-ipfire * mtd-CVS-20070507 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index b8e573177..4b8de89e5 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -100,6 +100,8 @@ $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'DISPLAYCHARSET'} = 'CP850'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; +$sambasettings{'WIDELINKS'} = 'on'; +$sambasettings{'UNIXEXTENSION'} = 'off'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; ### Samba CUPS Variablen @@ -123,6 +125,9 @@ my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} +if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on')) + {$errormessage = "$errormessage
Don't enable 'Wide links' and 'Unix extension' at the same time"; } + &Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -171,6 +176,8 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'PRINTCAPNAME'} = 'cups'; $sambasettings{'PRINTERNAME'} = 'Printer'; ### Values that have to be initialized + $sambasettings{'WIDELINKS'} = 'on'; + $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'ACTION'} = ''; $sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'DOMAINMASTER'} = 'off'; @@ -249,6 +256,8 @@ if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "tru if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} = "yes";} else { $sambasettings{'SYSLOGONLY'} = "no";} +if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} +if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} ############################################################################################################################ ############################################# Schreiben der Samba globals ################################################## @@ -264,6 +273,9 @@ netbios name = $sambasettings{'NETBIOSNAME'} server string = $sambasettings{'SRVSTRING'} workgroup = $sambasettings{'WORKGRP'} +wide links = $sambasettings{'WIDELINKS'} +unix extensions = $sambasettings{'UNIXEXTENSION'} + keep alive = 30 os level = $sambasettings{'OSLEVEL'} fstype = NTFS @@ -381,6 +393,12 @@ $checked{'DOMAINMASTER'}{$sambasettings{'DOMAINMASTER'}} = "checked='checked'"; $checked{'PREFERREDMASTER'}{'off'} = ''; $checked{'PREFERREDMASTER'}{'on'} = ''; $checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; +$checked{'WIDELINKS'}{'off'} = ''; +$checked{'WIDELINKS'}{'on'} = ''; +$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; +$checked{'UNIXEXTENSION'}{'off'} = ''; +$checked{'UNIXEXTENSION'}{'on'} = ''; +$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; $checked{'GREEN'}{'off'} = ''; $checked{'GREEN'}{'on'} = ''; $checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'"; @@ -481,6 +499,11 @@ END print <$Lang::tr{'more'}
+Wide linkson / + off +Unix extensionon / + off +
$Lang::tr{'security options'} $Lang::tr{'security'}