diff options
| author | Oliver Tappe | 2008-01-11 13:21:30 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2008-01-11 13:21:30 +0100 |
| commit | 89773c294389297cee33ae3e8a66a0d4c528b69e (patch) | |
| tree | 556168bbace2f7b87862e9aec9ab7b4343ace19f /config-db | |
| parent | * oops, remove debug output :-/ (diff) | |
| download | core-89773c294389297cee33ae3e8a66a0d4c528b69e.tar.gz core-89773c294389297cee33ae3e8a66a0d4c528b69e.tar.xz core-89773c294389297cee33ae3e8a66a0d4c528b69e.zip | |
* fixed encoding problem of PXE-config file output
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1463 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
| -rwxr-xr-x | config-db/slxconfig-demuxer | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config-db/slxconfig-demuxer b/config-db/slxconfig-demuxer index a57d3b50..f1cfd41e 100755 --- a/config-db/slxconfig-demuxer +++ b/config-db/slxconfig-demuxer @@ -382,6 +382,8 @@ sub writePXEMenus $pxeTemplate .= slurpFile($pxeThemeConfig); } +print "$pxeTemplate\n"; + # fetch info about margin and replace the corresponding placeholders my $margin = $openslxConfig{'pxe-theme-menu-margin'} || 0; my $marginAsText = ' ' x $margin; @@ -450,10 +452,7 @@ sub writePXEMenus # PXE uses 'cp850' (codepage 850) but our string is in utf-8, we have # to convert in order to avoid showing gibberish on the client side... - use Encode 'from_to'; - from_to($pxeConfig, 'utf-8', 'cp850'); - - spitFile($pxeFile, $pxeConfig); + spitFile($pxeFile, $pxeConfig, { 'io-layer' => 'encoding(cp850)' } ); } return; } |