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
db9b4e6d
Commit
db9b4e6d
authored
May 02, 2018
by
Igor Pecovnik
Browse files
Another bugfix - failed desktop detection
parent
7211f4f9
Changes
2
Show whitespace changes
Inline
Side-by-side
debian-config-functions
View file @
db9b4e6d
...
...
@@ -41,6 +41,12 @@ function main(){
[[
-z
"
${
DEFAULT_ADAPTER
//
}
"
]]
&&
DEFAULT_ADAPTER
=
"lo"
OVERLAYDIR
=
"/boot/dtb/overlay"
;
[[
"
$LINUXFAMILY
"
==
"sunxi64"
]]
&&
OVERLAYDIR
=
"/boot/dtb/allwinner/overlay"
;
# detect desktop
DISPLAY_MANAGER
=
""
;
DESKTOP_INSTALLED
=
""
check_if_installed nodm
&&
DESKTOP_INSTALLED
=
"nodm"
;
check_if_installed lightdm
&&
DESKTOP_INSTALLED
=
"lightdm"
;
[[
-n
$(
service lightdm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"lightdm"
[[
-n
$(
service nodm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"nodm"
dialog
--backtitle
"
$BACKTITLE
"
--title
"Please wait"
--infobox
"
\n
Loading Armbian configuration utility ... "
5 45
sleep
1
...
...
debian-config-submenu
View file @
db9b4e6d
...
...
@@ -21,14 +21,6 @@ while true; do
LIST
=()
# detect desktop
DISPLAY_MANAGER
=
""
;
DESKTOP_INSTALLED
=
""
check_if_installed nodm
&&
DESKTOP_INSTALLED
=
"nodm"
;
check_if_installed lightdm
&&
DESKTOP_INSTALLED
=
"lightdm"
;
[[
-n
$(
service lightdm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"lightdm"
[[
-n
$(
service nodm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"nodm"
local
mark
=
$(
apt-mark showhold |
grep
-w
"
$BOARD
"
)
[[
$(
sed
-n
's/^DEVNAME=//p'
/sys/dev/block/
$(
mountpoint
-d
/
)
/uevent 2> /dev/null
)
==
mmcblk
*
&&
-f
/usr/sbin/nand-sata-install
]]
\
...
...
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