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
91d7e359
"git@web.lueluesay.top:root/oh-my-zsh.git" did not exist on "5fbf9120935af9b5e81b72f942be09891c6e508f"
Commit
91d7e359
authored
Aug 06, 2017
by
Igor Pecovnik
Browse files
Headers package toggle, DT overlay configuraor, small bugfixes
parent
9ed9018f
Changes
1
Show whitespace changes
Inline
Side-by-side
debian-config
View file @
91d7e359
...
@@ -292,12 +292,14 @@ while true; do
...
@@ -292,12 +292,14 @@ while true; do
[[
-f
/usr/bin/armbianmonitor
]]
&&
LIST+
=(
"Monitor"
"Simple CLI monitoring"
)
[[
-f
/usr/bin/armbianmonitor
]]
&&
LIST+
=(
"Monitor"
"Simple CLI monitoring"
)
[[
-f
/usr/bin/armbianmonitor
]]
&&
LIST+
=(
"Diagnostics"
"Send diagnostics"
)
[[
-f
/usr/bin/armbianmonitor
]]
&&
LIST+
=(
"Diagnostics"
"Send diagnostics"
)
[[
-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"
)
if
[[
-n
$(
dpkg
-l
|
grep
linux-headers
)
]]
;
then
LIST+
=(
"Headers"
"Remove kernel headers"
)
;
else
LIST+
=(
"Headers"
"Install kernel headers"
)
;
fi
[[
-n
$(
grep
-w
"#kernel.printk"
/etc/sysctl.conf
)
]]
&&
LIST+
=(
"Lowlevel"
"Stop low-level messages on console"
)
[[
-n
$(
grep
-w
"#kernel.printk"
/etc/sysctl.conf
)
]]
&&
LIST+
=(
"Lowlevel"
"Stop low-level messages on console"
)
[[
-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"
)
LIST+
=(
"Network"
"Edit network settings"
)
LIST+
=(
"Network"
"Edit network settings"
)
LIST+
=(
"-"
""
)
LIST+
=(
"-"
""
)
LIST+
=(
"Services"
"Toggle running services"
)
LIST+
=(
"Services"
"Toggle running services"
)
[[
-d
/boot/dtb/overlay
&&
$LINUXFAMILY
==
sunxi
&&
$BRANCH
!=
default
]]
&&
LIST+
=(
"Overlay"
"Toggle hardware functions: UART, I2C, SPI, W1, ..."
)
LIST+
=(
"Welcome"
"Toggle welcome screen items"
)
LIST+
=(
"Welcome"
"Toggle welcome screen items"
)
if
[[
-z
$(
apt-mark showhold |
grep
-w
"
$BOARD
"
)
]]
;
then
if
[[
-z
$(
apt-mark showhold |
grep
-w
"
$BOARD
"
)
]]
;
then
[[
-f
/etc/apt/sources.list.d/armbian.list
]]
&&
[[
-n
$(
grep
-w
apt /etc/apt/sources.list.d/armbian.list
)
]]
\
[[
-f
/etc/apt/sources.list.d/armbian.list
]]
&&
[[
-n
$(
grep
-w
apt /etc/apt/sources.list.d/armbian.list
)
]]
\
...
@@ -345,6 +347,55 @@ while true; do
...
@@ -345,6 +347,55 @@ while true; do
case
$selection
in
case
$selection
in
# Toggle welcome screen items
#
"Overlay"
)
# check if user agree to enter this area
beta_disclaimer
"You are entering beta area. Functions are not yet done - in case of troubles and advanced usage, check https://docs.armbian.com"
if
[[
-n
$ACKNOWLEDGEMENT
]]
;
then
overlay_prefix
=
$(
cat
/boot/armbianEnv.txt |
grep
overlay_prefix |
sed
's/overlay_prefix=//g'
)
TARGET_BRANCH
=
$BRANCH
exceptions
"
$BRANCH
"
while
true
;
do
HOME
=
"/boot/dtb/overlay"
MOTD
=()
LINES
=()
LIST_CONST
=
2
j
=
0
DIALOG_CANCEL
=
1
DIALOG_ESC
=
255
while
read
line
do
STATUS
=
$(
[[
-n
$(
cat
/boot/armbianEnv.txt |
grep
overlays |
grep
-w
${
line
}
)
]]
&&
echo
"on"
)
DESC
=
$(
description
"
$line
"
)
MOTD+
=(
"
$line
"
"
$DESC
"
"
$STATUS
"
)
LINES[
$j
]=
$line
((
j++
))
done
< <
(
ls
-1
$HOME
/
${
overlay_prefix
}*
.dtbo |
sed
's/^.*\('
${
overlay_prefix
}
'.*\)/\1/g'
|
sed
's/'
${
overlay_prefix
}
'-//g'
|
sed
's/.dtbo//g'
)
LISTLENGHT
=
"
$((
$LIST_CONST
+
${#
MOTD
[@]
}
/
2
))
"
exec
3>&1
selection
=
$(
dialog
--backtitle
"
$BACKTITLE
"
--title
"Toggle motd executing scripts"
--clear
--cancel-label
\
"Exit"
--ok-label
"Save"
--checklist
"
\n
Choose what you want to enable or disable:
\n
"
\
$LISTLENGHT
70 22
"
${
MOTD
[@]
}
"
2>&1 1>&3
)
exit_status
=
$?
exec
3>&-
case
$exit_status
in
$DIALOG_CANCEL
|
$DIALOG_ESC
)
break
;;
0
)
newoverlays
=
"
$(
echo
"
$selection
"
|
sed
"s|[^ ]* *|&|g"
)
"
sed
-i
"s/^overlays=.*/overlays=
$newoverlays
/"
/boot/armbianEnv.txt
||
cat
"overlays=
$newoverlays
"
>>
/boot/armbianEnv.txt
;;
esac
done
fi
;;
# Toggle welcome screen items
# Toggle welcome screen items
#
#
"Welcome"
)
"Welcome"
)
...
@@ -376,7 +427,7 @@ while true; do
...
@@ -376,7 +427,7 @@ while true; do
exec
3>&-
exec
3>&-
case
$exit_status
in
case
$exit_status
in
$DIALOG_CANCEL
|
$DIALOG_ESC
)
$DIALOG_CANCEL
|
$DIALOG_ESC
)
exit
1
break
;;
;;
0
)
0
)
chmod
-x
${
HOME
}*
chmod
-x
${
HOME
}*
...
@@ -408,8 +459,6 @@ while true; do
...
@@ -408,8 +459,6 @@ while true; do
;;
;;
"Nodm"
)
"Nodm"
)
systemctl disable lightdm.service
>
/dev/null 2>&1
systemctl disable lightdm.service
>
/dev/null 2>&1
systemctl stop lightdm.service
>
/dev/null 2>&1
systemctl stop lightdm.service
>
/dev/null 2>&1
...
@@ -474,6 +523,15 @@ while true; do
...
@@ -474,6 +523,15 @@ while true; do
dpkg-reconfigure tzdata
dpkg-reconfigure tzdata
;;
;;
"Headers"
)
TARGET_BRANCH
=
$BRANCH
exceptions
"
$BRANCH
"
if
[[
-n
$(
dpkg
-l
|
grep
linux-headers
)
]]
;
then
debconf-apt-progress
--
apt-get
-y
remove linux-headers
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
else
debconf-apt-progress
--
apt-get
-y
install
linux-headers
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
fi
;;
# Stop low-level messages on console
# Stop low-level messages on console
#
#
...
@@ -729,11 +787,9 @@ while true; do
...
@@ -729,11 +787,9 @@ while true; do
if
[[
$?
=
0
]]
;
then
if
[[
$?
=
0
]]
;
then
TARGET_BRANCH
=
$BRANCH
TARGET_BRANCH
=
$BRANCH
exceptions
"
$BRANCH
"
exceptions
"
$BRANCH
"
apt-mark
${
selection
,,
}
linux-image
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
linux-headers
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
\
PACKAGE_LIST
=
"linux-image
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
linux-headers
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
linux-u-boot-
${
BOARD
}
-
${
UBOOT_BRANCH
}
linux-
$(
lsb_release
-cs
)
-root
$TARGET_BRANCH
-
$BOARD
"
linux-u-boot-
${
BOARD
}
-
${
UBOOT_BRANCH
}
linux-
$(
lsb_release
-cs
)
-root
$TARGET_BRANCH
-
$BOARD
| dialog
--backtitle
"
$BACKTITLE
"
\
[[
$BRANCH
!=
"default"
]]
&&
PACKAGE_LIST
=
$PACKAGE_LIST
" linux-dtb
$TARGET_BRANCH
-
$TARGET_FAMILY
"
--title
"Package locking"
--progressbox
6 64
apt-mark
${
selection
,,
}
$PACKAGE_LIST
| dialog
--backtitle
"
$BACKTITLE
"
--title
"Package locking"
--progressbox
7 64
[[
$BRANCH
!=
"default"
]]
&&
apt-mark
${
selection
,,
}
linux-dtb
$TARGET_BRANCH
-
$TARGET_FAMILY
| dialog
--backtitle
"
$BACKTITLE
"
\
--title
"Package locking"
--progressbox
3 64
fi
fi
;;
;;
...
...
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