forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

postmarketos-base: Enable NetworkManager by default (#388)

Browse source
This commit is contained in:
Martijn Braam 2018-03-04 12:07:21 +01:00 committed by Oliver Smith
parent ed03333008
commit 6caeba319e
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/postmarketos-base/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-base pkgname=postmarketos-base
pkgver=3 pkgver=3
pkgrel=14 pkgrel=15
pkgdesc="Meta package for minimal postmarketOS base" pkgdesc="Meta package for minimal postmarketOS base"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
arch="noarch" arch="noarch"
@ -21,13 +21,15 @@ depends="
tmux tmux
util-linux util-linux
wpa_supplicant wpa_supplicant
shadow" shadow
networkmanager"
makedepends="" makedepends=""
install="$pkgname.post-install" install="$pkgname.post-install"
subpackages="$pkgname-x11" subpackages="$pkgname-x11"
source=" source="
firmwareload.sh firmwareload.sh
50-firmware.rules 50-firmware.rules
networkmanager.conf
swapfile/swapfile swapfile/swapfile
swapfile/swapfile.init swapfile/swapfile.init
swapfile/swapfile.conf" swapfile/swapfile.conf"
@ -49,6 +51,9 @@ package() {
install -Dm755 "$srcdir"/swapfile.init \ install -Dm755 "$srcdir"/swapfile.init \
"$pkgdir"/etc/init.d/swapfile "$pkgdir"/etc/init.d/swapfile
install -D -m644 "$srcdir"/networkmanager.conf \
"$pkgdir"/etc/NetworkManager/conf.d/postmarketos.conf
} }
x11() { x11() {
@ -62,6 +67,7 @@ x11() {
sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af firmwareload.sh sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af firmwareload.sh
0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d 50-firmware.rules 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d 50-firmware.rules
f6750935cd304eb8c248f7bc65bed0c8bcd27c00bb8d0565f85ab8cfd5769cf5e8b1f27a7c851edc8236d80b014fb513e42951953fc403d8f47769776122e275 networkmanager.conf
3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 swapfile 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 swapfile
f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 swapfile.init f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 swapfile.init
e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 swapfile.conf" e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 swapfile.conf"

13
main/postmarketos-base/networkmanager.conf Normal file
View file

@ -0,0 +1,13 @@
[main]
plugins+=ifupdown
dhcp=dhcpcd
[ifupdown]
managed=true
[logging]
level=INFO
[device-mac-randomization]
wifi.scan-rand-mac-address=yes

10
main/postmarketos-base/postmarketos-base.post-install
View file

@ -11,7 +11,7 @@ done
for service in hwclock modules sysctl hostname bootmisc swclock syslog; do for service in hwclock modules sysctl hostname bootmisc swclock syslog; do
rc-update -q add $service boot rc-update -q add $service boot
done done
for service in dbus haveged sshd swapfile wpa_supplicant chronyd local; do for service in dbus haveged sshd swapfile wpa_supplicant chronyd local networkmanager wpa_supplicant; do
rc-update -q add $service default rc-update -q add $service default
done done
for service in mount-ro killprocs savecache; do for service in mount-ro killprocs savecache; do
@ -36,6 +36,7 @@ write_unless_modified() {
echo 'LABEL="pmOS_root" / ext4 relatime,data=ordered 0 1' echo 'LABEL="pmOS_root" / ext4 relatime,data=ordered 0 1'
echo 'LABEL="pmOS_boot" /boot auto defaults 0 2' echo 'LABEL="pmOS_boot" /boot auto defaults 0 2'
} | write_unless_modified /etc/fstab } | write_unless_modified /etc/fstab
# Set /etc/issue # Set /etc/issue
{ {
echo 'Welcome to postmarketOS' echo 'Welcome to postmarketOS'
@ -43,6 +44,7 @@ write_unless_modified() {
# setterm -powersave on -blank 5 # setterm -powersave on -blank 5
echo -ne "\033[9;5]" echo -ne "\033[9;5]"
} | write_unless_modified /etc/issue } | write_unless_modified /etc/issue
# Set /etc/motd # Set /etc/motd
{ {
echo 'Welcome to postmarketOS!' echo 'Welcome to postmarketOS!'
@ -56,6 +58,12 @@ write_unless_modified() {
echo '' echo ''
} | write_unless_modified /etc/motd } | write_unless_modified /etc/motd
# Change wpa_supplicant into dbus mode and enable both drivers
{
echo 'wpa_supplicant_args="-u -Dwext,nl80211"'
} | write_unless_modified /etc/conf.d/wpa_supplicant
touch /etc/wpa_supplicant/wpa_supplicant.conf
# Enable syslog to SHM. Note: size is 4048KiB, which *should* be More Than Enough(TM) for all but the most chattiest of devices. # Enable syslog to SHM. Note: size is 4048KiB, which *should* be More Than Enough(TM) for all but the most chattiest of devices.
sed s/=\"/=\""-C4048 "/ -i /etc/conf.d/syslog sed s/=\"/=\""-C4048 "/ -i /etc/conf.d/syslog