summaryrefslogtreecommitdiff
path: root/gnu/system
Commit message (Collapse)AuthorAge
* install: Add missing argv[0] in Info invocation.Ludovic Courtès2014-06-04
| | | | | * gnu/system/install.scm (log-to-info): Add "info" as second argument to 'execl'.
* vm: Add #:name parameter for 'system-disk-image'.Ludovic Courtès2014-06-04
| | | | | * gnu/system/vm.scm (system-disk-image): Add #:name parameter; pass it to 'qemu-image'.
* install: Register the hydra.gnu.org key on the installation image.Ludovic Courtès2014-06-04
| | | | | | | | * gnu/services/base.scm (hydra-key-authorization): New procedure. (guix-service): Add #:authorize-hydra-key? parameter; honor it using 'hydra-key-authorization'. * gnu/system/install.scm (installation-services): Pass #:authorize-hydra-key? #t.
* system: Define '%base-packages' and use it.Ludovic Courtès2014-06-04
| | | | | | | | | | * gnu/system.scm (<operating-system>)[packages]: Change default value to %BASE-PACKAGES. (%base-packages): New variable. * gnu/system/install.scm (installation-os): Use it when defining the 'packages' field. * doc/guix.texi (Using the Configuration System): Use %BASE-PACKAGES in example. Remove now unneeded module imports. Explain this.
* install: Add more useful packages.Ludovic Courtès2014-06-03
| | | | | * gnu/system/install.scm (installation-os)[packages]: Add isc-dhcp, net-tools, ddrescue, kbd, and texinfo-4.
* gnu: Merge Parted, fdisk, and ddrescue in (gnu packages disk).Ludovic Courtès2014-06-03
| | | | | | | | | | | * gnu/packages/parted.scm: Rename to... * gnu/packages/disk.scm: ... this. New file. Merge with... * gnu/packages/fdisk.scm: ... this; remove file; * gnu/packages/ddrescue.scm: ... and this; remove file. * gnu/system/install.scm, gnu/system/vm.scm: Adjust accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Remove gnu/packages/{parted,fdisk,ddrescue}.scm and add gnu/packages/disk.scm.
* system: File system sources can be marked as labels or devices.Ludovic Courtès2014-06-03
| | | | | | | | | | | | | | | | | * gnu/system/file-systems.scm (<file-system>)[title]: New field. * gnu/services/base.scm (file-system-service): Add #:title parameter. In 'start' gexp, use 'canonicalize-device-spec' and honor TITLE. * gnu/system.scm (other-file-system-services, operating-system-root-file-system, operating-system-initrd-file): Adjust accordingly. * gnu/system/linux-initrd.scm (file-system->spec): Likewise. * gnu/system/vm.scm (system-disk-image): Add 'title' field for the root file system. * guix/build/linux-initrd.scm (mount-file-system): Expect the second element of SPEC to be the title. (boot-system)[root-mount-point?, root-fs-type]: Likewise. * gnu/services/dmd.scm (dmd-configuration-file): Select 'canonicalize-device-spec'.
* Add (gnu system install).Ludovic Courtès2014-05-31
| | | | | * gnu/system/install.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* vm: disk-image: Specify the root file system using a label.Ludovic Courtès2014-05-30
| | | | | | * gnu/system/vm.scm (system-disk-image)[root-label]: New variable. Use it for the root file system, and pass it as #:file-system-label to 'qemu-image'.
* vm: Allow a volume name to be specified for the root partition.Ludovic Courtès2014-05-29
| | | | | | | | | * guix/build/vm.scm (format-partition): Add #:label parameter, and honor it. (initialize-hard-disk): Add #:file-system-label parameter, and pass it to 'format-partition'. * gnu/system/vm.scm (qemu-image): Add #:file-system-label parameter and pass it to 'initialize-hard-disk'.
* vm: Disable QEMU networking in the disk image initrd.Ludovic Courtès2014-05-23
| | | | | | * gnu/system/linux-initrd.scm (qemu-initrd): Add #:qemu-networking? parameter and honor it. * gnu/system/vm.scm (system-disk-image): Pass #:qemu-networking #f.
* vm: Add 'system-disk-image'.Ludovic Courtès2014-05-22
| | | | * gnu/system/vm.scm (system-disk-image): New procedure.
* vm: Use a para-virtualized disk when creating an image.Ludovic Courtès2014-05-22
| | | | | | * guix/build/vm.scm (load-in-linux-vm): When MAKE-DISK-IMAGE?, use '-drive ...,if=virtio' for better performance. * gnu/system/vm.scm (qemu-image): Use /dev/vda instead of /dev/sda.
* vm: Make the image format a parameter.Ludovic Courtès2014-05-22
| | | | | | | | * guix/build/vm.scm (load-in-linux-vm): Add #:disk-image-format parameter; add 'image-file' variable. Honor DISK-IMAGE-FORMAT. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add #:disk-image-format parameter, and honor it. (qemu-image): Likewise.
* Add (gnu system file-systems).Ludovic Courtès2014-05-20
| | | | | | | | | | | | | This fixes a circular dependency between (gnu system) and (gnu system linux-initrd), where the latter could end up being compiled before 'file-system-type' was defined as a macro. * gnu/system.scm (<file-system>, %fuse-control-file-system, %binary-format-file-system): Move to... * gnu/system/file-systems.scm: ... here. New file. * build-aux/hydra/demo-os.scm, gnu/system/linux-initrd.scm, gnu/system/vm.scm: Use it. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* vm: Make the device name a parameter.Ludovic Courtès2014-05-19
| | | | | | | * guix/build/vm.scm (initialize-partition-table): Honor 'device' parameter. (initialize-hard-disk): Add 'device' parameter and honor it. * gnu/system/vm.scm (qemu-image): Adjust accordingly.
* system: Add 'grub-configuration' record.Ludovic Courtès2014-05-18
| | | | | | | | | | | * gnu/system/grub.scm (<grub-configuration>): New record type. (grub-configuration-file): Add 'config' parameter; remove #:default-entry and #:timeout. Honor CONFIG. * gnu/system.scm (<operating-system>): Remove 'bootloader-entries' field; remove default value for 'bootloader' field. (operating-system-grub.cfg): Pass the 'bootloader' field to 'grub-configuration-file'. * build-aux/hydra/demo-os.scm (bootloader): New field.
* system: Make /run/current-system at activation time.Ludovic Courtès2014-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/system.scm (etc-directory): Change default value of #:profile. Change contents of SHELLS. Use /run/current-system/profile/{s,}bin in BASHRC. (operating-system-boot-script)[%modules]: Add (guix build linux-initrd). Add call to 'activate-current-system' in gexp. (operating-system-initrd-file, operating-system-grub.cfg): New procedures. (operating-system-derivation): Don't build grub.cfg here and remove it from the file union. * gnu/system/vm.scm (qemu-image): Remove #:populate. (operating-system-build-gid, operating-system-default-contents): Remove. (system-qemu-image): Remove call to 'operating-system-default-contents'. Use 'operating-system-grub.cfg' to get grub.cfg. Add GRUB.CFG to #:inputs. (system-qemu-image/shared-store): Likewise, but don't add GRUB.CFG to #:inputs. (system-qemu-image/shared-store-script): Pass --system kernel option. * guix/build/activation.scm (%booted-system, %current-system): New variables. (boot-time-system, activate-current-system): New procedures. * guix/build/install.scm (evaluate-populate-directive): Add case for ('directory name uid gid mode). (directives, populate-root-file-system): New procedures. * guix/build/vm.scm (initialize-hard-disk): Replace calls to 'evaluate-populate-directive' by a call to 'populate-root-file-system'. * gnu/services/dmd.scm (dmd-configuration-file): Use /run/current-system/profile/bin. * gnu/services/xorg.scm (slim-service): Likewise.
* system: Add (guix build install) module.Ludovic Courtès2014-05-15
| | | | | | | | | * guix/build/vm.scm (install-grub, evaluate-populate-directive, reset-timestamps, register-closure): Move to... * guix/build/install.scm: ... here. New file. * Makefile.am (MODULES): Add it. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add (guix build install) to #:modules.
* vm: Support initialization of the store DB when the store is shared.Ludovic Courtès2014-05-15
| | | | | | | | | | | | | | | | | | | * gnu/system/vm.scm (qemu-image): Rename #:inputs-to-copy to #:inputs, and #:initialize-store? to #:register-closures?. Add #:copy-inputs?. Adjust build gexp accordingly. (system-qemu-image): Remove #:initialize-store? argument and add #:copy-inputs?. (system-qemu-image/shared-store): Add #:inputs, #:register-closures?, and #:copy-inputs? arguments. * guix/build/vm.scm (register-closure): New procedure. (MS_BIND): New variable. (initialize-hard-disk): Rename #:initialize-store? to #:register-closures?, #:closures-to-copy to #:closures, and add #:copy-closures?. Add 'target-directory' and 'target-store' variables. Call 'populate-store' only when COPY-CLOSURES?. Bind-mount the store to TARGET-STORE when REGISTER-CLOSURES? and not COPY-CLOSURES?. Add call to 'register-closure'.
* vm: Keep acceptable file systems from the original OS.Ludovic Courtès2014-05-14
| | | | | | | * gnu/system/vm.scm (virtualized-operating-system): Instead of completely overriding 'file-systems', use 'remove' to filter out some of those declared in OS. (system-qemu-image): Likewise.
* vm: Pass '-serial stdio' in the run-vm.sh.Ludovic Courtès2014-05-14
| | | | | * gnu/system/vm.scm (system-qemu-image/shared-store-script): Add '-serial stdio'.
* system: Move skeleton code to (gnu system shadow).Ludovic Courtès2014-05-14
| | | | | * gnu/system.scm (default-skeletons, skeleton-directory): Move to... * gnu/system/shadow.scm: ... here.
* system: Make accounts and groups at activation time.Ludovic Courtès2014-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/services/base.scm (guix-build-accounts): Remove #:gid parameter; add #:group. Remove 'password' and 'gid' fields in 'user-account' form, and add 'group'. (guix-service): Remove #:build-user-gid parameter. Remove 'id' field in 'user-group' form. * gnu/system.scm (etc-directory): Remove #:groups and #:accounts. No longer produce files "passwd", "shadow", and "group". Adjust caller accordingly. (%root-account): New variable. (operating-system-accounts): Add 'users' variable. Add %ROOT-ACCOUNT only of 'operating-system-users' doesn't already contain a root account. (user-group->gexp, user-account->gexp): New procedures. (operating-system-boot-script): Add calls to 'setenv' and 'activate-users+groups' in gexp. * gnu/system/linux.scm (base-pam-services): Add PAM services for "user{add,del,mode}" and "group{add,del,mod}". * gnu/system/shadow.scm (<user-account>)[gid]: Rename to... [group]: ... this. [supplementary-groups]: New field. [uid, password]: Default to #f. (<user-group>)[id]: Default to #f. (group-file, passwd-file): Remove. * gnu/system/vm.scm (operating-system-default-contents)[user-directories]: Remove. Add "/home" to the directives. * guix/build/activation.scm (add-group, add-user, activate-users+groups): New procedures.
* vm: Fix recently-introduced regression in 'operating-system-services' use.Ludovic Courtès2014-05-10
| | | | | * gnu/system/vm.scm (operating-system-build-gid): Adjust to new return type of 'operating-system-services' introduced in 217a5b8.
* linux-initrd: Check the root and other early file systems.Ludovic Courtès2014-05-04
| | | | | | | | | | | | | | | | | | | | * 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 "/".
* vm: Provide a root partition for the freestanding VM image.Ludovic Courtès2014-05-03
| | | | | | | 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.
* vm: Make root file system type a parameter, and default to ext4.Ludovic Courtès2014-05-03
| | | | | | | | | | | | * 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.
* system: Add first-class file system declarations.Ludovic Courtès2014-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* system: Add 'sudo' to the setuid programs, and handle /etc/sudoers.Ludovic Courtès2014-05-01
| | | | | | | | | | | | | | * gnu/system.scm (<operating-system>)[groups]: Change default to just the 'root' group. [sudoers]: New field. (etc-directory): Add #:sudoers parameter. Add 'sudoers' to the file union. (operating-system-etc-directory): Pass #:sudoers to 'etc-directory'. (%setuid-programs): Add 'sudo'. (%sudoers-specification): New variable. * gnu/system/linux.scm (base-pam-services): Add 'sudo'. * build-aux/hydra/demo-os.scm: Add 'groups' field; add 'guest' to the 'wheel' group.
* system: Add support for setuid binaries.Ludovic Courtès2014-04-30
| | | | | | | | | | | | | | | * gnu/system.scm (<operating-system>)[pam-services, setuid-programs]: New fields. (etc-directory)[bashrc]: Prepend /run/setuid-programs to $PATH. (operating-system-etc-directory): Honor 'operating-system-pam-services'. (%setuid-programs): New variable. (operating-system-boot-script): Add (guix build utils) to the set of imported modules. Call 'activate-setuid-programs' in boot script. * gnu/system/linux.scm (base-pam-services): New procedure. * guix/build/activation.scm (%setuid-directory): New variable. (activate-setuid-programs): New procedure. * build-aux/hydra/demo-os.scm: Add 'pam-services' field.
* linux-initrd: Rewrite using gexps.Ludovic Courtès2014-04-28
| | | | | | | * gnu/system/linux-initrd.scm (expression->initrd): Rename 'inputs' parameter to 'to-copy'. Remove 'files-to-copy'. Rewrite 'builder' as a gexp, and use 'gexp->derivation'. (qemu-initrd): Adjust accordingly.
* system: grub: Rewrite using gexps.Ludovic Courtès2014-04-28
| | | | | | * gnu/system/grub.scm (grub-configuration-file): Rewrite using 'gexp->derivation'. * gnu/system.scm (operating-system-derivation): Adjust accordingly.
* services: Rewrite using gexps.Ludovic Courtès2014-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/services.scm (<service>)[inputs]: Remove. * gnu/system.scm (links): Remove. (etc-directory): Add PASSWD and SHADOW to #:inputs. (operating-system-boot-script): Pass ETC to 'dmd-configuration-file'. (operating-system-derivation): Remove EXTRAS from the union. * gnu/system/linux.scm (pam-service->configuration): Rewrite in terms of 'gexp->derivation'. Compute the contents on the build side. Expect 'arguments' to contain a list of gexps. (pam-services->directory): Rewrite in terms of 'gexp->derivation'. (unix-pam-service): Change 'arguments' to a list of one gexp. * gnu/system/shadow.scm (<user-account>)[inputs]: Remove. [shell]: Change default value to a gexp. (passwd-file): Rewrite in terms of 'gexp->derivation'. Compute contents on the build side. * gnu/services/base.scm (host-name-service, mingetty-service, nscd-service, syslog-service, guix-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. (guix-build-accounts): Change 'shell' field to a gexp. * gnu/services/networking.scm (static-networking-service): Change 'start' and 'stop' to gexps; remove 'inputs' field. * gnu/services/xorg.scm (slim-service): Likewise. * gnu/services/dmd.scm (dmd-configuration-file): Expect ETC to be a derivation. Change 'config' to a gexp. Use 'gexp->file' instead of 'text-file'. * doc/guix.texi (Defining Services): Update nscd example with gexps, and without 'inputs'. Add xref to "G-Expressions".
* vm: Rewrite support procedures to use gexps.Ludovic Courtès2014-04-28
| | | | | | | | | | | | | | * 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: Use gexps in obvious places in (gnu system ...).Ludovic Courtès2014-04-28
| | | | | | | | * 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'.
* vm: Clarify 'system-qemu-image/shared-store-script'.Ludovic Courtès2014-04-23
| | | | | | * 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'.
* linux-initrd: Mount / as a unionfs when asking for a volatile root.Ludovic Courtès2014-04-14
| | | | | | | | | | | | | | * guix/build/linux-initrd.scm (make-essential-device-nodes): Make /dev/fuse. (boot-system): Add #:unionfs parameter. Invoke UNIONFS instead of copying files over when VOLATILE-ROOT? is true. * gnu/system/linux-initrd.scm (expression->initrd): Add #:inputs parameter. [files-to-copy]: New procedure. [builder]: Add 'to-copy' parameter; honor it. (qemu-initrd)[linux-modules]: Add 'fuse.ko' when VOLATILE-ROOT?. Pass UNIONFS-FUSE/STATIC as #:inputs; change builder to pass #:unionfs to 'boot-system'.
* vm: Move image creation to (guix build vm); split into several procedures.Ludovic Courtès2014-04-11
| | | | | | | | * 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'.
* vm: 'expression->derivation-in-linux-vm' can import modules in the VM.Ludovic Courtès2014-04-11
| | | | | | | | * 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.
* vm: Strip import list.Ludovic Courtès2014-04-11
| | | | * gnu/system/vm.scm: Strip #:select for (gnu packages base).
* vm: Factorize input conversion.Ludovic Courtès2014-04-11
| | | | | | | * 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.
* vm: Add (guix build vm) module.Ludovic Courtès2014-04-11
| | | | | | * guix/build/vm.scm: New file. * Makefile.am (MODULES): Add it. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Use it.
* vm: Use QEMU's para-virtualized file system support for all VMs.Ludovic Courtès2014-04-10
| | | | | | * 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: guix: Upgrade to 0.6.Ludovic Courtès2014-04-09
| | | | | | | * 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.
* vm: Add #:memory-size parameter for 'expression->derivation-in-linux-vm'.Ludovic Courtès2014-04-09
| | | | | * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add #:memory-size parameter, defaulting to 256 (QEMU defaults to 128.)
* gnu: linux-initrd: Default initrd has no network mounts.Ludovic Courtès2014-04-09
| | | | | * gnu/system/linux-initrd.scm (gnu-system-initrd): Add #:mounts argument.
* vm: 'expression->derivation-in-linux-vm' uses QEMU virtfs/9p.Ludovic Courtès2014-04-09
| | | | | | | * 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.
* More /gnu/store replacements.Ludovic Courtès2014-03-10
| | | | | | | | * 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.
* gnu: linux-initrd: Make the pseudo-tty device nodes.Ludovic Courtès2014-03-10
| | | | | | * 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.