projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove /usr/share/grml-terminalserver/discover-nic from debian/overrides
[grml-terminalserver.git]
/
grml-terminalserver-config
diff --git
a/grml-terminalserver-config
b/grml-terminalserver-config
index
9417c86
..
194ad98
100755
(executable)
--- a/
grml-terminalserver-config
+++ b/
grml-terminalserver-config
@@
-397,9
+397,8
@@
Quite usefull examples:
ssh=<pw> - Start ssh server and set password of user grml to pw
services=<1,2,3> - Execute /etc/init.d/{1,2,3} start
ssh=<pw> - Start ssh server and set password of user grml to pw
services=<1,2,3> - Execute /etc/init.d/{1,2,3} start
-console=ttyS0,9600n8 - Initialise seriell console
-secure - Boot only restricted clients (without root permissions)
-startx - Boot into X (should be used with secure)
+console=ttyS0,9600n8 - Initialise serial console
+startx - Boot into X
"
"
@@
-530,14
+529,14
@@
title Load config from Tftp server
EOT
#execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read
if [ -x /usr/bin/gcc-3.4 ] ; then
EOT
#execute "./configure --enable-diskless --enable-preset-menu=./preset-menu $cmd_line_" warn || read
if [ -x /usr/bin/gcc-3.4 ] ; then
- CC='gcc-3.4'
+
export
CC='gcc-3.4'
else # assume we have gcc-3.3
else # assume we have gcc-3.3
- CC='gcc-3.3'
+
export
CC='gcc-3.3'
fi
fi
- [ -r /lib64 ] && CC="$CC -m32"
+ [ -r /lib64 ] &&
export
CC="$CC -m32"
-
execute "CC=$CC
./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
-
execute "make -j2 CC=$CC
" warn || read #return 1
+
CC="$CC" execute "
./configure --enable-preset-menu=./preset-menu $cmd_line_" warn || read
+
CC="$CC" execute "make -j2
" warn || read #return 1
local st1_="stage1/stage1"
local st2_="stage2/stage2"
local st1_="stage1/stage1"
local st2_="stage2/stage2"