mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 14:28:15 -05:00
d4053c710b
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service) (dmd-service-type, <dmd-service>, dmd-service, dmd-service?) (make-dmd-service, dmd-service-documentation, dmd-service-provision) (dmd-service-requirement, dmd-service-respawn, dmd-service-start) (dmd-service-stop, dmd-service-auto-start?, dmd-service-modules) (dmd-service-imported-modules, dmd-service-file-name, dmd-service-file) (dmd-service-back-edges): Rename to... (shepherd-root-service-type, %shepherd-root-service, shepherd-service-type) (<shepherd-service>, shepherd-service, shepherd-service?) (make-shepherd-service, shepherd-service-documentation) (shepherd-service-provision, shepherd-service-requirement) (shepherd-service-respawn, shepherd-service-start) (shepherd-service-stop, shepherd-service-auto-start?) (shepherd-service-modules, shepherd-service-imported-modules) (shepherd-service-file-name, shepherd-service-file) (shepherd-service-back-edges): ...this * gnu/services.scm: Adjust comments. * gnu/services/avahi.scm (avahi-dmd-service): Rename to... (avahi-shepherd-service): ... this. * gnu/services/base.scm (%root-file-system-dmd-service) (file-system->dmd-service-name, mapped-device->dmd-service-name) (dependency->dmd-service-name, file-system-dmd-service) (mingetty-dmd-service, nscd-dmd-service, guix-dmd-service) (guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to... (%root-file-system-shepherd-service) (file-system->shepherd-service-name, mapped-device->shepherd-service-name) (dependency->shepherd-service-name, file-system-shepherd-service) (mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service) (guix-publish-shepherd-service, udev-shepherd-service) (gpm-shepherd-service): ... this. * gnu/services/databases.scm (postgresql-dmd-service): Rename to... (postgresql-shepherd-service): ... this. * gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service): Rename to... (upower-shepherd-service, elogind-shepherd-service): ... this. * gnu/services/dbus.scm (dbus-dmd-service): Rename to... (dbus-shepherd-service): ... this. * gnu/services/lirc.scm (lirc-dmd-service): Rename to... (lirc-shepherd-service): ... this. * gnu/services/mail.scm (dovecot-dmd-service): Rename to... (dovecot-shepherd-service): ... this. * gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service) (bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to... (dbus-shepherd-service): ... this. * gnu/services/ssh.scm (lsh-dmd-service): Rename to... (lsh-shepherd-service): ... this. * gnu/services/web.scm (nginx-dmd-service): Rename to... (nginx-shepherd-service): ... this. * gnu/services/xorg.scm (slim-dmd-service): Rename to... (slim-shepherd-service): ... this. * gnu/system.scm (essential-services): Use '%shepherd-root-service'. * gnu/system/install.scm (cow-store-service-type): Adjust accordingly. * guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type) (export-dmd-graph): Likewise. * tests/guix-system.sh: Likewise. * tests/services.scm ("dmd-service-back-edges"): Rename to... ("shepherd-service-back-edges"): Adjust accordingly. * doc/guix.texi: Likewise. * doc/images/service-graph.dot: Use 'shepherd' service name.
210 lines
5.6 KiB
Bash
210 lines
5.6 KiB
Bash
# GNU Guix --- Functional package management for GNU
|
|
# Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
|
#
|
|
# This file is part of GNU Guix.
|
|
#
|
|
# GNU Guix 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 3 of the License, or (at
|
|
# your option) any later version.
|
|
#
|
|
# GNU Guix 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Test 'guix system', mostly error reporting.
|
|
#
|
|
|
|
set -e
|
|
|
|
guix system --version
|
|
|
|
tmpfile="t-guix-system-$$"
|
|
errorfile="t-guix-system-error-$$"
|
|
|
|
# Note: This directory is chosen outside $builddir so that relative file name
|
|
# canonicalization doesn't mess up with 'current-source-directory', used by
|
|
# 'local-file' ('load' forces 'relative' for
|
|
# %FILE-PORT-NAME-CANONICALIZATION.)
|
|
tmpdir="${TMPDIR:-/tmp}/t-guix-system-$$"
|
|
mkdir "$tmpdir"
|
|
|
|
trap 'rm -f "$tmpfile" "$errorfile" "$tmpdir"/*; rmdir "$tmpdir"' EXIT
|
|
|
|
# Reporting of syntax errors.
|
|
|
|
cat > "$tmpfile"<<EOF
|
|
;; This is line 1, and the next one is line 2.
|
|
(operating-system)
|
|
;; The 'T' is at column 3.
|
|
EOF
|
|
|
|
if guix system vm "$tmpfile" 2> "$errorfile"
|
|
then
|
|
# This must not succeed.
|
|
exit 1
|
|
else
|
|
grep "$tmpfile:2:3:.*missing.* initializers" "$errorfile"
|
|
fi
|
|
|
|
|
|
# Reporting of unbound variables.
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
(use-modules (gnu)) ; 1
|
|
(use-service-modules networking) ; 2
|
|
|
|
(operating-system ; 4
|
|
(host-name "antelope") ; 5
|
|
(timezone "Europe/Paris") ; 6
|
|
(locale "en_US.UTF-8") ; 7
|
|
|
|
(bootloader (GRUB-config (device "/dev/sdX"))) ; 9
|
|
(file-systems (cons (file-system
|
|
(device "root")
|
|
(title 'label)
|
|
(mount-point "/")
|
|
(type "ext4"))
|
|
%base-file-systems)))
|
|
EOF
|
|
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
then false
|
|
else
|
|
grep "$tmpfile:9:.*[Uu]nbound variable.*GRUB-config" "$errorfile"
|
|
fi
|
|
|
|
OS_BASE='
|
|
(host-name "antelope")
|
|
(timezone "Europe/Paris")
|
|
(locale "en_US.UTF-8")
|
|
|
|
(bootloader (grub-configuration (device "/dev/sdX")))
|
|
(file-systems (cons (file-system
|
|
(device "root")
|
|
(title (string->symbol "label"))
|
|
(mount-point "/")
|
|
(type "ext4"))
|
|
%base-file-systems))
|
|
'
|
|
|
|
# Reporting of duplicate service identifiers.
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
(use-modules (gnu))
|
|
(use-service-modules networking)
|
|
|
|
(operating-system
|
|
$OS_BASE
|
|
(services (cons* (dhcp-client-service)
|
|
(dhcp-client-service) ;twice!
|
|
%base-services)))
|
|
EOF
|
|
|
|
if guix system vm "$tmpfile" 2> "$errorfile"
|
|
then
|
|
# This must not succeed.
|
|
exit 1
|
|
else
|
|
grep "service 'networking'.*more than once" "$errorfile"
|
|
fi
|
|
|
|
# Reporting unmet shepherd requirements.
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
(use-modules (gnu) (gnu services shepherd))
|
|
(use-service-modules networking)
|
|
|
|
(define buggy-service-type
|
|
(shepherd-service-type
|
|
'buggy
|
|
(lambda _
|
|
(shepherd-service
|
|
(provision '(buggy!))
|
|
(requirement '(does-not-exist))
|
|
(start #t)))))
|
|
|
|
(operating-system
|
|
$OS_BASE
|
|
(services (cons (service buggy-service-type #t)
|
|
%base-services)))
|
|
EOF
|
|
|
|
if guix system build "$tmpfile" 2> "$errorfile"
|
|
then
|
|
exit 1
|
|
else
|
|
grep "service 'buggy!'.*'does-not-exist'.*undefined" "$errorfile"
|
|
fi
|
|
|
|
# Reporting inconsistent user accounts.
|
|
|
|
make_user_config ()
|
|
{
|
|
cat > "$tmpfile" <<EOF
|
|
(use-modules (gnu))
|
|
(use-service-modules networking)
|
|
|
|
(operating-system
|
|
(host-name "antelope")
|
|
(timezone "Europe/Paris")
|
|
(locale "en_US.UTF-8")
|
|
|
|
(bootloader (grub-configuration (device "/dev/sdX")))
|
|
(file-systems (cons (file-system
|
|
(device "root")
|
|
(title 'label)
|
|
(mount-point "/")
|
|
(type "ext4"))
|
|
%base-file-systems))
|
|
(users (list (user-account
|
|
(name "dave")
|
|
(home-directory "/home/dave")
|
|
(group "$1")
|
|
(supplementary-groups '("$2"))))))
|
|
EOF
|
|
}
|
|
|
|
make_user_config "users" "wheel"
|
|
guix system build "$tmpfile" -n # succeeds
|
|
|
|
guix system build "$tmpfile" -d # succeeds
|
|
guix system build "$tmpfile" -d | grep '\.drv$'
|
|
|
|
guix system vm "$tmpfile" -d # succeeds
|
|
guix system vm "$tmpfile" -d | grep '\.drv$'
|
|
|
|
make_user_config "group-that-does-not-exist" "users"
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
then false
|
|
else grep "primary group.*group-that-does-not-exist.*undeclared" "$errorfile"; fi
|
|
|
|
make_user_config "users" "group-that-does-not-exist"
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
then false
|
|
else grep "supplementary group.*group-that-does-not-exist.*undeclared" "$errorfile"; fi
|
|
|
|
# Try 'local-file' and relative file name resolution.
|
|
|
|
cat > "$tmpdir/config.scm"<<EOF
|
|
(use-modules (gnu))
|
|
(use-service-modules networking)
|
|
|
|
(operating-system
|
|
$OS_BASE
|
|
(services (cons (tor-service (local-file "my-torrc"))
|
|
%base-services)))
|
|
EOF
|
|
|
|
cat > "$tmpdir/my-torrc"<<EOF
|
|
# This is an example file.
|
|
EOF
|
|
|
|
# In both cases 'my-torrc' should be properly resolved.
|
|
guix system build "$tmpdir/config.scm" -n
|
|
(cd "$tmpdir"; guix system build "config.scm" -n)
|