diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-02-08 20:47:55 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-02-10 02:05:47 +0300 |
| commit | 5396a01b6c638cada3d5c81e03e14ffcbf982a1f (patch) | |
| tree | ef4ac2277162bb1d7712382f99eede70b1007869 | |
| parent | ee90c703befceee382be5fe4ba07bdbe2335c841 (diff) | |
| download | nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar.gz nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar.bz2 nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar.lz nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar.xz nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.tar.zst nixpkgs-5396a01b6c638cada3d5c81e03e14ffcbf982a1f.zip | |
init-script-builder: handle containers without a kernel
| -rw-r--r-- | nixos/modules/system/boot/loader/init-script/init-script-builder.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 502b3b63af2..08d4ab14c9c 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -80,8 +80,13 @@ for generation in $( | sort -n -r); do link=/nix/var/nix/profiles/system-$generation-link date=$(stat --printf="%y\n" $link | sed 's/\..*//') - kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *) - addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)" + if [ -d $link/kernel ]; then + kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *) + suffix="($date - $kernelVersion)" + else + suffix="($date)" + fi + addEntry "NixOS - Configuration $generation $suffix" $link "$generation ($date)" done mv $tmpOther $targetOther |