Blob: patches/openrc-mouse-tool-surface.patch
Raw · Blame
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,36 +3,20 @@
subdir('librc')
subdir('libeinfo')
subdir('shared')
subdir('checkpath')
subdir('einfo')
subdir('fstabinfo')
-subdir('halt')
-subdir('is_newer_than')
-subdir('is_older_than')
-subdir('kill_all')
subdir('mark_service')
subdir('mountinfo')
-subdir('on_ac_power')
subdir('openrc')
-subdir('openrc-init')
subdir('openrc-run')
-subdir('openrc-shutdown')
-subdir('openrc-user')
-subdir('pam_openrc')
-subdir('poweroff')
-subdir('rc-abort')
subdir('rc-depend')
subdir('rc-service')
subdir('rc-sstat')
subdir('rc-status')
-subdir('rc-update')
-subdir('reboot')
subdir('service')
-subdir('seedrng')
subdir('shell_var')
-subdir('shutdown')
subdir('start-stop-daemon')
subdir('supervise-daemon')
-subdir('swclock')
subdir('value')
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,5 +1,9 @@
-version_h = vcs_tag(input : 'version.h.in', output : 'version.h')
-vcs_tag(input : 'version.in', output : 'version')
+version_data = configuration_data()
+version_data.set('VCS_TAG', meson.project_version())
+version_h = configure_file(input : 'version.h.in', output : 'version.h',
+ configuration : version_data)
+configure_file(input : 'version.in', output : 'version',
+ configuration : version_data)
shared_sources = [
'misc.c',
--- a/src/service/meson.build
+++ b/src/service/meson.build
@@ -6,6 +6,7 @@
'service_inactive',
'service_wasinactive',
'service_hotplugged',
+ 'service_failed',
'service_started_daemon',
'service_crashed',
]
--- a/sh/supervise-daemon.sh
+++ b/sh/supervise-daemon.sh
@@ -95,6 +95,9 @@
elif service_inactive; then
ewarn "status: inactive"
return 16
+ elif service_failed; then
+ eerror "status: failed"
+ return 32
elif service_started; then
if service_crashed; then
if ! _check_supervised; then
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -11,14 +11,14 @@
done
fi
-# check for md5sum, and probably /usr too
-if command -v md5sum >/dev/null; then
- got_md5sum=true
+# check for cksum, and probably /usr too
+if command -v cksum >/dev/null; then
+ got_cksum=true
else
- eerror "md5sum is missing, which suggests /usr is not mounted"
+ eerror "cksum is missing, which suggests /usr is not mounted"
eerror "If you have separate /usr, it must be mounted by initramfs"
eerror "If not, you should check coreutils is installed correctly"
- got_md5sum=false
+ got_cksum=false
fi
# By default VServer already has /proc mounted, but OpenVZ does not!
@@ -31,9 +31,9 @@
mountproc=true
f=/proc/self/environ
if [ -e $f ]; then
- if $got_md5sum && [ "$(VAR=a md5sum $f)" = "$(VAR=b md5sum $f)" ]; then
+ if $got_cksum && [ "$(VAR=a cksum $f)" = "$(VAR=b cksum $f)" ]; then
eerror "You have cruft in /proc that should be deleted"
else
- # If they don't have md5sum, this will fail in pretty ways if
+ # If they don't have cksum, this will fail in pretty ways if
# /proc isn't really mounted. Oh well, their system is busted