* Refactoring.

svn path=/nixos/trunk/; revision=7533
2007-01-04 10:29:40 +00:00 · 2007-01-04 10:29:40 +00:00 · b6b5bafa22
commit b6b5bafa22
parent acacfda1b2
24 changed files with 2 additions and 2 deletions
--- a/configuration/activate-configuration.sh
+++ b/configuration/activate-configuration.sh
--- a/configuration/config.nix
+++ b/configuration/config.nix
--- a/configuration/etc.nix
+++ b/configuration/etc.nix
--- a/configuration/etc/default/passwd
+++ b/configuration/etc/default/passwd
--- a/configuration/etc/dhclient-exit-hooks
+++ b/configuration/etc/dhclient-exit-hooks
--- a/configuration/etc/hosts
+++ b/configuration/etc/hosts
--- a/configuration/etc/issue
+++ b/configuration/etc/issue
--- a/configuration/etc/login.defs
+++ b/configuration/etc/login.defs
--- a/configuration/etc/nsswitch.conf
+++ b/configuration/etc/nsswitch.conf
--- a/configuration/etc/pam.d/login
+++ b/configuration/etc/pam.d/login
--- a/configuration/etc/pam.d/other
+++ b/configuration/etc/pam.d/other
--- a/configuration/etc/pam.d/passwd
+++ b/configuration/etc/pam.d/passwd
--- a/configuration/etc/pam.d/shadow
+++ b/configuration/etc/pam.d/shadow
--- a/configuration/etc/pam.d/sshd
+++ b/configuration/etc/pam.d/sshd
--- a/configuration/etc/pam.d/useradd
+++ b/configuration/etc/pam.d/useradd
--- a/configuration/etc/syslog.conf
+++ b/configuration/etc/syslog.conf
--- a/configuration/options.nix
+++ b/configuration/options.nix
--- a/configuration/splash-themes.nix
+++ b/configuration/splash-themes.nix
--- a/configuration/switch-to-configuration.sh
+++ b/configuration/switch-to-configuration.sh
--- a/configuration/system.nix
+++ b/configuration/system.nix
--- a/configuration/system.sh
+++ b/configuration/system.sh
--- a/configuration/upstart.nix
+++ b/configuration/upstart.nix
--- a/test.sh
+++ b/test.sh
@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
    NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-build configuration/system.nix \
+nix-build system/system.nix \
    --arg configuration "import $NIXOS_CONFIG" \
    -A system -K -k
 ./result/bin/switch-to-configuration test
--- a/upgrade.sh
+++ b/upgrade.sh
@ -2,7 +2,7 @@
 if test -z "$NIXOS_CONFIG"; then
    NIXOS_CONFIG=/etc/nixos/configuration.nix
 fi
-nix-env -p /nix/var/nix/profiles/system -f configuration/system.nix \
+nix-env -p /nix/var/nix/profiles/system -f system/system.nix \
    --arg configuration "import $NIXOS_CONFIG" \
    --set -A system
 /nix/var/nix/profiles/system/bin/switch-to-configuration switch