Merge pull request #1423 from RaspAP/maint/installer-raspbian12

Install dhcpcd dependencies for GNU/Linux 12 (bookworm) 32-bit
This commit is contained in:
Bill Zimmerman 2023-10-23 10:47:39 +02:00 committed by GitHub
commit c3935103bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions

View file

@ -228,6 +228,12 @@ function _install_dependencies() {
if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
dhcpcd_package="dhcpcd5"
iw_package="iw"
echo "${dhcpcd_package} and ${iw_package} will be installed from the main deb sources list"
fi
if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then
dhcpcd_package="dhcpcd dhcpcd-base"
echo "${dhcpcd_package} will be installed from the main deb sources list"
fi
# Set dconf-set-selections
@ -592,6 +598,14 @@ function _default_configuration() {
if [ ! -f "$webroot_dir/includes/config.php" ]; then
sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php"
fi
if [ ${OS,,} = "raspbian" ] && [[ ${RELEASE} =~ ^(12) ]]; then
echo "Moving dhcpcd systemd unit control file to /lib/systemd/system/"
sudo mv $webroot_dir/installers/dhcpcd.service /lib/systemd/system/ || _install_status 1 "Unable to move dhcpcd.service file"
sudo systemctl daemon-reload
sudo systemctl enable dhcpcd.service || _install_status 1 "Failed to enable raspap.service"
fi
_install_status 0
fi
}

14
installers/dhcpcd.service Normal file
View file

@ -0,0 +1,14 @@
[Unit]
Description=DHCP Client Daemon
Wants=network.target
Before=network-online.target
Documentation=man:dhcpcd(8)
[Service]
Type=forking
ExecStart=/usr/sbin/dhcpcd -b -q
Restart=always
[Install]
WantedBy=multi-user.target