Skip to content

changed mdata-get and two initialization scripts #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MerlinDMC wants to merge 3 commits into
base: master
Choose a base branch
from
Open

changed mdata-get and two initialization scripts #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bc49bd
mdata-get does not continue if the socket/serial device is not access…
MerlinDMC Aug 22, 2012
2fb501b
if root_authorized_keys is not in customer_metadata the return value …
MerlinDMC Aug 25, 2012
c356301
trash the user-script if no script was set in customer_metadata
MerlinDMC Aug 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/linux/lib/smartdc/mdata-get
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,19 @@ case $(uname -s) in
esac

if [[ -n ${NC_SOCK} ]]; then
if [[ ! -e ${NC_SOCK} ]]; then
echo "mdata-get: socket not accessible" >&2
exit 2
fi

coproc nc -U ${NC_SOCK}
exec <&${COPROC[0]} 3>&${COPROC[1]}
else
if [[ ! -e ${SERIAL_DEV} ]]; then
echo "mdata-get: socket not accessible" >&2
exit 2
fi

exec <${SERIAL_DEV} 3>>${SERIAL_DEV}
fi

Expand Down
2 changes: 2 additions & 0 deletions src/linux/lib/smartdc/run-user-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ if [[ $? -eq 0 ]] ; then
chmod +x /root/user-script
exec /root/user-script
fi
else
rm -f /root/user-script
fi
2 changes: 1 addition & 1 deletion src/linux/lib/smartdc/set-root-authorized-keys
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

if [[ ! -f /root/.ssh/authorized_keys ]]; then
authorized_keys=$(/lib/smartdc/mdata-get root_authorized_keys 2>>/dev/console)
if [[ -n ${authorized_keys} ]]; then
if [[ $? -eq 0 && -n ${authorized_keys} ]]; then
mkdir -p /root/.ssh
echo "${authorized_keys}" > /root/.ssh/authorized_keys
chmod 700 /root/.ssh
Expand Down