diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-06-18 13:22:36 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-06-18 13:22:36 +0000 |
| commit | 66cacc246be0af6f87195ad83dda3950b3038030 (patch) | |
| tree | 016e0db90f28347bfc0f932b9c668bcbce08cf52 | |
| parent | 19ce5c7dbb212623e1d5c78e2c688ce53e5eeff6 (diff) | |
| download | lh-bootstrap-66cacc246be0af6f87195ad83dda3950b3038030.tar.xz | |
Replace import with importas in layout scripts
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rwxr-xr-x | layout/rootfs/etc/execline-shell | 8 | ||||
| -rwxr-xr-x | layout/rootfs/etc/execline-startup | 4 | ||||
| -rwxr-xr-x | layout/rootfs/root/.execline-loginshell | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/index.html b/doc/index.html index 574a6c5..f6f2cbb 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@ pull the latest version from Git. <ul> <li> Pull from the -<a href="http://git.skarnet.org/cgi-bin/cgit.cgi/lh-bootstrap/">main +<a href="//git.skarnet.org/cgi-bin/cgit.cgi/lh-bootstrap/">main lh-bootstrap git repository</a>: <pre> git clone git://git.skarnet.org/lh-bootstrap </pre> </li> <li> Pull from the diff --git a/layout/rootfs/etc/execline-shell b/layout/rootfs/etc/execline-shell index 41e63b4..e2dd637 100755 --- a/layout/rootfs/etc/execline-shell +++ b/layout/rootfs/etc/execline-shell @@ -5,13 +5,13 @@ backtick -n defaulthome if -nt { backtick -n defaultuser { id -un } - import -u defaultuser - import -D $defaultuser USER + importas -u defaultuser defaultuser + importas -D $defaultuser USER USER redirfd -w 2 /dev/null homeof ${USER} } s6-echo / } -import -u defaulthome -import -D $defaulthome HOME +importas -u defaulthome defaulthome +importas -D $defaulthome HOME HOME ${HOME}/.execline-shell $@ diff --git a/layout/rootfs/etc/execline-startup b/layout/rootfs/etc/execline-startup index 11cd736..09bebef 100755 --- a/layout/rootfs/etc/execline-startup +++ b/layout/rootfs/etc/execline-startup @@ -2,8 +2,8 @@ /command/multisubstitute { - import -i HOME - import -i LOGNAME + importas -i HOME HOME + importas -i LOGNAME LOGNAME } /command/export PATH "/command:/bin" /command/export USER $LOGNAME diff --git a/layout/rootfs/root/.execline-loginshell b/layout/rootfs/root/.execline-loginshell index 85c4e86..9339af0 100755 --- a/layout/rootfs/root/.execline-loginshell +++ b/layout/rootfs/root/.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 $@ |