Skip to content
Snippets Groups Projects
Commit 0d913f65 authored by Pavel Vondruska's avatar Pavel Vondruska
Browse files

Zkusime patchnout cli.go radeji debiani cestou

parent d6e76e6f
No related branches found
No related tags found
No related merge requests found
Pipeline #20855 passed
--- a/cmd/singularity/cli.go 2025-06-03 12:22:55.951605645 +0200
+++ b/cmd/singularity/cli.go 2025-05-30 11:46:22.033972803 +0200
@@ -6,12 +6,47 @@
package main
import (
+ "log"
+ "log/syslog"
+ "os"
+ "os/user"
+ "strings"
+ "fmt"
+
"github.com/sylabs/singularity/v4/cmd/internal/cli"
"github.com/sylabs/singularity/v4/internal/pkg/buildcfg"
useragent "github.com/sylabs/singularity/v4/pkg/util/user-agent"
)
func main() {
+ logger, err := syslog.New(syslog.LOG_INFO|syslog.LOG_USER, "singularity-start")
+ if err != nil {
+ log.Fatalf("Error while connecting to syslog: %v", err)
+ }
+ defer logger.Close()
+
+ currentUser, err := user.Current()
+ if err != nil {
+ currentUser = &user.User{Username: "unknown"}
+ }
+
+ hostname, err := os.Hostname()
+ if err != nil {
+ hostname = "unknown-host"
+ }
+
+ pbsJobID := os.Getenv("PBS_JOBID")
+ if pbsJobID == "" {
+ pbsJobID = "out-of-job"
+ }
+
+ cmd := os.Args[0]
+ args := strings.Join(os.Args[1:], " ")
+
+ message := fmt.Sprintf("%s@%s %s %s %s", currentUser.Username, hostname, pbsJobID, cmd, args)
+
+ logger.Info(message)
+
useragent.InitValue(buildcfg.PACKAGE_NAME, buildcfg.PACKAGE_VERSION)
// In cmd/internal/cli/singularity.go
cli.go.patch
...@@ -72,7 +72,8 @@ chmod +x ./proot ...@@ -72,7 +72,8 @@ chmod +x ./proot
echo "proot usr/bin" >> debian/singularity-ce.install echo "proot usr/bin" >> debian/singularity-ce.install
# Kopie upraveneho cli.go kvuli logovani pouziti do syslogu # Kopie upraveneho cli.go kvuli logovani pouziti do syslogu
cp -v ${ROOTPWD}/cli.go cmd/singularity/cli.go #cp -v ${ROOTPWD}/cli.go cmd/singularity/cli.go
cp -vr ${ROOTPWD}/debian/patches debian/
# Build balicku # Build balicku
dpkg-buildpackage -uc -us -b dpkg-buildpackage -uc -us -b
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment