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
241be4a3
Commit
241be4a3
authored
Apr 27, 2019
by
Igor Pecovnik
Browse files
Enable support for Meson64 overlays withing armbian-config -> hardware
parent
2fb07359
Changes
2
Show whitespace changes
Inline
Side-by-side
debian-config-functions
View file @
241be4a3
...
@@ -46,6 +46,7 @@ function main(){
...
@@ -46,6 +46,7 @@ function main(){
[[
-z
"
${
DEFAULT_ADAPTER
//
}
"
]]
&&
DEFAULT_ADAPTER
=
"lo"
[[
-z
"
${
DEFAULT_ADAPTER
//
}
"
]]
&&
DEFAULT_ADAPTER
=
"lo"
OVERLAYDIR
=
"/boot/dtb/overlay"
;
OVERLAYDIR
=
"/boot/dtb/overlay"
;
[[
"
$LINUXFAMILY
"
==
"sunxi64"
]]
&&
OVERLAYDIR
=
"/boot/dtb/allwinner/overlay"
;
[[
"
$LINUXFAMILY
"
==
"sunxi64"
]]
&&
OVERLAYDIR
=
"/boot/dtb/allwinner/overlay"
;
[[
"
$LINUXFAMILY
"
==
"meson64"
]]
&&
OVERLAYDIR
=
"/boot/dtb/amlogic/overlay"
;
# detect desktop
# detect desktop
check_desktop
check_desktop
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
...
...
debian-config-jobs
View file @
241be4a3
...
@@ -1073,12 +1073,10 @@ function jobs ()
...
@@ -1073,12 +1073,10 @@ function jobs ()
((
j++
))
((
j++
))
done
< <
(
ls
-1
${
OVERLAYDIR
}
/
${
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'
)
LISTLENGTH
=
"
$((
$LIST_CONST
+
${#
MOTD
[@]
}
/
2
))
"
exec
3>&1
exec
3>&1
selection
=
$(
dialog
--backtitle
"
$BACKTITLE
"
--colors
--title
"Toggle hardware configuration"
--clear
--cancel-label
\
selection
=
$(
dialog
--backtitle
"
$BACKTITLE
"
--colors
--title
"Toggle hardware configuration"
--clear
--cancel-label
\
"Back"
--ok-label
"Save"
--checklist
"
\n
Use
\Z
1<space>
\Z
0 to toggle functions and save them. Exit when you are done.
\n
"
\
"Back"
--ok-label
"Save"
--checklist
"
\n
Use
\Z
1<space>
\Z
0 to toggle functions and save them. Exit when you are done.
\n
"
\
$LISTLENGTH
80
$LISTLENGTH
"
${
MOTD
[@]
}
"
2>&1 1>&3
)
0 0 0
"
${
MOTD
[@]
}
"
2>&1 1>&3
)
exit_status
=
$?
exit_status
=
$?
exec
3>&-
exec
3>&-
...
...
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