Skip to content
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

Add rsync-nfsroot and unfsd commands #6

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add rsync-nfsroot and unfsd commands #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion server/novaboot-shell
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh

# vim: set noexpandtab tabstop=8 shiftwidth=4:

set -e

die() {
Expand Down Expand Up @@ -124,6 +126,22 @@ run_subcommand() {
mkdir -p "$HOME/tftproot"
cd "$HOME/tftproot"
exec "$@";;
"rsync-nfsroot "*" --server "*" . .")
shift 1
mkdir -p "$HOME/nfsroot"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want $HOME/nfsroot/$NB_USER here.

cd "$HOME/nfsroot"
exec rsync "$@";;
"unfsd" *)
rootdir="$2"
shift 2

[ -n "$board_ip" ] || die 'Missing configuration option $board_ip'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it required to be an IP address or hostnames could be supported as well? If possible, I'd prefer that both IP addresses and hostnames can be specified here. Most programs can handle both.

And to be consistent with the rest of the file, I'd prefer checking variables with ${board_ip:?}, when the variable is first used (the line below). The error message will be generated automatically by the shell.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The unfs3 manual says hostnames are supported as well so it should work.

echo "$HOME/nfsroot/$rootdir $board_ip(rw,no_root_squash)" > "$HOME/export"

# start or restart unfs3 to reread updated `exports` file
[ -n "$nfs_port" ] || die 'Missing configuration option $nfs_port'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

${nfs_port:?}

systemctl --user restart "unfsd@$nfs_port.service"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The @ unit names are needed when multiple instances of one service need to execute at the same time. Here, at most one unfsd server will be executed. Maybe, we can distinguish different novaboot users unfsd@$NB_USER, but even this is not necessary.

I think that the unfsd subcommand could just create a symlink (e.g. $HOME/nfsroot-link) pointing to $HOME/nfsroot/$NB_USER and and the unfsd.service and even the export file could just refer to this path.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using it for the port variable, what would another option would be to replace the command with a script which sources the .novaboot-shell config file.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use EnvironmentFile=... - see systemd.exec(5). Some (randomly found) example is at https://coreos.com/os/docs/latest/using-environment-variables-in-systemd-units.html#environmentfile-directive

;;
"on")
power on
exit;;
Expand Down Expand Up @@ -175,7 +193,7 @@ main() {
# to the console. "The same user" means that we were executed by
# the same sshd process that has the lock. This is ensured by
# using SSH connection sharing on client side.
reset | rsync | on | off)
reset | rsync | rsync-nfsroot | unfsd | on | off)
ALLOWED_PPID=$(cat $RUN_DIR/ppid 2>/dev/null || :)
if [ "$PPID" -eq "${ALLOWED_PPID:-0}" ]; then run=unlocked; else run=locked; fi
$run $0 "$@";;
Expand Down
14 changes: 14 additions & 0 deletions server/unfsd@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[Unit]
Description=UNFS3 daemon (port %i)

[Service]
# -e /abs/path/to/exports
# -n nfs_service_port
# -m mount_service_port
# -t # tcp only
# -p # do not use portmapper
# -s # single-user mode (map file ownership)
ExecStart=unfsd -e %h/export -n %i -m %i -t -p -s

[Install]
WantedBy=default.target
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that the service will be automatically started, when somebody logs in. This is not necessary. We want the service to be started only when somebody runs unfsd subcommand of novaboot-shell.