From 4b31843e64fb28297da5863ba7c7599784290b31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Mar 2008 23:31:48 +0000 Subject: [PATCH] Added nixos-gen-seccure-keys and modified nixos-checkout to store /etc/nixos/version.nix with string representing checkout version. svn path=/nixos/trunk/; revision=10936 --- installer/default.nix | 5 +++++ installer/nixos-checkout.sh | 4 ++++ installer/nixos-gen-seccure-keys.sh | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 installer/nixos-gen-seccure-keys.sh diff --git a/installer/default.nix b/installer/default.nix index 314902e9aa2..617210f4487 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -31,6 +31,11 @@ in src = ./nixos-rebuild.sh; }; + nixosGenSeccureKeys = makeProg { + name = "nixos-gen-seccure-keys"; + src = ./nixos-gen-seccure-keys.sh; + }; + nixosCheckout = makeProg { name = "nixos-checkout"; src = ./nixos-checkout.sh; diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh index 7c8f329b658..bd530aab4f9 100644 --- a/installer/nixos-checkout.sh +++ b/installer/nixos-checkout.sh @@ -57,3 +57,7 @@ svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services # Add a few required symlink. ln -sfn ../services nixos${CHECKOUT_SUFFIX}/services ln -sfn ../nixpkgs${CHECKOUT_SUFFIX}/pkgs nixos${CHECKOUT_SUFFIX}/pkgs + +REVISION=$(svn info nixpkgs${CHECKOUT_SUFFIX} | egrep '^Revision: '); +REVISION=${REVISION#Revision: }; +echo "\"$REVISION\"" > version.nix diff --git a/installer/nixos-gen-seccure-keys.sh b/installer/nixos-gen-seccure-keys.sh new file mode 100644 index 00000000000..a97eef672f7 --- /dev/null +++ b/installer/nixos-gen-seccure-keys.sh @@ -0,0 +1,13 @@ +#! @shell@ -e + +mkdir -p /var/elliptic-keys +chmod 0755 /var/elliptic-keys +cd /var/elliptic-keys +touch private +chmod 0700 private +dd if=/dev/urandom bs=128 count=1 of=private +chmod 0500 private +public=$(seccure-key -F private 2>&1) +echo ${public#*The public key is: } > public +chmod 0555 public +