diff options
| author | tv <tv@krebsco.de> | 2017-06-27 19:40:31 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-06-27 19:40:31 +0200 |
| commit | e1e16e0d5d3c8b80000899920cea89c1b8bd5be4 (patch) | |
| tree | f3f2765ac510bc578d2a9c350e9384284fe5fd83 /krebs | |
| parent | 74429f245d366e783ecbcfb0ebd83a7f57e78e6a (diff) | |
| parent | 10b6ac40265a0f653b8753e87894cbfb6fa00590 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/setuid.nix | 2 | ||||
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 7 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/brain/default.nix | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index a17ec0883..02176ec4a 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -5,7 +5,7 @@ let out = { options.krebs.setuid = api; - config = imp; + config = mkIf (cfg != {}) imp; }; api = mkOption { diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index 3f5d66431..50d521e17 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -43,6 +43,13 @@ prepare() {( exit esac ;; + stockholm) + case $(cat /proc/cmdline) in + *' root=LABEL=NIXOS_ISO '*) + prepare_nixos_iso "$@" + exit + esac + ;; esac elif test -e /etc/centos-release; then case $(cat /etc/centos-release) in diff --git a/krebs/5pkgs/simple/brain/default.nix b/krebs/5pkgs/simple/brain/default.nix index 079db825f..e69b44f0f 100644 --- a/krebs/5pkgs/simple/brain/default.nix +++ b/krebs/5pkgs/simple/brain/default.nix @@ -1,11 +1,11 @@ { pass, writeOut, writeDash, ... }: writeOut "brain" { - "/bin/brain-pass".link = writeDash "brain-pass" '' + "/bin/brain".link = writeDash "brain" '' PASSWORD_STORE_DIR=$HOME/brain \ exec ${pass}/bin/pass $@ ''; - "/bin/brain-passmenu".link = writeDash "brain-passmenu" '' + "/bin/brainmenu".link = writeDash "brainmenu" '' PASSWORD_STORE_DIR=$HOME/brain \ exec ${pass}/bin/passmenu $@ ''; |