Merge remote-tracking branch 'lass/master'
This commit is contained in:
commit
615033a242
|
@ -10,6 +10,7 @@
|
||||||
<stockholm/krebs/2configs>
|
<stockholm/krebs/2configs>
|
||||||
|
|
||||||
<stockholm/krebs/2configs/buildbot-all.nix>
|
<stockholm/krebs/2configs/buildbot-all.nix>
|
||||||
|
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.hotdog;
|
krebs.build.host = config.krebs.hosts.hotdog;
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
<stockholm/krebs/2configs/buildbot-krebs.nix>
|
<stockholm/krebs/2configs/buildbot-krebs.nix>
|
||||||
<stockholm/krebs/2configs/stats/puyak-client.nix>
|
<stockholm/krebs/2configs/stats/puyak-client.nix>
|
||||||
|
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
||||||
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ in
|
||||||
|
|
||||||
<stockholm/krebs/2configs/graphite.nix>
|
<stockholm/krebs/2configs/graphite.nix>
|
||||||
<stockholm/krebs/2configs/buildbot-krebs.nix>
|
<stockholm/krebs/2configs/buildbot-krebs.nix>
|
||||||
|
<stockholm/krebs/2configs/binary-cache/nixos.nix>
|
||||||
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
<stockholm/krebs/2configs/binary-cache/prism.nix>
|
||||||
|
|
||||||
<stockholm/krebs/2configs/shack/worlddomination.nix>
|
<stockholm/krebs/2configs/shack/worlddomination.nix>
|
||||||
|
|
12
krebs/2configs/binary-cache/nixos.nix
Normal file
12
krebs/2configs/binary-cache/nixos.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{ config, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
nix = {
|
||||||
|
binaryCaches = [
|
||||||
|
"https://cache.nixos.org/"
|
||||||
|
];
|
||||||
|
binaryCachePublicKeys = [
|
||||||
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -46,7 +46,7 @@ pkgs.writeText "init" ''
|
||||||
# dd if=/dev/zero bs=512 count=34 of=/dev/sda
|
# dd if=/dev/zero bs=512 count=34 of=/dev/sda
|
||||||
# TODO zero last 34 blocks (lsblk -bno SIZE /dev/sda)
|
# TODO zero last 34 blocks (lsblk -bno SIZE /dev/sda)
|
||||||
if ! test "$(blkid -o value -s PTTYPE "$disk")" = gpt; then
|
if ! test "$(blkid -o value -s PTTYPE "$disk")" = gpt; then
|
||||||
parted -a optimal "$disk" \
|
parted -s -a optimal "$disk" \
|
||||||
mklabel gpt \
|
mklabel gpt \
|
||||||
mkpart no-fs 0 1024KiB \
|
mkpart no-fs 0 1024KiB \
|
||||||
set 1 bios_grub on \
|
set 1 bios_grub on \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user