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
550fcdfd
Commit
550fcdfd
authored
Oct 29, 2017
by
Igor Pecovnik
Browse files
Bugfix. Forgot that arm64 has soc vendor in directory name
parent
7c9b52ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
debian-config-jobs
View file @
550fcdfd
...
@@ -753,7 +753,6 @@ function jobs ()
...
@@ -753,7 +753,6 @@ function jobs ()
overlay_prefix
=
$(
cat
/boot/armbianEnv.txt |
grep
overlay_prefix |
sed
's/overlay_prefix=//g'
)
overlay_prefix
=
$(
cat
/boot/armbianEnv.txt |
grep
overlay_prefix |
sed
's/overlay_prefix=//g'
)
TARGET_BRANCH
=
$BRANCH
TARGET_BRANCH
=
$BRANCH
exceptions
"
$BRANCH
"
exceptions
"
$BRANCH
"
HOME
=
"/boot/dtb/allwinner/overlay"
MOTD
=()
MOTD
=()
LINES
=()
LINES
=()
LIST_CONST
=
-3
LIST_CONST
=
-3
...
@@ -767,7 +766,7 @@ function jobs ()
...
@@ -767,7 +766,7 @@ function jobs ()
MOTD+
=(
"
$line
"
"
$DESC
"
"
$STATUS
"
)
MOTD+
=(
"
$line
"
"
$DESC
"
"
$STATUS
"
)
LINES[
$j
]=
$line
LINES[
$j
]=
$line
((
j++
))
((
j++
))
done
< <
(
ls
-1
${
HOME
}
/
${
overlay_prefix
}*
.dtbo |
sed
's/^.*\('
${
overlay_prefix
}
'.*\)/\1/g'
|
sed
's/'
${
overlay_prefix
}
'-//g'
|
sed
's/.dtbo//g'
)
done
< <
(
ls
-1
${
OVERLAYDIR
}
/
${
overlay_prefix
}*
.dtbo |
sed
's/^.*\('
${
overlay_prefix
}
'.*\)/\1/g'
|
sed
's/'
${
overlay_prefix
}
'-//g'
|
sed
's/.dtbo//g'
)
LISTLENGHT
=
"
$((
$LIST_CONST
+
${#
MOTD
[@]
}
/
2
))
"
LISTLENGHT
=
"
$((
$LIST_CONST
+
${#
MOTD
[@]
}
/
2
))
"
...
...
debian-config-submenu
View file @
550fcdfd
...
@@ -522,7 +522,7 @@ while true; do
...
@@ -522,7 +522,7 @@ while true; do
[[
-f
/boot/armbianEnv.txt
]]
&&
LIST+
=(
"Bootenv"
"Edit boot environment"
)
[[
-f
/boot/armbianEnv.txt
]]
&&
LIST+
=(
"Bootenv"
"Edit boot environment"
)
[[
-f
/boot/boot.ini
]]
&&
LIST+
=(
"Bootscript"
"Edit boot script"
)
[[
-f
/boot/boot.ini
]]
&&
LIST+
=(
"Bootscript"
"Edit boot script"
)
[[
-d
/boot/dtb/allwinner/overlay
]]
&&
\
[[
-d
${
OVERLAYDIR
}
]]
&&
\
LIST+
=(
"Hardware"
"Toggle hardware configuration: UART, I2C, etc."
)
LIST+
=(
"Hardware"
"Toggle hardware configuration: UART, I2C, etc."
)
[[
-f
/usr/bin/bin2fex
&&
"
$LINUXFAMILY
"
=
sun
*
i
&&
"
$BRANCH
"
=
"default"
]]
&&
LIST+
=(
"Fexedit"
"Board (fex) settings editor"
)
[[
-f
/usr/bin/bin2fex
&&
"
$LINUXFAMILY
"
=
sun
*
i
&&
"
$BRANCH
"
=
"default"
]]
&&
LIST+
=(
"Fexedit"
"Board (fex) settings editor"
)
[[
$(
apt-cache search
--names-only
'^linux-'
$(
lsb_release
-cs
)
'-root.*.'
$BOARD
''
|
sed
's/.*(\(.*\))/\1/'
|
awk
'{print $1}'
\
[[
$(
apt-cache search
--names-only
'^linux-'
$(
lsb_release
-cs
)
'-root.*.'
$BOARD
''
|
sed
's/.*(\(.*\))/\1/'
|
awk
'{print $1}'
\
...
@@ -785,6 +785,7 @@ check_if_installed bluetooth nodm && DESKTOP_INSTALLED="nodm";
...
@@ -785,6 +785,7 @@ check_if_installed bluetooth nodm && DESKTOP_INSTALLED="nodm";
check_if_installed bluetooth lightdm
&&
DESKTOP_INSTALLED
=
"lightdm"
;
check_if_installed bluetooth lightdm
&&
DESKTOP_INSTALLED
=
"lightdm"
;
[[
-n
$(
service lightdm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"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"
[[
-n
$(
service nodm status 2> /dev/null |
grep
-w
active
)
]]
&&
DISPLAY_MANAGER
=
"nodm"
OVERLAYDIR
=
"/boot/dtb/overlay"
;
[[
"
$LINUXFAMILY
"
==
"sunxi64"
]]
&&
OVERLAYDIR
=
"/boot/dtb/allwinner/overlay"
;
dialog
--backtitle
"
$BACKTITLE
"
--title
"Please wait"
--infobox
"
\n
Loading Armbian configuration utility ... "
5 45
dialog
--backtitle
"
$BACKTITLE
"
--title
"Please wait"
--infobox
"
\n
Loading Armbian configuration utility ... "
5 45
sleep
1
sleep
1
\ No newline at end of file
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