| 1 |
diff -up smeserver-thinclient-2.1/createlinks.tftpdconf smeserver-thinclient-2.1/createlinks |
| 2 |
--- smeserver-thinclient-2.1/createlinks.tftpdconf 2006-04-01 23:50:45.000000000 +1100 |
| 3 |
+++ smeserver-thinclient-2.1/createlinks 2016-04-03 21:13:32.461197731 +1000 |
| 4 |
@@ -13,4 +13,3 @@ panel_link("thinclient", "manager"); |
| 5 |
# Symlinks |
| 6 |
#-------------------------------------------------- |
| 7 |
safe_symlink("restart", "root/etc/e-smith/events/thinclient-conf/services2adjust/dhcpd"); |
| 8 |
-safe_symlink("restart", "root/etc/e-smith/events/thinclient-conf/services2adjust/tftpd"); |
| 9 |
diff -up smeserver-thinclient-2.1/root/etc/e-smith/web/functions/thinclient.tftpdconf smeserver-thinclient-2.1/root/etc/e-smith/web/functions/thinclient |
| 10 |
--- smeserver-thinclient-2.1/root/etc/e-smith/web/functions/thinclient.tftpdconf 2006-06-12 20:43:42.000000000 +1000 |
| 11 |
+++ smeserver-thinclient-2.1/root/etc/e-smith/web/functions/thinclient 2016-04-03 21:16:26.658142197 +1000 |
| 12 |
@@ -61,11 +61,11 @@ my $pxeclients = esmith::ConfigDB->open( |
| 13 |
my $hosts = esmith::ConfigDB->open_ro('hosts'); |
| 14 |
|
| 15 |
|
| 16 |
-my $version = '2.0.0-0'; |
| 17 |
-my $email = 'smeserver@batley.id.au'; |
| 18 |
+my $version = '2.1-2'; |
| 19 |
+my $email = 'trevorbatley@users.sourceforge.net'; |
| 20 |
my $title = 'Thin Client Configuration'; |
| 21 |
my $copyright = 'copyright (c) 2004, Trevor Batley, <a href=mailto:'.$email.'>'.$email.'</a>'; |
| 22 |
-my $sendreports = 'Please send <a href=mailto:'.$email.'?subject=Thinclient-Featurerequest>Featurerequests</a> and <a href=mailto:'.$email.'?subject=Thinclient-Bug('.$version.')>Bugs</a> to me'; |
| 23 |
+my $sendreports = 'Please raise Bugs and Feature Requests in <a target=_blank href=http://bugs.contribs.org/>Bugzilla</a> (SMEContribs => smeserver-thinclient)'; |
| 24 |
|
| 25 |
my $thinclientstatus; |
| 26 |
my $pxedefaultbase; |
| 27 |
@@ -167,12 +167,12 @@ sub showStatusReport ($$$$) |
| 28 |
|
| 29 |
if ($log ne '') |
| 30 |
{ |
| 31 |
- open (LOG, $log) || die ("Error while opening temporally log file.\n"); |
| 32 |
- while (<LOG>) |
| 33 |
- { |
| 34 |
- print "$_". "<BR>"; |
| 35 |
- } |
| 36 |
- close LOG; |
| 37 |
+ open (LOG, $log) || die ("Error while opening temporally log file.\n"); |
| 38 |
+ while (<LOG>) |
| 39 |
+ { |
| 40 |
+ print "$_". "<BR>"; |
| 41 |
+ } |
| 42 |
+ close LOG; |
| 43 |
} |
| 44 |
|
| 45 |
print $q->hr; |
| 46 |
@@ -257,12 +257,12 @@ sub showPXEGlobals($) |
| 47 |
print $q->start_table ({-class => "sme-noborders"}); |
| 48 |
print $q->p ('PXE Booting is a facility for allowing LAN workstations to boot an operating system ', |
| 49 |
'over the network.<BR>', |
| 50 |
- 'If Thinclient is enabled, PXE Booting is enabled and dhcp will supply the filepath of ', |
| 51 |
+ 'If PXE Booting is enabled, dhcp will supply the filepath of ', |
| 52 |
'a pxe bootable image to any LAN workstation requesting it.', |
| 53 |
); |
| 54 |
|
| 55 |
print $q->p ('You must specifiy which Tftp server you will be using to supply the image.<BR>', |
| 56 |
- 'Selecting <B>Self</B> will activate the Tftp server running on this server.<BR>', |
| 57 |
+ 'Selecting <B>Self</B> will activate the Tftp server running on this server (if you have installed one - e.g. smeserver-tftp-server).<BR>', |
| 58 |
'You can also select from any host defined on your network (preferred), or specify ', |
| 59 |
'the IP address of the machine your Tftp server is running on.', |
| 60 |
); |
| 61 |
@@ -351,23 +351,23 @@ sub showPXEGlobals($) |
| 62 |
{ |
| 63 |
if ($config->get('tftpd')->prop('status') ne 'enabled') |
| 64 |
{ |
| 65 |
- print $q->p ({-CLASS => "sme-noborders"}, |
| 66 |
+ print $q->p ({-CLASS => "sme-norborders"}, |
| 67 |
$q->p ('<B>WARNING:</B> a tftp server is required to supply the boot image to your workstations.<BR> ', |
| 68 |
- 'TFTP is currently disabled, but will be enabled when you enable ThinClient booting.')); |
| 69 |
+ 'TFTP is currently disabled, but will be enabled when you enable PXE Boot Server (you will need to click Apply above).')); |
| 70 |
} |
| 71 |
} |
| 72 |
else |
| 73 |
{ |
| 74 |
print $q->p ({-CLASS => "sme-noborders"}, |
| 75 |
$q->p ('<B>WARNING:</B> a tftp server is required to supply the boot image to your workstations.<BR> ', |
| 76 |
- 'I can\'t find any settings for TFTP, so can only assume you are managing this!')); |
| 77 |
+ 'I can\'t find any settings for TFTP, so can only assume that you are managing this!')); |
| 78 |
} |
| 79 |
} |
| 80 |
|
| 81 |
# --- DHCPD Status (if not turned on issue a warning) |
| 82 |
if ($config->get('dhcpd')->prop('status') ne 'enabled') |
| 83 |
{ |
| 84 |
- print $q->p ({-CLASS => "sme-noborders"}, |
| 85 |
+ print $q->p ({-CLASS => "sme-norborders"}, |
| 86 |
$q->p ('<B>WARNING:</B> all this information is supplied to your workstations via DHCP.<BR> ', |
| 87 |
'DHCP is currently disabled, and none of this will work until you enable it!')); |
| 88 |
} |
| 89 |
@@ -914,9 +914,18 @@ sub saveConfiguration ($) |
| 90 |
|
| 91 |
if (system ("/sbin/e-smith/signal-event thinclient-conf > /var/log/thinclient.log 2>&1")) |
| 92 |
{ |
| 93 |
- showInitial($q, "error", "Error occurred during thinclient-update event.", "/var/log/thinclient.log"); |
| 94 |
+ showInitial($q, "error", "Error occurred during thinclient-conf event.", "/var/log/thinclient.log"); |
| 95 |
return; |
| 96 |
} |
| 97 |
+ # If we are using the tftp server locally trigger a tftpd reconfiguration |
| 98 |
+ if ($tftpserver eq "Self") |
| 99 |
+ { |
| 100 |
+ if (system ("/sbin/e-smith/signal-event tftpd-conf > /var/log/thinclient.log 2>&1")) |
| 101 |
+ { |
| 102 |
+ showInitial($q, "error", "Error occurred during ttftpd-conf event.", "/var/log/thinclient.log"); |
| 103 |
+ return; |
| 104 |
+ } |
| 105 |
+ } |
| 106 |
|
| 107 |
showInitial ($q, "success", "ThinClient parameters successfully updated.", ""); |
| 108 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
