Unverified Commit 54a65ab1 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

nixos/systemd-initrd: silence various warnings (#432704)

parents 95668141 216d98ab

nixos/modules/system/boot/systemd/initrd.nix

+2 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ in 
      settings.Manager.DefaultEnvironment = "PATH=/bin:/sbin";



      contents = {

        "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";

        "/init".source = "${cfg.package}/lib/systemd/systemd";

        "/etc/systemd/system".source = stage1Units;
@@ -503,6 +502,8 @@ in 


        "/bin".source = "${initrdBinEnv}/bin";

        "/sbin".source = "${initrdBinEnv}/sbin";

        "/usr/bin".source = "${initrdBinEnv}/bin";

        "/usr/sbin".source = "${initrdBinEnv}/sbin";



        "/etc/os-release".source = config.boot.initrd.osRelease;

        "/etc/initrd-release".source = config.boot.initrd.osRelease;

pkgs/build-support/kernel/make-initrd-ng.nix

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ runCommand name 
    ++ lib.optional makeUInitrd ubootTools;

  })

  ''

    mkdir -p ./root/var/empty

    mkdir -p ./root/{run,tmp,var/empty}

    ln -s ../run ./root/var/run

    make-initrd-ng "$contentsPath" ./root

    mkdir "$out"

    (cd root && find . -exec touch -h -d '@1' '{}' +)