Merge branch 'bbmaster'

milkpirate · May 11, 2022 · 43c649d · 43c649d
2 parents 22c853b + 05f1b2a
commit 43c649d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/bootstrap/00-kernel b/bootstrap/00-kernel
@@ -3,6 +3,7 @@
 set -xe
 
 apk add --update linux-rpi linux-rpi4 raspberrypi-bootloader zram-init
+rc-update add zram-init boot
 
 echo "modules=loop,squashfs,sd-mod,usb-storage root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes console=tty1 rootwait quiet" > /boot/cmdline.txt
 

diff --git a/bootstrap/01-system b/bootstrap/01-system
@@ -21,4 +21,5 @@ setup-timezone -z $TARGET_TIMEZONE
 # other stuff
 apk add openssh nano htop curl wget bash bash-completion findutils
 sed -i 's/\/bin\/ash/\/bin\/bash/g' /etc/passwd
+
 echo "ipv6" >> /etc/modules
diff --git a/bootstrap/03-networking b/bootstrap/03-networking
@@ -22,6 +22,7 @@ iface lo inet loopback
 
 auto eth0
 iface eth0 inet dhcp
+iface eth0 inet6 auto
 
 auto wlan0
 iface wlan0 inet dhcp

diff --git a/bootstrap/04-services b/bootstrap/04-services
@@ -12,7 +12,7 @@ for service in modules sysctl hostname bootmisc swclock syslog; do
 	rc-update add $service boot
 done
 
-for service in dbus haveged sshd chronyd local networking avahi-daemon bluetooth wpa_supplicant wpa_cli; do
+for service in sshd haveged sshd chronyd local networking; do
 	rc-update add $service default
 done