public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Allow Upstart's init to be upgraded in a running system.

Browse Source 
svn path=/nixos/trunk/; revision=9375
This commit is contained in:
Eelco Dolstra 2007-09-27 12:24:05 +00:00
parent 51626b0b66
commit c43dc7b013
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boot/boot-stage-2-init.sh
View File

@ -115,7 +115,10 @@ export MODULE_DIR=@kernel@/lib/modules/
@shell@ @bootLocal@ @shell@ @bootLocal@
# Start Upstart's init. # Start Upstart's init. We start it through the
# /var/run/current-system symlink indirection so that we can upgrade
# init in a running system by changing the symlink and sending init a
# HUP signal.
export UPSTART_CFG_DIR=/etc/event.d export UPSTART_CFG_DIR=/etc/event.d
setPath "@upstartPath@" setPath "@upstartPath@"
exec @upstart@/sbin/init -v exec /var/run/current-system/upstart/sbin/init -v

2
system/system.nix
View File

@ -313,7 +313,7 @@ rec {
name = "system"; name = "system";
builder = ./system.sh; builder = ./system.sh;
switchToConfiguration = ./switch-to-configuration.sh; switchToConfiguration = ./switch-to-configuration.sh;
inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils; inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
grubDevice = config.get ["boot" "grubDevice"]; grubDevice = config.get ["boot" "grubDevice"];
kernelParams = kernelParams =
(config.get ["boot" "kernelParams"]) ++ (config.get ["boot" "kernelParams"]) ++

1
system/system.sh
View File

@ -9,6 +9,7 @@ ln -s $initrd $out/initrd
ln -s $activateConfiguration $out/activate ln -s $activateConfiguration $out/activate
ln -s $etc/etc $out/etc ln -s $etc/etc $out/etc
ln -s $systemPath $out/sw ln -s $systemPath $out/sw
ln -s $upstart $out/upstart
echo "$kernelParams" > $out/kernel-params echo "$kernelParams" > $out/kernel-params
echo "$configurationName" > $out/configuration-name echo "$configurationName" > $out/configuration-name