diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-07-17 11:42:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-07-17 11:42:41 +0000 |
| commit | 24eb8b504f62c04ed103d25e27190bdf35fad9dc (patch) | |
| tree | 1d2d0bc9e1fe2c59ac9a2a47cba60e17bdf80f34 | |
| parent | 66cacc246be0af6f87195ad83dda3950b3038030 (diff) | |
| download | lh-bootstrap-24eb8b504f62c04ed103d25e27190bdf35fad9dc.tar.xz | |
Uncomment sed invocations, fix stray import
| -rwxr-xr-x | layout/userfs/home/guest/.execline-loginshell | 2 | ||||
| -rwxr-xr-x | sub/layout/copylayout | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/layout/userfs/home/guest/.execline-loginshell b/layout/userfs/home/guest/.execline-loginshell index 85c4e86..9339af0 100755 --- a/layout/userfs/home/guest/.execline-loginshell +++ b/layout/userfs/home/guest/.execline-loginshell @@ -1,3 +1,3 @@ #!/command/execlineb -S0 -/command/import -D /etc/execline-shell SHELL +/command/importas -D /etc/execline-shell SHELL SHELL $SHELL $@ diff --git a/sub/layout/copylayout b/sub/layout/copylayout index 59dd0e0..e9cea1c 100755 --- a/sub/layout/copylayout +++ b/sub/layout/copylayout @@ -41,10 +41,10 @@ timeout=${S6RC_TIMEOUT} buildtime=$(s6-clock) hostarch=$(s6-echo $TRIPLE | cut -f1 -d-) -# sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/etc/s6-rc/source-base/00/up $output/rootfs/etc/s6-linux-init/run-image/service/s6-linux-init-early-getty/run $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell $output/userfs/home/guest/.execline-shell +sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/etc/s6-rc/source-base/00/up $output/rootfs/etc/s6-linux-init/run-image/service/s6-linux-init-early-getty/run $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell $output/userfs/home/guest/.execline-shell sed -i -e "s/%%CONSOLE%%/$console/g" $output/rootfs/etc/s6-linux-init/run-image/service/s6-linux-init-early-getty/run -# sed -i -e "s/%%NETMODULE%%/$netmodule/g" $output/rootfs/etc/s6-rc/source-base/init-eth0/up -# sed -i -e "s/%%RCTIMEOUT%%/$timeout/g" -e "s/%%BUILDTIME%%/$buildtime/g" $output/rootfs/etc/rc.init +sed -i -e "s/%%NETMODULE%%/$netmodule/g" $output/rootfs/etc/s6-rc/source-base/init-eth0/up +sed -i -e "s/%%RCTIMEOUT%%/$timeout/g" -e "s/%%BUILDTIME%%/$buildtime/g" $output/rootfs/etc/rc.init if $USE_DHCP ; then |