author | Olivier Brunel
<jjk@jjacky.com> 2017-04-04 14:11:18 UTC |
committer | Olivier Brunel
<jjk@jjacky.com> 2017-06-18 12:41:24 UTC |
parent | ddf711c96880bd203f456f84abb04b70d86f0c71 |
src/scripts/aa-stage0 | +2 | -2 |
src/scripts/aa-stage2 | +3 | -3 |
src/scripts/aa-stage3 | +1 | -1 |
diff --git a/src/scripts/aa-stage0 b/src/scripts/aa-stage0 index 779bba1..b4323de 100755 --- a/src/scripts/aa-stage0 +++ b/src/scripts/aa-stage0 @@ -3,7 +3,7 @@ # anopa - Copyright (C) 2015-2017 Olivier Brunel # # aa-stage0 -# Copyright (C) 2015 Olivier Brunel <jjk@jjacky.com> +# Copyright (C) 2015-2017 Olivier Brunel <jjk@jjacky.com> # # This file is part of anopa. # @@ -70,7 +70,7 @@ if { aa-echo -DB "Moving /root-fs to /..." } if { aa-mount -DBd / /root-fs/run/initramfs } fdmove -c 2 1 backtick -n -D /sbin/init INIT { aa-incmdline -rf /root-fs/proc/cmdline init } -import -u INIT +importas -u INIT INIT cd /root-fs if { aa-mount -M . / } ./run/initramfs/bin/emptyenv -c ./run/initramfs/bin/aa-chroot . ${INIT} diff --git a/src/scripts/aa-stage2 b/src/scripts/aa-stage2 index 8e1cf85..c139199 100755 --- a/src/scripts/aa-stage2 +++ b/src/scripts/aa-stage2 @@ -3,7 +3,7 @@ # anopa - Copyright (C) 2015-2017 Olivier Brunel # # aa-stage2 -# Copyright (C) 2015 Olivier Brunel <jjk@jjacky.com> +# Copyright (C) 2015-2017 Olivier Brunel <jjk@jjacky.com> # # This file is part of anopa. # @@ -37,14 +37,14 @@ if -n -t { # We want the actual tty on stdin backtick -n TTY { aa-tty } - import -u TTY + importas -u TTY TTY redirfd -r 0 ${TTY} # Reopen the console for stdout redirfd -w 1 /dev/console # And start everything foreground { aa-echo -DB "Stage 2: Initializing system..." } backtick -n -D onboot LISTDIR { aa-incmdline -Drs aa } - import -u LISTDIR + importas -u LISTDIR LISTDIR # We have a tty in stdin, become session leader and set controlling terminal. # This is so Ctrl+C will trigger a SIGINT to aa-start, so one can manually # timeout a service. diff --git a/src/scripts/aa-stage3 b/src/scripts/aa-stage3 index 405bf52..d1a1390 100755 --- a/src/scripts/aa-stage3 +++ b/src/scripts/aa-stage3 @@ -36,7 +36,7 @@ fdmove 2 4 # Make sure we're sane cd / backtick -n TTY { aa-tty } -import -u TTY +importas -u TTY TTY redirfd -r 0 ${TTY} redirfd -w 1 /dev/console