Skip to content

Commit c097923

Browse files
committed
Merge pull request #1444 from deis/fix/userdata/make-nse-profile.d-function-script
fix(userdata template): put `nse` function in FHS
2 parents bfa0594 + 87c6bf5 commit c097923

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

contrib/coreos/user-data

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,16 @@ coreos:
5656
Type=oneshot
5757
ExecStart=/usr/bin/systemctl stop update-engine.service
5858
ExecStartPost=/usr/bin/systemctl mask update-engine.service
59-
- name: link-deis-bashrc.service
60-
command: start
61-
content: |
62-
[Unit]
63-
Description=remove .bashrc file for CoreOS user
64-
ConditionFileNotEmpty=/run/deis/.bashrc
6559

66-
[Service]
67-
Type=oneshot
68-
ExecStartPre=/usr/bin/rm /home/core/.bashrc
69-
ExecStart=/usr/bin/ln -s /run/deis/.bashrc /home/core/.bashrc
7060
write_files:
7161
- path: /etc/deis-release
7262
content: |
7363
DEIS_RELEASE=latest
7464
- path: /etc/motd
7565
content: " \e[31m* * \e[34m* \e[32m***** \e[39mddddd eeeeeee iiiiiii ssss\n\e[31m* * \e[34m* * \e[32m* * \e[39md d e e i s s\n \e[31m* * \e[34m***** \e[32m***** \e[39md d e i s\n\e[32m***** \e[31m* * \e[34m* \e[39md d e i s\n\e[32m* * \e[31m* * \e[34m* * \e[39md d eee i sss\n\e[32m***** \e[31m* * \e[34m***** \e[39md d e i s\n \e[34m* \e[32m***** \e[31m* * \e[39md d e i s\n \e[34m* * \e[32m* * \e[31m* * \e[39md d e e i s s\n\e[34m***** \e[32m***** \e[31m* * \e[39mddddd eeeeeee iiiiiii ssss\n\n\e[39mWelcome to Deis\t\t\tPowered by Core\e[38;5;45mO\e[38;5;206mS\e[39m\n"
76-
- path: /run/deis/.bashrc
77-
owner: core
66+
- path: /etc/profile.d/nse-function.sh
67+
permissions: 0755
7868
content: |
79-
source /usr/share/skel/.bashrc
8069
function nse() {
8170
sudo nsenter --pid --uts --mount --ipc --net --target $(docker inspect --format="{{ .State.Pid }}" $1)
8271
}

0 commit comments

Comments
 (0)