diff --git a/Makefile.builder b/Makefile.builder index a8765ce..e21f02c 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -3,4 +3,5 @@ RPM_SPEC_FILES := rpm_spec/core-vm.spec \ rpm_spec/core-vm-doc.spec \ rpm_spec/core-vm-kernel-placeholder.spec ARCH_BUILD_DIRS := archlinux +DEBIAN_BUILD_DIRS := debian endif diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3acafe2 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +qubes-core-agent (2.1.33) jessie; urgency=low + + * Initial Release. + + -- Davíð Steinn Geirsson Mon, 21 Apr 2014 01:31:55 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a4c09a0 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: qubes-core-agent +Section: admin +Priority: extra +Maintainer: Davíð Steinn Geirsson +Build-Depends: qubes-linux-utils, python, debhelper, quilt, libxen-dev +Standards-Version: 3.9.3 +Homepage: http://www.qubes-os.org +Vcs-Git: git://git.qubes-os.org/marmarek/core-agent-linux.git + +Package: qubes-core-agent +Architecture: any +Depends: qubes-linux-utils, qubes-core-vchan-xen, xenstore-utils, ethtool, python2.7, ${shlibs:Depends}, ${misc:Depends} +Conflicts: qubes-core-agent-linux +Description: Qubes core agent + This package includes various daemons necessary for qubes domU support, + such as qrexec. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0719d89 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,42 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: qubes-core-agent +Source: + +Files: * +Copyright: ?-2014 Qubes Developers +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +Files: debian/* +Copyright: 2014 Davíð Steinn Geirsson +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..67ae435 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +qubes-core-agent_2.1.33_amd64.deb admin extra diff --git a/debian/init.d b/debian/init.d new file mode 100644 index 0000000..1ec6ad9 --- /dev/null +++ b/debian/init.d @@ -0,0 +1,224 @@ +#!/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 new file mode 100755 index 0000000..b9fd0e7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DESTDIR=$(shell pwd)/debian/qubes-core-agent + +%: + dh $@ + +override_dh_auto_build: + make all + +override_dh_auto_install: + make install-common + make -C qrexec install + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)