|
|
|
@ -78,11 +78,6 @@ chop($host = `uname -n`);
|
|
|
|
|
# Create the user's vnc directory if necessary.
|
|
|
|
|
&CreateDotVncDir();
|
|
|
|
|
|
|
|
|
|
$selectDeCmd = "builder/startup/deb/select-de.sh";
|
|
|
|
|
if (!$skipxstartup) {
|
|
|
|
|
system($selectDeCmd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Find display number.
|
|
|
|
|
if ((@ARGV > 0) && ($ARGV[0] =~ /^:(\d+)$/)) {
|
|
|
|
|
$displayNumber = $1;
|
|
|
|
@ -951,3 +946,10 @@ sub CreateDotVncDir {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sub AskUserToChooseDeOrManualXstartup {
|
|
|
|
|
$selectDeCmd = "builder/startup/deb/select-de.sh";
|
|
|
|
|
if (!$skipxstartup) {
|
|
|
|
|
system($selectDeCmd) == 0 || die("Failed to execute $selectDeCmd\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|