Added timeouts for our new services, bugfix for packaging

This commit is contained in:
Igor Pečovnik 2018-06-17 08:23:40 +00:00
parent a93aea9ecb
commit 09b313f860
7 changed files with 11 additions and 5 deletions

View File

@ -4,4 +4,5 @@
ENABLED=true
#
# size of the partition for ramlog in megabytes
SIZE=40
# 50 is minimum allowed size for BTRFS partition
SIZE=50

View File

@ -12,6 +12,7 @@ ConditionPathExists=/root/.not_logged_in_yet
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/lib/armbian/armbian-firstrun-config
TimeoutStartSec=2min
[Install]
WantedBy=multi-user.target

View File

@ -1,6 +1,5 @@
# Armbian firstrun service
# Creates the swap file, regenerates the SSH keys,
# performs additional first run tweaks
# Regenerates the SSH keys and performs additional first run tweaks
# This service will run in parallel with other services
[Unit]
@ -11,6 +10,8 @@ Before=getty.target system-getty.slice
Type=simple
RemainAfterExit=yes
ExecStart=/usr/lib/armbian/armbian-firstrun start
TimeoutStartSec=2min
[Install]
WantedBy=multi-user.target

View File

@ -15,6 +15,7 @@ ExecStart=/usr/lib/armbian/armbian-ramlog start
ExecStop=/usr/lib/armbian/armbian-ramlog stop
ExecReload=/usr/lib/armbian/armbian-ramlog write
RemainAfterExit=yes
TimeoutStartSec=2min
[Install]
WantedBy=sysinit.target

View File

@ -1,5 +1,6 @@
# Armbian ZRAM configuration service
# Create 5 compressed block devices
# This service may block the boot process for up to 2 minutes
[Unit]
Description=Armbian ZRAM config
@ -15,6 +16,7 @@ Type=oneshot
ExecStart=/usr/lib/armbian/armbian-zram-config start
ExecStop=/usr/lib/armbian/armbian-zram-config stop
RemainAfterExit=yes
TimeoutStartSec=2min
[Install]
WantedBy=sysinit.target

View File

View File

@ -147,10 +147,10 @@ index 0bc87473..cf26d2c7 100755
# Try to determine maintainer and email values
if [ -n "$DEBEMAIL" ]; then
email=$DEBEMAIL
@@ -314,6 +397,7 @@ fi
@@ -397,6 +397,7 @@ fi
# Build kernel header package
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"