From e83a91e3d36c8a7eaddd3396730ba70166472bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 29 Sep 2014 22:57:55 +0200 Subject: [PATCH] debian: migrate to native systemd services --- Makefile | 29 ++-- debian/control | 2 +- debian/init.d | 224 -------------------------- debian/rules | 12 +- vm-systemd/qubes-qrexec-agent.service | 1 + vm-systemd/qubes-sysinit.sh | 10 +- 6 files changed, 36 insertions(+), 242 deletions(-) delete mode 100644 debian/init.d diff --git a/Makefile b/Makefile index 44e4a09..928f83c 100644 --- a/Makefile +++ b/Makefile @@ -43,22 +43,36 @@ all: make -C qrexec make -C qubes-rpc -install-rh: - install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab - install -d $(DESTDIR)/etc/init.d - install vm-init.d/* $(DESTDIR)/etc/init.d/ - - install -d $(DESTDIR)/lib/systemd/system $(DESTDIR)/usr/lib/qubes/init +install-systemd: + install -d $(DESTDIR)/lib/systemd/system $(DESTDIR)/usr/lib/qubes/init $(DESTDIR)/lib/modules-load.d install -m 0755 vm-systemd/*.sh $(DESTDIR)/usr/lib/qubes/init/ install -m 0644 vm-systemd/qubes-*.service $(DESTDIR)/lib/systemd/system/ install -m 0644 vm-systemd/qubes-*.timer $(DESTDIR)/lib/systemd/system/ install -m 0644 vm-systemd/ModemManager.service $(DESTDIR)/usr/lib/qubes/init/ install -m 0644 vm-systemd/NetworkManager.service $(DESTDIR)/usr/lib/qubes/init/ install -m 0644 vm-systemd/NetworkManager-wait-online.service $(DESTDIR)/usr/lib/qubes/init/ + install -m 0644 vm-systemd/qubes-core.conf $(DESTDIR)/lib/modules-load.d/ + install -m 0644 vm-systemd/qubes-misc.conf $(DESTDIR)/lib/modules-load.d/ install -m 0644 vm-systemd/cups.* $(DESTDIR)/usr/lib/qubes/init/ install -m 0644 vm-systemd/ntpd.service $(DESTDIR)/usr/lib/qubes/init/ install -m 0644 vm-systemd/chronyd.service $(DESTDIR)/usr/lib/qubes/init/ +install-sysvinit: + install -d $(DESTDIR)/etc/init.d + install vm-init.d/qubes-core $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-core-appvm $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-core-netvm $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-firewall $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-netwatcher $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-qrexec-agent $(DESTDIR)/etc/init.d/ + install vm-init.d/qubes-updates-proxy $(DESTDIR)/etc/init.d/ + install -D vm-init.d/qubes-core.modules $(DESTDIR)/etc/sysconfig/modules/qubes-core.modules + install -D vm-init.d/qubes-misc.modules $(DESTDIR)/etc/sysconfig/modules/qubes-misc.modules + + +install-rh: install-systemd install-sysvinit + install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab + install -D -m 0644 misc/qubes-r2.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2.repo install -d $(DESTDIR)/usr/share/glib-2.0/schemas/ install -m 0644 misc/org.gnome.settings-daemon.plugins.updates.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/ @@ -70,9 +84,6 @@ install-rh: install -m 644 misc/RPM-GPG-KEY-qubes* $(DESTDIR)/etc/pki/rpm-gpg/ install -D -m 644 misc/session-stop-timeout.conf $(DESTDIR)/usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf - install -D misc/qubes-core.modules $(DESTDIR)/etc/sysconfig/modules/qubes-core.modules - install -D misc/qubes-misc.modules $(DESTDIR)/etc/sysconfig/modules/qubes-misc.modules - install -d $(DESTDIR)/etc/yum.conf.d touch $(DESTDIR)/etc/yum.conf.d/qubes-proxy.conf diff --git a/debian/control b/debian/control index 62967a7..2523068 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: qubes-core-agent Section: admin Priority: extra Maintainer: Davíð Steinn Geirsson -Build-Depends: qubes-utils, libvchan-xen-dev, python, debhelper, quilt, libxen-dev +Build-Depends: qubes-utils, libvchan-xen-dev, python, debhelper, quilt, libxen-dev, dh-systemd (>= 1.5) Standards-Version: 3.9.3 Homepage: http://www.qubes-os.org Vcs-Git: git://git.qubes-os.org/marmarek/core-agent-linux.git diff --git a/debian/init.d b/debian/init.d deleted file mode 100644 index 1ec6ad9..0000000 --- a/debian/init.d +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: qubes-core-agent -# Required-Start: $network $local_fs $remote_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Qubes qrexec agent -# Description: The qrexec agent runs in qubes domU domains. It runs -# commands on request from dom0. -### END INIT INFO - -# Author: Davíð Steinn Geirsson -# Most of this script is copied from vm-init.d/qubes-core with -# some fedora-specific stuff removed. - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=qrexec-agent -NAME=qrexec-agent -DAEMON=/usr/lib/qubes/qrexec-agent -DAEMON_ARGS="" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - - # Ensure necessary modules are loaded - modprobe xen_evtchn - modprobe u2mfn - - - # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read - chmod 666 /proc/xen/xenbus - # Set permissions to files needed to listen at vchan - chmod 666 /proc/u2mfn - - mkdir -p /var/run/xen-hotplug - - name=$(/usr/sbin/xenstore-read name) - if ! [ -f /etc/this-is-dvm ] ; then - # we don't want to set hostname for DispVM - # because it makes some of the pre-created dotfiles invalid (e.g. .kde/cache-) - # (let's be frank: nobody's gonna use xterm on DispVM) - if ! [ -z "$name" ]; then - echo $name > /etc/hostname - hostname $name - grep '127.0.1.1' /etc/hosts > /dev/null - if [ $? -ne 0 ]; then - echo "127.0.1.1 $name" >> /etc/hosts - else - sed -i "s/127\.0\.1\.1.*/127.0.1.1 $name/" /etc/hosts - fi - fi - fi - - timezone=`/usr/sbin/xenstore-read qubes-timezone 2> /dev/null` - if [ -n "$timezone" ]; then - ln -f /usr/share/zoneinfo/$timezone /etc/localtime - fi - - # Set IP address again (besides action in udev rules); this is needed by - # DispVM (to override DispVM-template IP) and in case when qubes-ip was - # called by udev before loading evtchn kernel module - in which case - # xenstore-read fails - INTERFACE=eth0 /usr/lib/qubes/setup-ip - - mkdir -p /var/run/qubes - - if [ -e /dev/xvdb ] ; then - resize2fs /dev/xvdb 2> /dev/null || echo "'resize2fs /dev/xvdb' failed" - mount /rw - - if ! [ -d /rw/home ] ; then - echo - echo "--> Virgin boot of the VM: Linking /home to /rw/home" - - mkdir -p /rw/config - touch /rw/config/rc.local - - mkdir -p /rw/home - cp -a /home.orig/user /rw/home - - mkdir -p /rw/usrlocal - cp -a /usr/local.orig/* /rw/usrlocal - - touch /var/lib/qubes/first-boot-completed - fi - fi - if [ -L /home ]; then - rm /home - mkdir /home - fi - mount /home - - [ -x /rw/config/rc.local ] && /rw/config/rc.local - - - start-stop-daemon --start --quiet -b --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet -b --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/rules b/debian/rules index dc13a10..2923714 100755 --- a/debian/rules +++ b/debian/rules @@ -7,17 +7,21 @@ export DESTDIR=$(shell pwd)/debian/qubes-core-agent %: - dh $@ + dh $@ --with systemd override_dh_auto_build: make all override_dh_auto_install: - make install-common install-deb + make install-common install-deb install-systemd make -C qrexec install override_dh_fixperms: dh_fixperms -a -Xqfile-unpacker -override_dh_installinit: - dh_installinit --no-restart-on-upgrade +override_dh_systemd_start: + dh_systemd_start --no-restart-on-upgrade + +override_dh_auto_clean: + dh_auto_clean + rm -f deb/* rpm/*/* diff --git a/vm-systemd/qubes-qrexec-agent.service b/vm-systemd/qubes-qrexec-agent.service index 483e694..e08e986 100644 --- a/vm-systemd/qubes-qrexec-agent.service +++ b/vm-systemd/qubes-qrexec-agent.service @@ -8,3 +8,4 @@ StandardOutput=syslog [Install] WantedBy=multi-user.target +Alias=qubes-core-agent.service diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh index 2a4ad5b..0f236c0 100755 --- a/vm-systemd/qubes-sysinit.sh +++ b/vm-systemd/qubes-sysinit.sh @@ -8,7 +8,9 @@ DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM updates-proxy-setup" DEFAULT_ENABLED="meminfo-writer" XS_READ=/usr/bin/xenstore-read +[ -x /usr/sbin/xenstore-read ] && XS_READ=/usr/sbin/xenstore-read XS_LS=/usr/bin/xenstore-ls +[ -x /usr/sbin/xenstore-read ] && XS_LS=/usr/sbin/xenstore-ls read_service() { $XS_READ qubes-service/$1 2> /dev/null @@ -36,10 +38,10 @@ chmod 666 /proc/u2mfn # Set default services depending on VM type TYPE=`$XS_READ qubes-vm-type 2> /dev/null` -[ "$TYPE" == "AppVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_APPVM -[ "$TYPE" == "NetVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_NETVM -[ "$TYPE" == "ProxyVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_PROXYVM -[ "$TYPE" == "TemplateVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_TEMPLATEVM +[ "$TYPE" = "AppVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_APPVM +[ "$TYPE" = "NetVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_NETVM +[ "$TYPE" = "ProxyVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_PROXYVM +[ "$TYPE" = "TemplateVM" ] && DEFAULT_ENABLED=$DEFAULT_ENABLED_TEMPLATEVM # Enable default services for srv in $DEFAULT_ENABLED; do