diff options
| author | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-11 23:01:35 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-11 23:01:35 +0200 |
| commit | 38ad6f1b2f8137226382a2a029ba37f1a173807a (patch) | |
| tree | e1a479b9db60d79b5a99d26921a1a5d47e94a6e2 /services | |
| parent | 20e08db1a5d8d43ed5faaa1063c60eca62715ec5 (diff) | |
Allow aggregating command lines in blocks
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'services')
| -rw-r--r-- | services/loopback.in | 6 | ||||
| -rw-r--r-- | services/procfs.in | 6 | ||||
| -rw-r--r-- | services/sigterm.in | 7 | ||||
| -rw-r--r-- | services/sysfs.in | 12 | ||||
| -rw-r--r-- | services/tmpfsrun.in | 10 | ||||
| -rw-r--r-- | services/tmpfsvar.in | 14 |
6 files changed, 34 insertions, 21 deletions
diff --git a/services/loopback.in b/services/loopback.in index f76bd42..9e41ae1 100644 --- a/services/loopback.in +++ b/services/loopback.in @@ -4,5 +4,7 @@ target boot before sysinit after hwclock hostname vfs -exec "@SBINPATH@/ip" addr add 127.0.0.1/8 dev lo brd + -exec "@SBINPATH@/ip" link set lo up +exec { + "@SBINPATH@/ip" addr add 127.0.0.1/8 dev lo brd + + "@SBINPATH@/ip" link set lo up +} diff --git a/services/procfs.in b/services/procfs.in index 76d479f..9124792 100644 --- a/services/procfs.in +++ b/services/procfs.in @@ -3,5 +3,7 @@ type wait target boot before vfs -exec "@SBINPATH@/mount" -t proc proc /proc -exec "@SCRIPTDIR@/trymount.sh" "/proc/sys/fs/binfmt_misc" "binfmt_misc" "nodev,noexec,nosuid" +exec { + "@SBINPATH@/mount" -t proc proc /proc + "@SCRIPTDIR@/trymount.sh" /proc/sys/fs/binfmt_misc binfmt_misc nodev,noexec,nosuid +} diff --git a/services/sigterm.in b/services/sigterm.in index 45dda0e..cb408f2 100644 --- a/services/sigterm.in +++ b/services/sigterm.in @@ -1,6 +1,9 @@ description send SIGTERM to all processes -exec "@SCRIPTDIR@/killall5" 15 -exec "@BINPATH@/sleep" 5 type wait target %0 before sigkill sync reboot shutdown + +exec { + "@SCRIPTDIR@/killall5" 15 + "@BINPATH@/sleep" 5 +} diff --git a/services/sysfs.in b/services/sysfs.in index 4c0f6ce..21938fb 100644 --- a/services/sysfs.in +++ b/services/sysfs.in @@ -4,8 +4,10 @@ target boot after procfs before vfs -exec "@SBINPATH@/mount" -t sysfs sysfs /sys -exec "@SCRIPTDIR@/trymount.sh" "/sys/kernel/security" "securityfs" "nodev,noexec,nosuid" -exec "@SCRIPTDIR@/trymount.sh" "/sys/kernel/config" "configfs" "nodev,noexec,nosuid" -exec "@SCRIPTDIR@/trymount.sh" "/sys/fs/fuse/connections" "fusectl" "nodev,noexec,nosuid" -exec "@SCRIPTDIR@/trymount.sh" "/sys/firmware/efi/efivars" "efivarfs" "ro" +exec { + "@SBINPATH@/mount" -t sysfs sysfs /sys + "@SCRIPTDIR@/trymount.sh" /sys/kernel/security securityfs nodev,noexec,nosuid + "@SCRIPTDIR@/trymount.sh" /sys/kernel/config configfs nodev,noexec,nosuid + "@SCRIPTDIR@/trymount.sh" /sys/fs/fuse/connections fusectl nodev,noexec,nosuid + "@SCRIPTDIR@/trymount.sh" /sys/firmware/efi/efivars efivarfs ro +} diff --git a/services/tmpfsrun.in b/services/tmpfsrun.in index c34eccb..c88a914 100644 --- a/services/tmpfsrun.in +++ b/services/tmpfsrun.in @@ -3,7 +3,9 @@ type wait target boot before vfs after tmpfsvar -exec "@SBINPATH@/mount" -t tmpfs none /run -exec "@BINPATH@/mkdir" /run/lock -m 0755 -exec "@BINPATH@/ln" -s /run /var/run -exec "@BINPATH@/ln" -s /run/lock /var/lock +exec { + "@SBINPATH@/mount" -t tmpfs none /run + "@BINPATH@/mkdir" /run/lock -m 0755 + "@BINPATH@/ln" -s /run /var/run + "@BINPATH@/ln" -s /run/lock /var/lock +} diff --git a/services/tmpfsvar.in b/services/tmpfsvar.in index 7942286..be7e563 100644 --- a/services/tmpfsvar.in +++ b/services/tmpfsvar.in @@ -2,9 +2,11 @@ description "mount /var" type wait target boot before vfs -exec "@SBINPATH@/mount" -t tmpfs none /var -exec "@BINPATH@/mkdir" /var/log -m 0755 -exec "@BINPATH@/mkdir" /var/spool -m 0755 -exec "@BINPATH@/mkdir" /var/lib -m 0755 -exec "@BINPATH@/mkdir" /var/tmp -m 0755 -exec "@SCRIPTDIR@/overlay.sh" var_lib /var/lib +exec { + "@SBINPATH@/mount" -t tmpfs none /var + "@BINPATH@/mkdir" /var/log -m 0755 + "@BINPATH@/mkdir" /var/spool -m 0755 + "@BINPATH@/mkdir" /var/lib -m 0755 + "@BINPATH@/mkdir" /var/tmp -m 0755 + "@SCRIPTDIR@/overlay.sh" var_lib /var/lib +} |