| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system.scm (operating-system-derivation)[boot-file-systems]: Keep "/".
* gnu/system/linux-initrd.scm (file-system->spec): Keep the 'check?'
flag.
(qemu-initrd)[helper-packages]: New variable. Pass it as #:to-copy.
<gexp>: Add 'set-path-environment-variable' call. Remove #:unionfs
argument for 'boot-system'.
* gnu/system/vm.scm (%linux-vm-file-systems): Add 'check?' field/
(virtualized-operating-system): Likewise for the "9p" file system.
* guix/build/linux-initrd.scm (mount-root-file-system): Change #:unionfs
default. Call 'check-file-system' before mounting ROOT, when
VOLATILE-ROOT? is false.
(check-file-system): New procedure.
(mount-file-system): Honor 'check?' element in list; add
'check-file-system' call.
(boot-system): Remove #:root-fs-type and #:unionfs parameters.
[root-mount-point?, root-fs-type]: New variables.
Call 'mount-file-system' on all MOUNTS but "/".
|
|
|
|
|
|
|
| |
Fixes a regression introduced in 83bcd0b.
* gnu/system/vm.scm (system-qemu-image): Override the 'file-systems'
field of OS. Add #:file-system-type parameter and honor it.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (qemu-image): Add #:file-system-type parameter.
Pass it to 'initialize-hard-disk'.
* guix/build/linux-initrd.scm (mount-root-file-system): Always honor
TYPE.
(boot-system): Change #:root-fs-type to default to "ext4". Update
docstring.
* guix/build/vm.scm (initialize-hard-disk): Remove #:mkfs parameter; add
#:file-system-type. Adjust 'mkfs' invocation and 'mount' call to
honor #:file-system-type.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system.scm (<operating-system>)[initrd]: Default to
'qemu-initrd'.
(<file-system>): New record type.
(operating-system-root-file-system): New procedure.
(operating-system-derivation): Take the device name for GRUB from
'operating-system-root-file-system'. Pass the
'operating-system-initrd' procedure the list of boot file systems.
* gnu/system/linux-initrd.scm (file-system->spec): New procedure.
(qemu-initrd): Add 'file-systems' parameter, and remove #:mounts
parameter.
[file-system-type-predicate]: New procedure.
[linux-modules]: Use it.
Adjust #:mounts argument in 'boot-system' call.
(gnu-system-initrd): Remove.
* gnu/system/vm.scm (%linux-vm-file-systems): New variable.
(expression->derivation-in-linux-vm): Adjust call to 'qemu-initrd'.
(virtualized-operating-system): New procedure.
(system-qemu-image/shared-store-script)[initrd]: Remove. Use
'virtualized-operating-system'. Get the 'initrd' file from OS-DRV.
* guix/build/linux-initrd.scm (mount-qemu-smb-share, mount-qemu-9p):
Remove.
(MS_RDONLY, MS_BIND): New global variables.
(bind-mount): Remove local 'MS_BIND' definition.
(mount-root-file-system): New procedure, with code formerly in
'boot-system'.
(mount-file-system): New procedure.
(boot-system): Add #:root-fs-type parameter. Remove 'MS_RDONLY' local
variable. Use 'mount-root-file-system' and 'mount-file-system'.
* doc/guix.texi (Using the Configuration System): Add 'file-system'
declaration.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (%imported-modules): Remove.
(expression->derivation-in-linux-vm): Remove 'inputs' parameter.
Rename 'imported-modules' to 'modules'. Rewrite using gexps and
'gexp->derivation'.
(qemu-image): Add 'qemu' parameter. Pass NAME to
'expression->derivation-in-linux-vm'. Rewrite using gexps. Remove
#:inputs argument to 'expression->derivation-in-linux-vm'.
(operating-system-default-contents): Rewrite using gexps.
* gnu/system.scm (operating-system-profile-derivation): Rename to...
(operating-system-profile): ... this. Adjust callers.
(operating-system-profile-directory): Remove.
|
|
|
|
|
|
|
|
| |
* gnu/system.scm (operating-system-boot-script): Use 'gexp->file'
instead of 'text-file*'.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise.
(system-qemu-image/shared-store-script)[builder]: Turn into a gexp.
Use 'gexp->derivation' instead of 'derivation-expression'.
|
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Move
'initrd' definition to the top-level. Have a single definition of
'initrd', 'image', and 'os-drv'.
|
|
|
|
|
|
|
|
| |
* guix/build/vm.scm (read-reference-graph, initialize-partition-table,
install-grub, populate-store, evaluate-populate-directive,
reset-timestamps, initialize-hard-disk): New procedures.
* gnu/system/vm.scm (qemu-image): Change 'builder' to a call to
'initialize-hard-disk'.
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (%imported-modules): New procedure.
(expression->derivation-in-linux-vm): Add #:imported-modules
parameter; remove #:modules. Add LOADER, and change BUILDER to load
it.
(qemu-image): Remove useless #:modules argument.
|
|
|
|
| |
* gnu/system/vm.scm: Strip #:select for (gnu packages base).
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (input->name+output): New procedure.
(expression->derivation-in-linux-vm): Use it for 'input-alist'.
(qemu-image)[input->name+derivation]: Remove. Use
'input->name+output' instead.
|
|
|
|
|
|
| |
* guix/build/vm.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Use it.
|
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image/shared-store-script): Change
#:qemu to default to QEMU. Change INITRD to use a 9p mount for the
store. Change command-line to use -virtfs.
|
|
|
|
|
|
|
| |
* gnu/packages/package-management.scm (guix): Upgrade to 0.6.
* gnu/services/dmd.scm (dmd-configuration-file): Change /var/nix to
/var/guix.
* gnu/system/vm.scm (operating-system-default-contents): Likewise.
|
|
|
|
|
| |
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add
#:memory-size parameter, defaulting to 256 (QEMU defaults to 128.)
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Change #:qemu
to default to QEMU-HEADLESS. Use "-net nic,model=virtio". Remove
"-net user,smb=..." and add "-virtfs" options. Change default initrd
to include two 9p mounts.
|
|
|
|
|
|
|
|
| |
* gnu/packages/gcc.scm (gcc-4.7): Change /nix/store in comment.
* gnu/system/vm.scm (operating-system-default-contents):
Use (%store-prefix) instead of "/nix/store".
* guix/derivations.scm (derivation-path->output-path,
derivation-path->output-paths): Change to /gnu/store in docstring.
|
|
|
|
|
|
| |
* guix/build/linux-initrd.scm (make-essential-device-nodes): Create
/dev/ptmx and /dev/pts.
* gnu/system/vm.scm (qemu-image): Umount /fs/dev/pts before /fs.
|
|
|
|
|
|
| |
* gnu/system/vm.scm (%demo-operating-system): Remove.
(system-qemu-image, system-qemu-image/shared-store,
system-qemu-image/shared-store-script): Adjust accordingly.
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/dmd.scm: Remove file. Move contents to...
* gnu/services.scm, gnu/services/base.scm, gnu/services/dmd.scm,
gnu/services/networking.scm, gnu/services/xorg.scm: ... here. New
files.
* gnu/system.scm, gnu/system/vm.scm: Adjust accordingly.
* guix/scripts/system.scm (%user-module): Likewise.
* doc/guix.texi (Using the Configuration System): Likewise.
(Defining Services): Likewise.
|
|
|
|
|
|
| |
* gnu/system.scm (operating-system-derivation): Change root's
'home-directory' to "/root".
* gnu/system/vm.scm (operating-system-default-contents): Add /root.
|
|
|
|
|
|
| |
* gnu/system/vm.scm (operating-system-default-contents)[user-directories]:
New procedure. Use it to create each user's home and GC root
directories.
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (operating-system-default-contents): Populate
/run/current-system and create /bin/sh.
* gnu/system.scm (operating-system-profile-derivation,
operating-system-profile-directory): New procedures.
(operating-system-derivation): Use it.
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (qemu-image): Check whether GUIX is #f.
(operating-system-build-gid, operating-system-default-contents): New
procedures.
(system-qemu-image): Use 'operating-system-build-gid'.
(system-qemu-image/shared-store,
system-qemu-image/shared-store-script): New procedures.
* gnu/system.scm: Add missing exports.
|
|
|
|
|
|
|
| |
* guix/build/linux-initrd.scm (make-essential-device-nodes): Rename
devices with major = 8 to /dev/sda*. Make /dev/vda* devices.
* gnu/system/vm.scm (qemu-image): Change '/dev/vda' to '/dev/sda'.
* gnu/system.scm (operating-system-derivation): Likewise.
|
|
|
|
|
| |
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass QEMU
'-enable-kvm'.
|
|
|
|
|
|
|
|
|
|
| |
* guix/build/linux-initrd.scm (boot-system): New procedure.
* gnu/system/linux-initrd.scm (qemu-initrd): Add keyword parameters
'guile-modules-in-chroot?' and 'mounts'. Change builder to simply
call 'boot-system'.
(gnu-system-initrd): Change to a simple call to 'qemu-initrd'.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Call
'qemu-initrd' with #:guile-modules-in-chroot?.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/packages/linux-initrd.scm: Remove.
* gnu/system/linux-initrd.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/system.scm (<operating-system>): Change default 'initrd' value
to (gnu-system-initrd).
(operating-system-derivation): Bind 'operating-system-initrd'. Pass
'menu-entry' an initrd file name instead of a package.
* gnu/system/grub.scm (grub-configuration-file): Expect 'initrd' to be
file name.
|
|
|
|
|
|
|
|
| |
* gnu/packages/version-control.scm, gnu/packages/vim.scm,
gnu/system.scm, gnu/system/dmd.scm, gnu/system/shadow.scm,
gnu/system/vm.scm: Change references to (gnu packages system) to (gnu
packages admin).
This is a followup to commit 4aeea89.
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image): Add 'disk-image-size'
parameter; increase it.
|
|
|
|
|
|
|
|
| |
* gnu/system.scm (etc-directory): Add 'locale' and 'timezone'
parameters. Set 'LC_ALL', 'TZ', and 'TZDIR' in /etc/profile.
(operating-system-derivation): Adjust call accordingly.
* gnu/system/vm.scm (%demo-operating-system): Change locale to
'en_US.UTF-8'. Add TZDATA to 'packages'.
|
|
|
|
|
|
|
|
|
| |
* gnu/system.scm (union): Allow (PACKAGE OUTPUT), (PACKAGE), and
PACKAGE.
(<operating-system>)[packages]: Make the default a list of package?
objects.
* gnu/system/vm.scm (%demo-operating-system): Likewise. Add a few
packages.
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/shadow.scm (<user-account>)[inputs]: New field.
(passwd-file): Bind the 'shell' field of each account.
* gnu/system/vm.scm (%demo-operating-system): Remove 'shell' field.
* gnu/system/dmd.scm (guix-build-accounts): Store a monadic value in
'shell'. Add 'inputs' field.
* gnu/system.scm (operating-system-derivation): Remove 'shell' field for
'root' account. Add all the 'user-account-inputs' to EXTRAS.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (lower-inputs): Move to monads.scm.
(qemu-image): Don't add GRUB-CONFIGURATION to the INPUTS-TO-COPY.
(union, file-union, etc-directory): Move to gnu/system.scm.
(%demo-operating-system): New variable.
(system-qemu-image): Add 'os' parameter. Rewrite in terms of
'operating-system-derivation'.
* guix/monads.scm (lower-inputs): New procedure.
* gnu/system/grub.scm (grub-configuration-file): Change 'entries' to be
a plain list instead of a list of monadic values.
* gnu/system.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
|
|
|
|
|
|
|
|
|
|
| |
* gnu/packages/patches/dmd-getpw.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/system.scm (dmd): Use it.
* gnu/system/vm.scm (system-qemu-image): Don't explicitly populate /etc;
don't add ETC to the GC roots.
* gnu/system/dmd.scm (dmd-configuration-file): Add 'etc' parameter.
[config]: Populate /etc from there.
|
|
|
|
|
|
|
|
| |
* gnu/system/dmd.scm (<service>)[pam-services]: New field.
(mingetty-service): Add #:motd and #:allow-empty-passwords?
parameters. Add MOTD to 'inputs' field; add 'pam-services' field.
* gnu/system/vm.scm (system-qemu-image): Aggregate PAM entries from
SERVICES.
|
|
|
|
|
| |
* gnu/system/vm.scm (file-union): Filter out members of FILES that are
outputs of INPUTS.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/shadow.scm (guix-build-accounts): Move to...
* gnu/system/dmd.scm (guix-build-accounts): ... here.
(<service>)[user-accounts, user-groups]: New fields.
(guix-service): New #:build-user-id and #:build-accounts parameters.
Use 'guix-build-accounts' and set the 'user-accounts' and
'user-groups' fields accordingly.
* gnu/system/vm.scm (system-qemu-image): Remove use of
'guix-build-accounts'. Augment ACCOUNTS and GROUPS from what SERVICES
demand.
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (etc-directory): Remove 'resolv.conf'.
(system-qemu-image): Use 'static-networking-service' with
#:name-servers. Don't populate the image with /etc/resolv.conf.
* gnu/system/dmd.scm (static-networking-service): Add #:name-servers
parameter. Use it to populate /etc/resolv.conf.
|
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (expression->derivation-in-linux-vm)[lower-inputs]:
Move to top-level...
(lower-inputs): ... here. New variable.
(file-union, etc-directory): New procedures.
(system-qemu-image): Use 'etc-directory'; remove redundant code, and
register the result of 'etc-directory' as a GC root.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* guix/derivations.scm (build-expression->derivation): Turn 'system' and
'inputs' into keyword parameters.
Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
guix/build-system/gnu.scm, guix/build-system/perl.scm,
guix/build-system/python.scm, guix/build-system/trivial.scm,
guix/download.scm, guix/packages.scm, guix/profiles.scm,
guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
'build-expression->derivation' and 'derivation-expression'
accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
documentation accordingly.
(The Store Monad): Likewise for 'derivation-expression'.
|
|
|
|
|
| |
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass "-f
qcow2" to 'qemu-img create'.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
|
|
|
|
|
|
|
| |
* gnu/packages/package-management.scm (guix): Update to 0.4.
(guix-0.4): Remove.
* gnu/system/vm.scm (qemu-image, system-qemu-image): Use GUIX instead of
GUIX-0.4.
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image): Remove reference from BOOT to
MINGETTY since MINGETTY may not be valid yet.
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image): Add grep, sed, and Findutils to
the profile.
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image): Add procps, psmisc, and Zile to
the default profile. Increase the image size to 550 MiB.
|
|
|
|
|
|
|
|
| |
* gnu/system/vm.scm (qemu-image): Change the store's mode to #o1775.
Support 'populate' clauses that specify a UID and GID.
(system-qemu-image): Make sure /nix/store has owner 'root' and group
'guixbuild'. Set the right owner for /home/guest. Create
/var/nix/profiles/per-user/{root,guest}.
|
|
|
|
|
|
|
|
| |
* gnu/system/shadow.scm (guix-build-accounts): New procedure.
* gnu/system/vm.scm (system-qemu-image): Use it. Add the "guixbuild"
group.
* gnu/system/dmd.scm (guix-service): Add 'builder-group' parameter.
Pass 'guix-daemon' the '--build-users-group' option.
|
|
|
|
|
| |
* gnu/system/vm.scm (system-qemu-image): Link
/etc/{services,protocols,rpc}. Add net-base as an input.
|