Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e6ba0019fd5
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2bc8edf9cc3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 25, 2021

  1. initrd-shell: Fix job control

    @samueldr
    samueldr committed Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    starcraft66 Tristan
    GPG key ID: 86886FC44C72EAA1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    10fc8bc View commit details

  2. Merge pull request #287 from samueldr-wip/fix/initrd-job-control 

    initrd-shell: Fix job control
    @samueldr
    samueldr authored Jan 25, 2021
    Copy the full SHA
    b2bc8ed View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 modules/initrd-shell.nix
3 changes: 2 additions & 1 deletion modules/initrd-shell.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,8 @@ in
(pkgs.writeText "system-shell.rb" ''
module System
def self.shell()
cmd = %q{setsid /bin/sh -c /bin/sh < /dev/${cfg.console} >/dev/${cfg.console} 2>/dev/${cfg.console}}
# `cttyhack` ensures we get job control (^C, ^Z) going.
cmd = %q{setsid /bin/sh -c 'setsid cttyhack sh; exec ash -mi' < /dev/${cfg.console} >/dev/${cfg.console} 2>/dev/${cfg.console}}
$logger.debug(" $ #{cmd}")
puts("\nExit this shell (CTRL+D) to resume booting.\n")
system(cmd)