From 71fcc972bad6abcd6282f7a80ef5935cdfcf172d Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 28 Mar 2026 18:21:42 +0900 Subject: cmd/hsu: alternative hsurc path for Rosa OS Rosa OS does not have /etc. Signed-off-by: Ophestra --- cmd/hsu/conf.go | 7 +++++++ cmd/hsu/config_rosa.go | 7 +++++++ cmd/hsu/parse.go | 4 ---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 cmd/hsu/conf.go create mode 100644 cmd/hsu/config_rosa.go (limited to 'cmd') diff --git a/cmd/hsu/conf.go b/cmd/hsu/conf.go new file mode 100644 index 00000000..683bdc8a --- /dev/null +++ b/cmd/hsu/conf.go @@ -0,0 +1,7 @@ +//go:build !rosa + +package main + +// hsuConfPath is an absolute pathname to the hsu configuration file. Its +// contents are interpreted by parseConfig. +const hsuConfPath = "/etc/hsurc" diff --git a/cmd/hsu/config_rosa.go b/cmd/hsu/config_rosa.go new file mode 100644 index 00000000..30303dba --- /dev/null +++ b/cmd/hsu/config_rosa.go @@ -0,0 +1,7 @@ +//go:build rosa + +package main + +// hsuConfPath is the pathname to the hsu configuration file, specific to +// Rosa OS. Its contents are interpreted by parseConfig. +const hsuConfPath = "/system/etc/hsurc" diff --git a/cmd/hsu/parse.go b/cmd/hsu/parse.go index d4f7df43..f9191d9a 100644 --- a/cmd/hsu/parse.go +++ b/cmd/hsu/parse.go @@ -84,10 +84,6 @@ func parseConfig(r io.Reader, puid uint32) (userid uint32, ok bool, err error) { return useridEnd + 1, false, s.Err() } -// hsuConfPath is an absolute pathname to the hsu configuration file. -// Its contents are interpreted by parseConfig. -const hsuConfPath = "/etc/hsurc" - // mustParseConfig calls parseConfig to interpret the contents of hsuConfPath, // terminating the program if an error is encountered, the syntax is incorrect, // or the current user is not authorised to use hsu because its uid is missing. -- cgit v1.3.1