2014-06-26 16:23:36 -04:00
|
|
|
# GNU Guix --- Functional package management for GNU
|
2020-01-16 09:00:18 -05:00
|
|
|
# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
2017-09-02 19:19:38 -04:00
|
|
|
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
2018-03-15 00:09:15 -04:00
|
|
|
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
2014-06-26 16:23:36 -04:00
|
|
|
#
|
|
|
|
# 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/>.
|
|
|
|
|
|
|
|
#
|
2015-12-14 13:52:47 -05:00
|
|
|
# Test 'guix system', mostly error reporting.
|
2014-06-26 16:23:36 -04:00
|
|
|
#
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
guix system --version
|
|
|
|
|
|
|
|
tmpfile="t-guix-system-$$"
|
|
|
|
errorfile="t-guix-system-error-$$"
|
2015-12-14 13:52:47 -05:00
|
|
|
|
|
|
|
# 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
|
2014-06-26 16:23:36 -04:00
|
|
|
|
2015-03-09 18:49:18 -04:00
|
|
|
# Reporting of syntax errors.
|
|
|
|
|
2014-06-26 16:23:36 -04:00
|
|
|
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
|
2015-03-09 18:49:18 -04:00
|
|
|
|
|
|
|
|
2017-10-10 04:22:43 -04:00
|
|
|
cat > "$tmpfile"<<EOF
|
|
|
|
;; This is line 1, and the next one is line 2.
|
|
|
|
(operating-system
|
|
|
|
;; This is line 3, and there is no closing paren!
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if guix system vm "$tmpfile" 2> "$errorfile"
|
|
|
|
then
|
|
|
|
# This must not succeed.
|
|
|
|
exit 1
|
|
|
|
else
|
|
|
|
grep "$tmpfile:4:1: missing closing paren" "$errorfile"
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
2017-11-08 07:33:25 -05:00
|
|
|
# Reporting of module not found errors.
|
|
|
|
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
|
|
;; Line 1.
|
|
|
|
(use-modules (gnu))
|
|
|
|
(use-service-modules openssh)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
|
|
then false
|
|
|
|
else
|
|
|
|
grep "$tmpfile:3:2: .*module .*openssh.*not found" "$errorfile"
|
|
|
|
grep "Try.*use-service-modules ssh" "$errorfile"
|
|
|
|
fi
|
|
|
|
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
|
|
;; Line 1.
|
|
|
|
(use-modules (gnu))
|
|
|
|
(use-package-modules qemu)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
|
|
then false
|
|
|
|
else
|
|
|
|
grep "$tmpfile:3:2: .*module .*qemu.*not found" "$errorfile"
|
|
|
|
grep "Try.*use-package-modules virtualization" "$errorfile"
|
|
|
|
fi
|
|
|
|
|
2015-05-25 12:25:19 -04:00
|
|
|
# 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
|
|
|
|
|
2019-01-21 16:17:17 -05:00
|
|
|
(bootloader (GRUB-config (target "/dev/sdX"))) ; 9
|
2015-05-25 12:25:19 -04:00
|
|
|
(file-systems (cons (file-system
|
2018-05-18 09:04:36 -04:00
|
|
|
(device (file-system-label "root"))
|
2015-05-25 12:25:19 -04:00
|
|
|
(mount-point "/")
|
|
|
|
(type "ext4"))
|
|
|
|
%base-file-systems)))
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
|
|
then false
|
|
|
|
else
|
2020-01-17 11:12:44 -05:00
|
|
|
if test "`guile -c '(display (effective-version))'`" = 3.0
|
|
|
|
then
|
|
|
|
# FIXME: With Guile 3.3.0 the error is reported on line 11.
|
|
|
|
# See <https://bugs.gnu.org/38388>.
|
|
|
|
grep "$tmpfile:[0-9]\+:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile"
|
|
|
|
elif test "`guile -c '(display (effective-version))'`" = 2.2
|
2017-03-15 10:08:39 -04:00
|
|
|
then
|
|
|
|
# FIXME: With Guile 2.2.0 the error is reported on line 4.
|
|
|
|
# See <http://bugs.gnu.org/26107>.
|
2018-05-18 09:23:57 -04:00
|
|
|
grep "$tmpfile:[49]:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile"
|
2017-03-15 10:08:39 -04:00
|
|
|
else
|
2018-05-18 09:23:57 -04:00
|
|
|
grep "$tmpfile:9:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile"
|
2017-03-15 10:08:39 -04:00
|
|
|
fi
|
2015-05-25 12:25:19 -04:00
|
|
|
fi
|
|
|
|
|
2020-01-16 09:00:18 -05:00
|
|
|
cat > "$tmpfile" <<EOF
|
|
|
|
(use-modules (gnu)) ; 1
|
|
|
|
|
|
|
|
(operating-system ; 3
|
|
|
|
(file-systems (cons (file-system ; 4
|
|
|
|
(device (file-system-label "root"))
|
|
|
|
(mount-point "/") ; 6
|
|
|
|
(type "ext4")))) ; 7 (!!)
|
|
|
|
%base-file-systems)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
if guix system build "$tmpfile" -n 2> "$errorfile"
|
|
|
|
then false
|
|
|
|
else
|
|
|
|
# Here '%base-file-systems' appears as if it were a field specified of the
|
|
|
|
# enclosing 'operating-system' form due to parenthesis mismatch.
|
|
|
|
grep "$tmpfile:3:[0-9]\+:.*%base-file-system.*invalid field specifier" \
|
|
|
|
"$errorfile"
|
|
|
|
fi
|
|
|
|
|
2015-11-24 16:29:47 -05:00
|
|
|
OS_BASE='
|
2015-03-09 18:49:18 -04:00
|
|
|
(host-name "antelope")
|
|
|
|
(timezone "Europe/Paris")
|
|
|
|
(locale "en_US.UTF-8")
|
|
|
|
|
2017-09-02 19:19:38 -04:00
|
|
|
(bootloader (bootloader-configuration
|
|
|
|
(bootloader grub-bootloader)
|
2019-01-21 16:17:17 -05:00
|
|
|
(target "/dev/sdX")))
|
2015-03-09 18:49:18 -04:00
|
|
|
(file-systems (cons (file-system
|
2018-05-18 09:04:36 -04:00
|
|
|
(device (file-system-label "root"))
|
2015-03-09 18:49:18 -04:00
|
|
|
(mount-point "/")
|
|
|
|
(type "ext4"))
|
|
|
|
%base-file-systems))
|
2015-11-24 16:29:47 -05:00
|
|
|
'
|
2015-03-09 18:49:18 -04:00
|
|
|
|
2015-11-24 16:29:47 -05:00
|
|
|
# Reporting of duplicate service identifiers.
|
|
|
|
|
|
|
|
cat > "$tmpfile" <<EOF
|
|
|
|
(use-modules (gnu))
|
|
|
|
(use-service-modules networking)
|
|
|
|
|
|
|
|
(operating-system
|
|
|
|
$OS_BASE
|
2018-10-17 18:45:05 -04:00
|
|
|
(services (cons* (service dhcp-client-service-type)
|
|
|
|
(service dhcp-client-service-type) ;twice!
|
2015-03-09 18:49:18 -04:00
|
|
|
%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
|
2015-05-24 12:02:54 -04:00
|
|
|
|
2016-01-27 07:45:01 -05:00
|
|
|
# Reporting unmet shepherd requirements.
|
2015-11-24 16:29:47 -05:00
|
|
|
|
|
|
|
cat > "$tmpfile" <<EOF
|
2016-01-27 07:45:01 -05:00
|
|
|
(use-modules (gnu) (gnu services shepherd))
|
2015-11-24 16:29:47 -05:00
|
|
|
(use-service-modules networking)
|
|
|
|
|
|
|
|
(define buggy-service-type
|
services: Rename 'dmd' services to 'shepherd'.
* 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.
2016-01-27 15:02:31 -05:00
|
|
|
(shepherd-service-type
|
2015-11-24 16:29:47 -05:00
|
|
|
'buggy
|
|
|
|
(lambda _
|
services: Rename 'dmd' services to 'shepherd'.
* 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.
2016-01-27 15:02:31 -05:00
|
|
|
(shepherd-service
|
2015-11-24 16:29:47 -05:00
|
|
|
(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
|
2016-07-20 08:49:01 -04:00
|
|
|
grep "service 'buggy!'.*'does-not-exist'.*not provided" "$errorfile"
|
2015-11-24 16:29:47 -05:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Reporting inconsistent user accounts.
|
|
|
|
|
2015-05-24 12:02:54 -04:00
|
|
|
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")
|
|
|
|
|
2017-09-02 19:19:38 -04:00
|
|
|
(bootloader (bootloader-configuration
|
|
|
|
(bootloader grub-bootloader)
|
2019-01-21 16:17:17 -05:00
|
|
|
(target "/dev/sdX")))
|
2015-05-24 12:02:54 -04:00
|
|
|
(file-systems (cons (file-system
|
2018-05-18 09:04:36 -04:00
|
|
|
(device (file-system-label "root"))
|
2015-05-24 12:02:54 -04:00
|
|
|
(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
|
|
|
|
|
2015-09-19 05:14:42 -04:00
|
|
|
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$'
|
|
|
|
|
2018-09-07 03:50:26 -04:00
|
|
|
# Make sure the behavior is deterministic (<https://bugs.gnu.org/32652>).
|
|
|
|
drv1="`guix system vm "$tmpfile" -d`"
|
|
|
|
drv2="`guix system vm "$tmpfile" -d`"
|
|
|
|
test "$drv1" = "$drv2"
|
scripts: system: Add support for image-type.
* guix/scripts/system.scm (list-image-types): New procedure,
(%options): add "image-type" and "list-image-types" options, remove
"file-system-type" option,
(show-help): adapt accordingly,
(%default-options): also adapt, and set the default "image-type" to "raw",
(perform-action): add image-type argument and remove file-system-type argument,
(process-action): adapt perform-action call,
(system-derivation-for-action): remove base-image
argument, add image-type argument, and use it to create the image passed to
"system-image".
* tests/guix-system.sh: Adapt accordingly and add a test for
"--list-image-types" command.
* doc/guix.texi (Building the Installation Image,
Invoking guix system): Adapt accordingly.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 10:49:29 -04:00
|
|
|
drv1="`guix system disk-image -t iso9660 "$tmpfile" -d`"
|
|
|
|
drv2="`guix system disk-image -t iso9660 "$tmpfile" -d`"
|
2018-09-07 03:50:26 -04:00
|
|
|
test "$drv1" = "$drv2"
|
|
|
|
|
2015-05-24 12:02:54 -04:00
|
|
|
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
|
2015-12-14 13:52:47 -05:00
|
|
|
|
|
|
|
# Try 'local-file' and relative file name resolution.
|
|
|
|
|
|
|
|
cat > "$tmpdir/config.scm"<<EOF
|
|
|
|
(use-modules (gnu))
|
|
|
|
(use-service-modules networking)
|
|
|
|
|
|
|
|
(operating-system
|
|
|
|
$OS_BASE
|
2019-01-10 17:33:36 -05:00
|
|
|
(services (cons (service tor-service-type
|
|
|
|
(tor-configuration
|
|
|
|
(config-file (local-file "my-torrc"))))
|
2015-12-14 13:52:47 -05:00
|
|
|
%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)
|
2017-09-13 10:07:30 -04:00
|
|
|
|
|
|
|
# Searching.
|
|
|
|
guix system search tor | grep "^name: tor"
|
2018-04-30 06:57:23 -04:00
|
|
|
guix system search tor | grep "^shepherdnames: tor"
|
2017-09-13 10:07:30 -04:00
|
|
|
guix system search anonym network | grep "^name: tor"
|
2018-03-15 00:09:15 -04:00
|
|
|
|
|
|
|
# Below, use -n (--dry-run) for the tests because if we actually tried to
|
|
|
|
# build these images, the commands would take hours to run in the worst case.
|
|
|
|
|
|
|
|
# Verify that the examples can be built.
|
2019-04-29 15:57:52 -04:00
|
|
|
for example in gnu/system/examples/*.tmpl; do
|
2020-04-13 11:15:10 -04:00
|
|
|
if echo "$example" | grep hurd; then
|
|
|
|
target="--target=i586-pc-gnu"
|
|
|
|
else
|
|
|
|
target=
|
|
|
|
fi
|
|
|
|
guix system -n disk-image $target "$example"
|
2018-03-15 00:09:15 -04:00
|
|
|
done
|
|
|
|
|
|
|
|
# Verify that the disk image types can be built.
|
|
|
|
guix system -n vm gnu/system/examples/vm-image.tmpl
|
|
|
|
guix system -n vm-image gnu/system/examples/vm-image.tmpl
|
|
|
|
# This invocation was taken care of in the loop above:
|
|
|
|
# guix system -n disk-image gnu/system/examples/bare-bones.tmpl
|
scripts: system: Add support for image-type.
* guix/scripts/system.scm (list-image-types): New procedure,
(%options): add "image-type" and "list-image-types" options, remove
"file-system-type" option,
(show-help): adapt accordingly,
(%default-options): also adapt, and set the default "image-type" to "raw",
(perform-action): add image-type argument and remove file-system-type argument,
(process-action): adapt perform-action call,
(system-derivation-for-action): remove base-image
argument, add image-type argument, and use it to create the image passed to
"system-image".
* tests/guix-system.sh: Adapt accordingly and add a test for
"--list-image-types" command.
* doc/guix.texi (Building the Installation Image,
Invoking guix system): Adapt accordingly.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 10:49:29 -04:00
|
|
|
guix system -n disk-image -t iso9660 gnu/system/examples/bare-bones.tmpl
|
2018-03-15 00:09:15 -04:00
|
|
|
guix system -n docker-image gnu/system/examples/docker-image.tmpl
|
scripts: system: Add support for image-type.
* guix/scripts/system.scm (list-image-types): New procedure,
(%options): add "image-type" and "list-image-types" options, remove
"file-system-type" option,
(show-help): adapt accordingly,
(%default-options): also adapt, and set the default "image-type" to "raw",
(perform-action): add image-type argument and remove file-system-type argument,
(process-action): adapt perform-action call,
(system-derivation-for-action): remove base-image
argument, add image-type argument, and use it to create the image passed to
"system-image".
* tests/guix-system.sh: Adapt accordingly and add a test for
"--list-image-types" command.
* doc/guix.texi (Building the Installation Image,
Invoking guix system): Adapt accordingly.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-07-31 10:49:29 -04:00
|
|
|
|
|
|
|
# Verify that at least the raw image type is available.
|
|
|
|
guix system --list-image-types | grep "raw"
|