Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Config
Commits
edb53941
Commit
edb53941
authored
Nov 08, 2019
by
Igor Pecovnik
Browse files
Merge minimal and default desktop to limit troubles
parent
a6d6506e
Changes
2
Show whitespace changes
Inline
Side-by-side
debian-config-jobs
View file @
edb53941
...
...
@@ -999,14 +999,10 @@ function jobs ()
fi
;;
"
Minimal
"
)
"
Default
"
)
configure_desktop
"--install-recommends"
;;
"Default"
)
configure_desktop
"--install-suggests"
;;
"RDP"
)
if
[[
-n
$(
service xrdp status |
grep
-w
active
)
]]
;
then
systemctl stop xrdp.service
>
/dev/null 2>&1
...
...
debian-config-submenu
View file @
edb53941
...
...
@@ -96,22 +96,13 @@ while true; do
# desktop
if
[[
-n
$DISPLAY_MANAGER
]]
;
then
LIST+
=(
"Desktop"
"Disable desktop or change login type"
)
if
!
check_if_installed mpv
;
then
LIST+
=(
"Default"
"Install desktop with browser and extras"
)
fi
else
if
[[
-n
$DESKTOP_INSTALLED
]]
;
then
LIST+
=(
"Desktop"
"Enable desktop"
)
if
!
check_if_installed mpv
;
then
LIST+
=(
"Default"
"Install desktop with browser and extras"
)
fi
else
LIST+
=(
"Minimal"
"Install minimal desktop"
)
if
!
check_if_installed mpv
;
then
LIST+
=(
"Default"
"Install desktop with browser and extras"
)
fi
fi
fi
# overlayroot
if
[[
"
$DISTRO
"
==
"Ubuntu"
&&
"
$(
modinfo overlay
>
/dev/null 2>&1
;
echo
$?
)
"
==
"0"
]]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment