summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-04-12 06:40:39 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-04-12 12:51:33 +0200
commita3437967a2ae4730ba638cc80328055e9805e7c9 (patch)
tree6e824f088920bb59fd00e0c3b03dcdbf859f74c1 /services
parent55d4a328c9fa369611115a066f4f305f2b74dafd (diff)
Rely on PATH variable for running init programs
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'services')
-rw-r--r--services/Makemodule.am5
-rw-r--r--services/agetty (renamed from services/agetty.in)2
-rw-r--r--services/hostname (renamed from services/hostname.in)2
-rw-r--r--services/hwclock (renamed from services/hwclock.in)2
-rw-r--r--services/loopback (renamed from services/loopback.in)4
-rw-r--r--services/procfs.in2
-rw-r--r--services/reboot (renamed from services/reboot.in)2
-rw-r--r--services/shutdown (renamed from services/shutdown.in)2
-rw-r--r--services/sigterm.in2
-rw-r--r--services/sync (renamed from services/sync.in)2
-rwxr-xr-xservices/sysctl (renamed from services/sysctl.in)2
-rw-r--r--services/sysfs.in2
-rw-r--r--services/tmpfs (renamed from services/tmpfs.in)2
-rw-r--r--services/tmpfsrun11
-rw-r--r--services/tmpfsrun.in11
-rw-r--r--services/tmpfsvar.in10
16 files changed, 33 insertions, 30 deletions
diff --git a/services/Makemodule.am b/services/Makemodule.am
index 5f3c1bb..3c714a6 100644
--- a/services/Makemodule.am
+++ b/services/Makemodule.am
@@ -10,4 +10,7 @@ if PYGOSCFG
init_DATA += services/rootusr services/tmpfsrun services/tmpfsvar
endif
-EXTRA_DIST += services/sysinit services/vfs
+EXTRA_DIST += services/sysinit services/vfs services/agetty services/hostname
+EXTRA_DIST += services/hwclock services/loopback services/reboot
+EXTRA_DIST += services/shutdown services/sync services/sysctl services/tmpfs
+EXTRA_DIST += services/tmpfsrun
diff --git a/services/agetty.in b/services/agetty
index c4f78ad..b4dc70d 100644
--- a/services/agetty.in
+++ b/services/agetty
@@ -1,5 +1,5 @@
description agetty on %0
-exec "@SBINPATH@/agetty" %0 linux
+exec agetty %0 linux
type respawn
target boot
after sysinit
diff --git a/services/hostname.in b/services/hostname
index 678e07e..d0daa23 100644
--- a/services/hostname.in
+++ b/services/hostname
@@ -1,5 +1,5 @@
description reload hostname
-exec "@BINPATH@/hostname" --file /etc/hostname
+exec hostname --file /etc/hostname
type wait
target boot
before sysinit
diff --git a/services/hwclock.in b/services/hwclock
index af3a4e4..eeafe8b 100644
--- a/services/hwclock.in
+++ b/services/hwclock
@@ -1,5 +1,5 @@
description restore time from RTC
-exec "@SBINPATH@/hwclock" --hctosys --utc
+exec hwclock --hctosys --utc
type wait
target boot
before sysinit
diff --git a/services/loopback.in b/services/loopback
index 9e41ae1..5a77a6f 100644
--- a/services/loopback.in
+++ b/services/loopback
@@ -5,6 +5,6 @@ before sysinit
after hwclock hostname vfs
exec {
- "@SBINPATH@/ip" addr add 127.0.0.1/8 dev lo brd +
- "@SBINPATH@/ip" link set lo up
+ ip addr add 127.0.0.1/8 dev lo brd +
+ ip link set lo up
}
diff --git a/services/procfs.in b/services/procfs.in
index 9124792..8c0743b 100644
--- a/services/procfs.in
+++ b/services/procfs.in
@@ -4,6 +4,6 @@ target boot
before vfs
exec {
- "@SBINPATH@/mount" -t proc proc /proc
+ mount -t proc proc /proc
"@SCRIPTDIR@/trymount.sh" /proc/sys/fs/binfmt_misc binfmt_misc nodev,noexec,nosuid
}
diff --git a/services/reboot.in b/services/reboot
index da11e2a..65a8eac 100644
--- a/services/reboot.in
+++ b/services/reboot
@@ -1,5 +1,5 @@
description system reboot
-exec "@SBINPATH@/shutdown" -nrf
+exec shutdown -nrf
type wait
target reboot
after sync sigkill sigterm
diff --git a/services/shutdown.in b/services/shutdown
index 6c28621..679ffbd 100644
--- a/services/shutdown.in
+++ b/services/shutdown
@@ -1,5 +1,5 @@
description system shutdown
-exec "@SBINPATH@/shutdown" -npf
+exec shutdown -npf
type wait
target shutdown
after sync sigkill sigterm
diff --git a/services/sigterm.in b/services/sigterm.in
index cb408f2..7e77fba 100644
--- a/services/sigterm.in
+++ b/services/sigterm.in
@@ -5,5 +5,5 @@ before sigkill sync reboot shutdown
exec {
"@SCRIPTDIR@/killall5" 15
- "@BINPATH@/sleep" 5
+ sleep 5
}
diff --git a/services/sync.in b/services/sync
index 7f02287..d7217f9 100644
--- a/services/sync.in
+++ b/services/sync
@@ -1,5 +1,5 @@
description sync
-exec "@BINPATH@/sync"
+exec sync
type wait
target %0
after sigkill sigterm
diff --git a/services/sysctl.in b/services/sysctl
index e2e6eaa..a5ee62b 100755
--- a/services/sysctl.in
+++ b/services/sysctl
@@ -1,5 +1,5 @@
description configure kernel paramters
-exec "@SBINPATH@/sysctl" --system
+exec sysctl --system
type wait
target boot
before sysinit
diff --git a/services/sysfs.in b/services/sysfs.in
index 21938fb..8eebd0a 100644
--- a/services/sysfs.in
+++ b/services/sysfs.in
@@ -5,7 +5,7 @@ after procfs
before vfs
exec {
- "@SBINPATH@/mount" -t sysfs sysfs /sys
+ 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
diff --git a/services/tmpfs.in b/services/tmpfs
index 1aa48cc..411a42b 100644
--- a/services/tmpfs.in
+++ b/services/tmpfs
@@ -2,4 +2,4 @@ description "mount /tmp"
type wait
target boot
before vfs
-exec "@SBINPATH@/mount" -t tmpfs none /tmp
+exec mount -t tmpfs none /tmp
diff --git a/services/tmpfsrun b/services/tmpfsrun
new file mode 100644
index 0000000..07dbd0a
--- /dev/null
+++ b/services/tmpfsrun
@@ -0,0 +1,11 @@
+description "mount /run"
+type wait
+target boot
+before vfs
+after tmpfsvar
+exec {
+ mount -t tmpfs none /run
+ mkdir /run/lock -m 0755
+ ln -s /run /var/run
+ ln -s /run/lock /var/lock
+}
diff --git a/services/tmpfsrun.in b/services/tmpfsrun.in
deleted file mode 100644
index c88a914..0000000
--- a/services/tmpfsrun.in
+++ /dev/null
@@ -1,11 +0,0 @@
-description "mount /run"
-type wait
-target boot
-before vfs
-after tmpfsvar
-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 be7e563..5f45ecd 100644
--- a/services/tmpfsvar.in
+++ b/services/tmpfsvar.in
@@ -3,10 +3,10 @@ type wait
target boot
before vfs
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
+ mount -t tmpfs none /var
+ mkdir /var/log -m 0755
+ mkdir /var/spool -m 0755
+ mkdir /var/lib -m 0755
+ mkdir /var/tmp -m 0755
"@SCRIPTDIR@/overlay.sh" var_lib /var/lib
}