Merge branch 'devel'

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## raspberrypi-ua-netinst v2.1.0
+
+- moved `cpufrequtils` from base to minimal preset
+- added or changed configuration variables
+  - set root partition label
+  - set installation retries
+  - set network timeout
+  - set package update retries
+  - set package download retries
+  - **removed** `ip_broadcast` will be calculated from `ip_addr` and `ip_netmask`
+- improved memory usage
+- fix compatibility with 1B models with only 256 MB memory (revision 0002)
+- detect and assign missing `ip_netmask` if `ip_addr` is in a private subnet
+
+**Bugfixes:**
+
+- fix RTC support
+- fix custom wpa_supplicant.conf
+
 ## raspberrypi-ua-netinst v2.0.0
 
 - support for Debian 9 (stretch)

README.md

@@ -1,4 +1,4 @@
-# raspberrypi-ua-netinst [![Issue Count](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst/badges/issue_count.svg)](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst) [![Code Climate](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst/badges/gpa.svg)](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst)
+# raspberrypi-ua-netinst [![Issue Count](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst/badges/issue_count.svg)](https://codeclimate.com/github/FooDeas/raspberrypi-ua-netinst)
 
 - [Intro](#intro)
 - [Requirements](#requirements)

build.sh

@@ -194,12 +194,15 @@ function create_cpio {
 		mkdir -p "rootfs/lib/modules/${kernel}/kernel/drivers/i2c/busses"
 	done
 	cp_kernelfiles tmp/lib/modules/kernel*/kernel/drivers/i2c/busses/i2c-bcm2708.ko rootfs/lib/modules/kernel*/kernel/drivers/i2c/busses/
+	cp_kernelfiles tmp/lib/modules/kernel*/kernel/drivers/i2c/busses/i2c-bcm2835.ko rootfs/lib/modules/kernel*/kernel/drivers/i2c/busses/
 
 	# copy rtc drivers
 	for kernel in "${kernels[@]}"; do
 		mkdir -p "rootfs/lib/modules/${kernel}/kernel/drivers"
+		mkdir -p "rootfs/lib/modules/${kernel}/kernel/drivers/hwmon"
 	done
 	cp_kernelfiles tmp/lib/modules/kernel*/kernel/drivers/rtc rootfs/lib/modules/kernel*/kernel/drivers/
+	cp_kernelfiles tmp/lib/modules/kernel*/kernel/drivers/hwmon/hwmon.ko rootfs/lib/modules/kernel*/kernel/drivers/hwmon/
 
 	# create dependency lists
 	for kernel in "${kernels[@]}"; do
@@ -725,6 +728,7 @@ mv raspberrypi-ua-netinst.cpio.gz bootfs/raspberrypi-ua-netinst/
 {
 	echo "[all]"
 	echo "initramfs raspberrypi-ua-netinst/raspberrypi-ua-netinst.cpio.gz"
+	echo "gpu_mem=16"
 	echo "[pi3]"
 	echo "enable_uart=1"
 } >> bootfs/config.txt

config/apt/custom_sources.txt

@@ -7,9 +7,9 @@
 #   Place a file with the extension ".pref" in this folder containing the package preferences.
 #   It will be placed in "/etc/apt/preferences.d/" by the installer.
 #   If you use the string "__RELEASE__" in this file, it will be replaced with the content of the "release" option.
-# To add a key:
-#   Place a file with the extension ".key" in this folder containing the key.
+# To add a repository key:
+#   Place a file with the extension ".key" in this folder containing the repository key.
 #   It will be imported by the installer.
-# To add a gpg:
+# To add a keyring:
 #   Place a file with the extension ".gpg" in this folder containing the keyring.
 #   It will be placed in "/etc/apt/trusted.gpg.d/" by the installer.

doc/INSTALL_ADVANCED.md

@@ -47,8 +47,8 @@ Configuration files have to be placed as follows:
 | `/raspberrypi-ua-netinst/config/post-install.txt` | Post installation script |
 | `/raspberrypi-ua-netinst/config/wpa_supplicant.conf` | WiFi configuration file |
 | `/raspberrypi-ua-netinst/config/files/<listname>.list` | List(s) of additional files |
-| `/raspberrypi-ua-netinst/config/installer-retries.txt` | Number of installation retries |
 | `/raspberrypi-ua-netinst/config/files/root/[folder/][filename]` | Listed additional files |
+| `/raspberrypi-ua-netinst/installer-retries.txt` | Number of installation retries |
 | `/raspberrypi-ua-netinst/rcS` | Custom installer script |
 
 ### Bring your own files

doc/INSTALL_CUSTOM.md

@@ -25,9 +25,9 @@
 
 | Preset | Packages |
 |---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `base` | _\<essential\>,apt,cpufrequtils,kmod,raspbian-archive-keyring_ |
-| `minimal` | _\<base\>,fake-hwclock,ifupdown,net-tools,ntp,openssh-server,dosfstools,raspberrypi-sys-mods_ |
-| `server` | _\<minimal\>,vim-tiny,iputils-ping,wget,ca-certificates,rsyslog,cron,dialog,locales,tzdata,less,man-db,logrotate,bash-completion,console-setup,apt-utils,libraspberrypi-bin,raspi-copies-and-fills_ |
+| `base` | _\<essential\>,apt,kmod_ |
+| `minimal` | _\<base\>,cpufrequtils,fake-hwclock,ifupdown,net-tools,ntp,openssh-server,dosfstools,raspberrypi-sys-mods_ |
+| `server` | _\<minimal\>,systemd-sysv,vim-tiny,iputils-ping,wget,ca-certificates,rsyslog,cron,dialog,locales,tzdata,less,man-db,logrotate,bash-completion,console-setup,apt-utils,libraspberrypi-bin,raspi-copies-and-fills_ |
 
 ## Device / peripheral
 
@@ -77,11 +77,10 @@
 | `wlan_country` |  | [ref: doc/wlan_country.txt](/doc/wlan_country.txt) | Sets the country code for the WiFi interface. |
 | `wlan_ssid` |  |  | Sets SSID for WiFi authentication if no 'wpa_supplicant.conf' is provided. |
 | `wlan_psk` |  |  | Sets PSK for Wifi authentication if no 'wpa_supplicant.conf' is provided. |
-| `ip_addr` | `dhcp` |  | Use "dhcp" to let the network DHCP server dynamically assign an IP-address or specify a static IP-address (e.g. 192.168.2.50). |
-| `ip_netmask` | `0.0.0.0` |  | Network mask (e.g. 255.255.255.0) |
-| `ip_broadcast` | `0.0.0.0` |  | Broadcast address |
-| `ip_gateway` | `0.0.0.0` |  | Gateway address (e.g. 192.168.2.1) |
-| `ip_nameservers` |  |  | DNS nameservers (e.g. 8.8.8.8) |
+| `ip_addr` | `dhcp` |  | Use "dhcp" to let the network DHCP server dynamically assign an IP-address or specify a static IP-address (e.g. '192.168.2.50'). |
+| `ip_netmask` |  |  | Network mask (e.g. '255.255.255.0') |
+| `ip_gateway` |  |  | Gateway address (e.g. '192.168.2.1') |
+| `ip_nameservers` |  |  | DNS nameservers (e.g. '8.8.8.8') |
 | `ip_ipv6` | `1` | `0`/`1` | Set to "0" to disable IPv6. |
 
 ## Localization
@@ -111,8 +110,9 @@
 |---------------------|---------|---------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `usbroot` | `0` | `0`/`1` | Set to "1" to install to first USB disk. |
 | `usbboot` | `0` | `0`/`1` | Set to "1" to boot from first USB disk. This is usually used with 'usbroot=1' and works with model 3 (BCM2837) only. If this is used for the first time, it has to be done from SD-card and the system will shut down after success. Then the SD-card has to be removed before rebooting. |
-| `rootfstype` | f2fs | `ext4`/  `f2fs`/  `btrfs` | Sets the file system of the root partition. |
+| `rootfstype` | `f2fs` | `ext4`/  `f2fs`/  `btrfs` | Sets the file system of the root partition. |
 | `boot_volume_label` |  |  | Sets the volume name of the boot partition. The volume name can be up to 11 characters long. The label is used by most OSes (Windows, Mac OSX and Linux) to identify the SD-card on the desktop and can be useful when using multiple SD-cards. |
+| `root_volume_label` |  |  | Sets the volume name of the root partition. The volume name can be up to 16 characters long. |
 | `bootsize` | `+128M` |  | /boot partition size in megabytes, provide it in the form '+\<number\>M' (without quotes) |
 | `bootoffset` | `8192` |  | position in sectors where the boot partition should start. Valid values are > 2048. a bootoffset of 8192 is equal to 4MB and that should make for proper alignment |
 
@@ -129,6 +129,10 @@
 | `rootfs_install_mount_options` |  |  |  |
 | `rootfs_mount_options` |  |  |  |
 | `final_action` | `reboot` | `reboot`/  `poweroff`/  `halt`/  `console` | Action at the end of install. |
+| `installer_retries` | `3` |  | Number of retries if installation fails. |
+| `installer_networktimeout` | `15` |  | Timeout in seconds for network interface initialization. |
+| `installer_pkg_updateretries` | `3` |  | Number of retries if package update fails. |
+| `installer_pkg_downloadretries` | `5` |  | Number of retries if package download fails. |
 | `hwrng_support` | `1` | `0`/`1` | Install support for the ARM hardware random number generator. The default is enabled (1) on all presets. Users requiring a `base` install are advised that `hwrng_support=0` must be added in `installer-config.txt` if HWRNG support is undesirable. |
 | `watchdog_enable` | `0` | `0`/`1` | Set to "1" to enable and use the hardware watchdog. |
 | `cdebootstrap_cmdline` |  |  |  |