Browse Source

* More moving.

svn path=/nixos/branches/modular-nixos/; revision=15725
nsd-state-dir
Eelco Dolstra 14 years ago
parent
commit
278b15d840
  1. 4
      etc/default.nix
  2. 0
      modules/config/i18n.nix
  3. 0
      modules/config/unix-odbc-drivers.nix
  4. 4
      modules/config/users-groups.nix
  5. 0
      modules/system/activation/activation-script.nix
  6. 0
      modules/system/boot/kernel.nix
  7. 0
      modules/system/boot/stage-1-init.sh
  8. 4
      modules/system/boot/stage-1.nix
  9. 0
      modules/system/boot/stage-2-init.sh
  10. 6
      modules/system/boot/stage-2.nix
  11. 0
      modules/system/upstart-events/ctrl-alt-delete.nix
  12. 3
      modules/system/upstart-events/halt.nix
  13. 0
      modules/system/upstart-events/maintenance-shell.nix
  14. 24
      system/options.nix
  15. 2
      system/system-options.nix
  16. 2
      system/system.nix

4
etc/default.nix

@ -251,10 +251,10 @@ in
option
# config.system.build
../system/system-options.nix
# ../system/system-options.nix
# config.system.activationScripts
../system/activate-configuration.nix
# ../system/activate-configuration.nix
];
system = {

0
system/i18n.nix → modules/config/i18n.nix

0
system/unix-odbc-drivers.nix → modules/config/unix-odbc-drivers.nix

4
system/users-groups.nix → modules/config/users-groups.nix

@ -41,7 +41,7 @@ in
###### implementation
let
ids = import ./ids.nix;
ids = import ../../system/ids.nix;
defaultShell = config.system.shell;
# User accounts to be created/updated by NixOS.
@ -151,7 +151,7 @@ in
options
# config.system.activationScripts
../system/activate-configuration.nix
# ../system/activate-configuration.nix
];
system = {

0
system/activate-configuration.nix → modules/system/activation/activation-script.nix

0
system/kernel.nix → modules/system/boot/kernel.nix

0
boot/boot-stage-1-init.sh → modules/system/boot/stage-1-init.sh

4
boot/boot-stage-1.nix → modules/system/boot/stage-1.nix

@ -144,7 +144,7 @@ rec {
# The init script of boot stage 1 (loading kernel modules for
# mounting the root FS).
bootStage1 = pkgs.substituteAll {
src = ./boot-stage-1-init.sh;
src = ./stage-1-init.sh;
shell = "${extraUtils}/bin/bash";
@ -192,7 +192,7 @@ rec {
suffix = "/bin/splash_helper";
symlink = "/${kernelPackages.splashutils.helperName}";
} # */
{ object = import ../helpers/unpack-theme.nix {
{ object = import ../../../helpers/unpack-theme.nix {
inherit (pkgs) stdenv;
theme = config.services.ttyBackgrounds.defaultTheme;
};

0
boot/boot-stage-2-init.sh → modules/system/boot/stage-2-init.sh

6
boot/boot-stage-2.nix → modules/system/boot/stage-2.nix

@ -18,7 +18,7 @@ let
bootLocal = config.boot.localCommands;
bootStage2 = substituteAll {
src = ./boot-stage-2-init.sh;
src = ./stage-2-init.sh;
isExecutable = true;
inherit kernel upstart isLiveCD activateConfiguration upstartPath;
path = [
@ -37,10 +37,10 @@ in
# config.boot.kernelPackages
# config.system.activationScripts
../system/activate-configuration.nix
# ../system/activate-configuration.nix
# config.system.build
../system/system-options.nix
# ../system/system-options.nix
];
system = {

0
upstart-jobs/ctrl-alt-delete.nix → modules/system/upstart-events/ctrl-alt-delete.nix

3
upstart-jobs/halt.nix → modules/system/upstart-events/halt.nix

@ -92,7 +92,8 @@ let
sync || true
# Right now all events above power off the system.
# Either reboot or power-off the system. Note that the "halt"
# event also does a power-off.
if test ${event} = reboot; then
exec reboot -f
else

0
upstart-jobs/maintenance-shell.nix → modules/system/upstart-events/maintenance-shell.nix

24
system/options.nix

@ -380,9 +380,14 @@ in
require = [
#../modules/hardware/network/intel-3945abg.nix
../boot/boot-stage-2.nix
../etc/default.nix
../modules/config/fonts.nix
../modules/config/i18n.nix
../modules/config/unix-odbc-drivers.nix
../modules/config/users-groups.nix
../modules/installer/grub/grub.nix
../modules/security/setuid-wrappers.nix
../modules/security/sudo.nix
../modules/services/audio/alsa.nix
../modules/services/audio/pulseaudio.nix
../modules/services/databases/mysql.nix
@ -436,28 +441,23 @@ in
../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk
../modules/services/x11/xfs.nix
../modules/services/x11/xserver/default.nix
../system/activate-configuration.nix
../modules/system/activation/activation-script.nix
../modules/system/boot/kernel.nix
../modules/system/boot/stage-2.nix
../modules/system/upstart-events/ctrl-alt-delete.nix
../modules/system/upstart-events/halt.nix
../modules/system/upstart-events/maintenance-shell.nix
../system/assertion.nix
../modules/config/fonts.nix
../system/i18n.nix
../system/kernel.nix
../system/nixos-environment.nix
../system/nixos-installer.nix
../modules/security/setuid-wrappers.nix
../modules/security/sudo.nix
../system/system-options.nix
../system/unix-odbc-drivers.nix
../system/users-groups.nix
../upstart-jobs/cron/locate.nix
../upstart-jobs/ctrl-alt-delete.nix
../upstart-jobs/default.nix
../upstart-jobs/filesystems.nix
../upstart-jobs/guest-users.nix
../upstart-jobs/halt.nix
../upstart-jobs/kbd.nix
../upstart-jobs/ldap
../upstart-jobs/lvm.nix
../upstart-jobs/maintenance-shell.nix
../upstart-jobs/network-interfaces.nix
../upstart-jobs/pcmcia.nix
../upstart-jobs/swap.nix

2
system/system-options.nix

@ -83,7 +83,7 @@ in
option
# config.system.activationScripts
../system/activate-configuration.nix
# ../system/activate-configuration.nix
];
system = {

2
system/system.nix

@ -38,7 +38,7 @@ rec {
# The initial ramdisk.
initialRamdiskStuff = import ../boot/boot-stage-1.nix {
initialRamdiskStuff = import ../modules/system/boot/stage-1.nix {
inherit pkgs config;
};

Loading…
Cancel
Save