Compare commits
4 Commits
7ca633d946
...
2507f10b59
| Author | SHA1 | Date | |
|---|---|---|---|
| 2507f10b59 | |||
| 900e1939f3 | |||
| 43a958cdec | |||
| 5b9862d641 |
@ -1,85 +0,0 @@
|
||||
package cmd
|
||||
|
||||
const (
|
||||
fbsdUpdateConfig = `
|
||||
# $FreeBSD$
|
||||
|
||||
# Trusted keyprint. Changing this is a Bad Idea unless you've received
|
||||
# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
|
||||
# change it and explaining why.
|
||||
KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
|
||||
|
||||
# Server or server pool from which to fetch updates. You can change
|
||||
# this to point at a specific server if you want, but in most cases
|
||||
# using a "nearby" server won't provide a measurable improvement in
|
||||
# performance.
|
||||
ServerName update.FreeBSD.org
|
||||
|
||||
# Components of the base system which should be kept updated.
|
||||
Components world
|
||||
|
||||
# Example for updating the userland and the kernel source code only:
|
||||
# Components src/base src/sys world
|
||||
|
||||
# Paths which start with anything matching an entry in an IgnorePaths
|
||||
# statement will be ignored.
|
||||
IgnorePaths
|
||||
|
||||
# Paths which start with anything matching an entry in an IDSIgnorePaths
|
||||
# statement will be ignored by "freebsd-update IDS".
|
||||
IDSIgnorePaths /usr/share/man/cat
|
||||
IDSIgnorePaths /usr/share/man/whatis
|
||||
IDSIgnorePaths /var/db/locate.database
|
||||
IDSIgnorePaths /var/log
|
||||
|
||||
# Paths which start with anything matching an entry in an UpdateIfUnmodified
|
||||
# statement will only be updated if the contents of the file have not been
|
||||
# modified by the user (unless changes are merged; see below).
|
||||
UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
|
||||
|
||||
# When upgrading to a new FreeBSD release, files which match MergeChanges
|
||||
# will have any local changes merged into the version from the new release.
|
||||
MergeChanges /etc/
|
||||
|
||||
### Default configuration options:
|
||||
|
||||
# Directory in which to store downloaded updates and temporary
|
||||
# files used by FreeBSD Update.
|
||||
WorkDir /iocage/freebsd-update
|
||||
|
||||
# Destination to send output of "freebsd-update cron" if an error
|
||||
# occurs or updates have been downloaded.
|
||||
# MailTo root
|
||||
|
||||
# Is FreeBSD Update allowed to create new files?
|
||||
# AllowAdd yes
|
||||
|
||||
# Is FreeBSD Update allowed to delete files?
|
||||
# AllowDelete yes
|
||||
|
||||
# If the user has modified file ownership, permissions, or flags, should
|
||||
# FreeBSD Update retain this modified metadata when installing a new version
|
||||
# of that file?
|
||||
# KeepModifiedMetadata yes
|
||||
|
||||
# When upgrading between releases, should the list of Components be
|
||||
# read strictly (StrictComponents yes) or merely as a list of components
|
||||
# which *might* be installed of which FreeBSD Update should figure out
|
||||
# which actually are installed and upgrade those (StrictComponents no)?
|
||||
StrictComponents yes
|
||||
|
||||
# When installing a new kernel perform a backup of the old one first
|
||||
# so it is possible to boot the old kernel in case of problems.
|
||||
BackupKernel no
|
||||
|
||||
# If BackupKernel is enabled, the backup kernel is saved to this
|
||||
# directory.
|
||||
# BackupKernelDir /boot/kernel.old
|
||||
|
||||
# When backing up a kernel also back up debug symbol files?
|
||||
BackupKernelSymbolFiles no
|
||||
|
||||
# Create a new boot environment when installing patches
|
||||
CreateBootEnv no
|
||||
`
|
||||
)
|
||||
52
cmd/root.go
52
cmd/root.go
@ -14,7 +14,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
gVersion = "0.42a"
|
||||
gVersion = "0.42b"
|
||||
|
||||
// TODO : Get from $jail_zpool/defaults.json
|
||||
MIN_DYN_DEVFS_RULESET = 1000
|
||||
@ -59,6 +59,9 @@ var (
|
||||
|
||||
gTimeZone string
|
||||
gSnapshotName string
|
||||
gZPool string
|
||||
gBridge string
|
||||
gInterface string
|
||||
|
||||
gMigrateDestDatastore string
|
||||
gYesToAll bool
|
||||
@ -99,20 +102,14 @@ It support iocage jails and can coexist with iocage.`,
|
||||
fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
|
||||
},
|
||||
}
|
||||
|
||||
/* TODO
|
||||
Initialize datastore(s) /iocage, /iocage/jails
|
||||
Put defaults.json, update it with hostid,interfaces, and maybe other necessary fields
|
||||
Initialize bridge
|
||||
|
||||
initCmd = &cobra.Command{
|
||||
Use: "init",
|
||||
Short: "Initialize GoCage",
|
||||
//Long: `Let this show you how much fail I had to get this *cough* perfect`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
fv, _ := getFreeBSDVersion()
|
||||
fmt.Printf("GoCage v.%s on FreeBSD %d.%d-%s\n", gVersion, fv.major, fv.minor, fv.flavor)
|
||||
InitGoCage(args)
|
||||
},
|
||||
}*/
|
||||
}
|
||||
|
||||
listCmd = &cobra.Command{
|
||||
Use: "list",
|
||||
@ -395,6 +392,10 @@ func init() {
|
||||
rootCmd.PersistentFlags().BoolVar(&gDebug, "debug", false, "Debug mode")
|
||||
|
||||
// Command dependant switches
|
||||
initCmd.Flags().StringVarP(&gZPool, "pool", "p", "", "ZFS pool to create datastore on")
|
||||
initCmd.Flags().StringVarP(&gBridge, "bridge", "b", "", "bridge to create for jails networking")
|
||||
initCmd.Flags().StringVarP(&gInterface, "interface", "i", "", "interface to add as bridge member. This should be your main interface")
|
||||
initCmd.MarkFlagsRequiredTogether("bridge", "interface")
|
||||
|
||||
// We reuse these flags in "gocage snapshot list myjail" and 'gocage datastore list" commands
|
||||
listCmd.Flags().StringVarP(&gDisplayJColumns, "outcol", "o", "JID,Name,Config.Release,Config.Ip4_addr,Running", "Show these columns in output")
|
||||
@ -443,6 +444,7 @@ func init() {
|
||||
apiCmd.Flags().IntVarP(&gApiPort, "listen-port", "p", 1234, "API listening port")
|
||||
|
||||
// Now declare commands
|
||||
rootCmd.AddCommand(initCmd)
|
||||
rootCmd.AddCommand(versionCmd)
|
||||
rootCmd.AddCommand(listCmd)
|
||||
listCmd.AddCommand(listPropsCmd)
|
||||
@ -461,7 +463,6 @@ func init() {
|
||||
rootCmd.AddCommand(upgradeCmd)
|
||||
rootCmd.AddCommand(createCmd)
|
||||
rootCmd.AddCommand(apiCmd)
|
||||
|
||||
rootCmd.AddCommand(testCmd)
|
||||
|
||||
snapshotCmd.AddCommand(snapshotListCmd)
|
||||
@ -491,17 +492,6 @@ func initConfig() {
|
||||
fmt.Printf("ERROR reading config file %s : %s\n", gConfigFile, err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// Load default configs from datastores
|
||||
err := ListDatastores(viper.GetStringSlice("datastore"), false)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: error checking datastores: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// fmt.Println("Using config file:", viper.ConfigFileUsed())
|
||||
// fmt.Printf("datastore in config : %s\n", viper.GetStringSlice("datastore"))
|
||||
// fmt.Printf("datastore.0 in config : %s\n", viper.GetStringSlice("datastore.0"))
|
||||
|
||||
// Command line flags have priority on config file
|
||||
if rootCmd.Flags().Lookup("sudo") != nil && false == rootCmd.Flags().Lookup("sudo").Changed {
|
||||
@ -535,12 +525,26 @@ func initConfig() {
|
||||
fmt.Printf("More than 3 sort criteria is not supported!\n")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
|
||||
|
||||
if gDebug {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
log.Debugf("Debug mode enabled\n")
|
||||
}
|
||||
|
||||
// no need to check prerequesites if we are initializing gocage
|
||||
for _, rc := range rootCmd.Commands() {
|
||||
//fmt.Printf("DEBUG: rootCmd subcommand: %v. Was it called? %s\n", rc.Use, rootCmd.Commands()[i].CalledAs())
|
||||
if len(rc.CalledAs()) > 0 && strings.EqualFold("init", rc.CalledAs()) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Load default configs from datastores
|
||||
err := ListDatastores(viper.GetStringSlice("datastore"), false)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: error checking datastores: %v\n", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
405
cmd/utils.go
405
cmd/utils.go
@ -24,140 +24,221 @@ const (
|
||||
ifconfigipv4re = `inet[[:space:]](` + ipv4re + `)`
|
||||
// Maximum thread qty for start/stop
|
||||
gMaxThreads = 4
|
||||
|
||||
gDefaultsJson = ` {
|
||||
"CONFIG_VERSION": "27",
|
||||
"allow_chflags": 0,
|
||||
"allow_mlock": 0,
|
||||
"allow_mount": 0,
|
||||
"allow_mount_devfs": 0,
|
||||
"allow_mount_fusefs": 0,
|
||||
"allow_mount_nullfs": 0,
|
||||
"allow_mount_procfs": 0,
|
||||
"allow_mount_tmpfs": 0,
|
||||
"allow_mount_zfs": 0,
|
||||
"allow_quotas": 0,
|
||||
"allow_raw_sockets": 0,
|
||||
"allow_set_hostname": 1,
|
||||
"allow_socket_af": 0,
|
||||
"allow_sysvipc": 0,
|
||||
"allow_tun": 0,
|
||||
"allow_vmm": 0,
|
||||
"assign_localhost": 0,
|
||||
"available": "readonly",
|
||||
"basejail": 0,
|
||||
"boot": 0,
|
||||
"bpf": 0,
|
||||
"children_max": "0",
|
||||
"comment": "none",
|
||||
"compression": "lz4",
|
||||
"compressratio": "readonly",
|
||||
"coredumpsize": "off",
|
||||
"count": "1",
|
||||
"cpuset": "off",
|
||||
"cputime": "off",
|
||||
"datasize": "off",
|
||||
"dedup": "off",
|
||||
"defaultrouter": "auto",
|
||||
"defaultrouter6": "auto",
|
||||
"depends": "none",
|
||||
"devfs_ruleset": "4",
|
||||
"dhcp": 0,
|
||||
"enforce_statfs": "2",
|
||||
"exec_clean": 1,
|
||||
"exec_created": "/usr/bin/true",
|
||||
"exec_fib": "0",
|
||||
"exec_jail_user": "root",
|
||||
"exec_poststart": "/usr/bin/true",
|
||||
"exec_poststop": "/usr/bin/true",
|
||||
"exec_prestart": "/usr/bin/true",
|
||||
"exec_prestop": "/usr/bin/true",
|
||||
"exec_start": "/bin/sh /etc/rc",
|
||||
"exec_stop": "/bin/sh /etc/rc.shutdown",
|
||||
"exec_system_jail_user": "0",
|
||||
"exec_system_user": "root",
|
||||
"exec_timeout": "60",
|
||||
"host_domainname": "none",
|
||||
"host_time": 1,
|
||||
"hostid": "36353536-3135-5a43-4a34-313130315a56",
|
||||
"hostid_strict_check": 0,
|
||||
"interfaces": "vnet0:bridge0",
|
||||
"ip4": "new",
|
||||
"ip4_addr": "none",
|
||||
"ip4_saddrsel": 1,
|
||||
"ip6": "new",
|
||||
"ip6_addr": "none",
|
||||
"ip6_saddrsel": 1,
|
||||
"ip_hostname": 0,
|
||||
"jail_zfs": 0,
|
||||
"jail_zfs_mountpoint": "none",
|
||||
"last_started": "none",
|
||||
"localhost_ip": "none",
|
||||
"login_flags": "-f root",
|
||||
"mac_prefix": "2c44fd",
|
||||
"maxproc": "off",
|
||||
"memorylocked": "off",
|
||||
"memoryuse": "off",
|
||||
"min_dyn_devfs_ruleset": "1000",
|
||||
"mount_devfs": 1,
|
||||
"mount_fdescfs": 1,
|
||||
"mount_linprocfs": 0,
|
||||
"mount_procfs": 0,
|
||||
"mountpoint": "readonly",
|
||||
"msgqqueued": "off",
|
||||
"msgqsize": "off",
|
||||
"nat": 0,
|
||||
"nat_backend": "ipfw",
|
||||
"nat_forwards": "none",
|
||||
"nat_interface": "none",
|
||||
"nat_prefix": "172.16",
|
||||
"nmsgq": "off",
|
||||
"notes": "none",
|
||||
"nsem": "off",
|
||||
"nsemop": "off",
|
||||
"nshm": "off",
|
||||
"nthr": "off",
|
||||
"openfiles": "off",
|
||||
"origin": "readonly",
|
||||
"owner": "root",
|
||||
"pcpu": "off",
|
||||
"plugin_name": "none",
|
||||
"plugin_repository": "none",
|
||||
"priority": "99",
|
||||
"pseudoterminals": "off",
|
||||
"quota": "none",
|
||||
"readbps": "off",
|
||||
"readiops": "off",
|
||||
"reservation": "none",
|
||||
"resolver": "/etc/resolv.conf",
|
||||
"rlimits": "off",
|
||||
"rtsold": 0,
|
||||
"securelevel": "2",
|
||||
"shmsize": "off",
|
||||
"stacksize": "off",
|
||||
"stop_timeout": "30",
|
||||
"swapuse": "off",
|
||||
"sync_state": "none",
|
||||
"sync_target": "none",
|
||||
"sync_tgt_zpool": "none",
|
||||
"sysvmsg": "new",
|
||||
"sysvsem": "new",
|
||||
"sysvshm": "new",
|
||||
"template": 0,
|
||||
"type": "jail",
|
||||
"used": "readonly",
|
||||
"vmemoryuse": "off",
|
||||
"vnet": 0,
|
||||
"vnet0_mac": "none",
|
||||
"vnet1_mac": "none",
|
||||
"vnet2_mac": "none",
|
||||
"vnet3_mac": "none",
|
||||
"vnet_default_interface": "auto",
|
||||
"vnet_interfaces": "none",
|
||||
"wallclock": "off",
|
||||
"writebps": "off",
|
||||
"writeiops": "off"
|
||||
}
|
||||
|
||||
fbsdUpdateConfig = `# $FreeBSD$
|
||||
|
||||
# Trusted keyprint. Changing this is a Bad Idea unless you've received
|
||||
# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
|
||||
# change it and explaining why.
|
||||
KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
|
||||
|
||||
# Server or server pool from which to fetch updates. You can change
|
||||
# this to point at a specific server if you want, but in most cases
|
||||
# using a "nearby" server won't provide a measurable improvement in
|
||||
# performance.
|
||||
ServerName update.FreeBSD.org
|
||||
|
||||
# Components of the base system which should be kept updated.
|
||||
Components world
|
||||
|
||||
# Example for updating the userland and the kernel source code only:
|
||||
# Components src/base src/sys world
|
||||
|
||||
# Paths which start with anything matching an entry in an IgnorePaths
|
||||
# statement will be ignored.
|
||||
IgnorePaths
|
||||
|
||||
# Paths which start with anything matching an entry in an IDSIgnorePaths
|
||||
# statement will be ignored by "freebsd-update IDS".
|
||||
IDSIgnorePaths /usr/share/man/cat
|
||||
IDSIgnorePaths /usr/share/man/whatis
|
||||
IDSIgnorePaths /var/db/locate.database
|
||||
IDSIgnorePaths /var/log
|
||||
|
||||
# Paths which start with anything matching an entry in an UpdateIfUnmodified
|
||||
# statement will only be updated if the contents of the file have not been
|
||||
# modified by the user (unless changes are merged; see below).
|
||||
UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
|
||||
|
||||
# When upgrading to a new FreeBSD release, files which match MergeChanges
|
||||
# will have any local changes merged into the version from the new release.
|
||||
MergeChanges /etc/
|
||||
|
||||
### Default configuration options:
|
||||
|
||||
# Directory in which to store downloaded updates and temporary
|
||||
# files used by FreeBSD Update.
|
||||
WorkDir /iocage/freebsd-update
|
||||
|
||||
# Destination to send output of "freebsd-update cron" if an error
|
||||
# occurs or updates have been downloaded.
|
||||
# MailTo root
|
||||
|
||||
# Is FreeBSD Update allowed to create new files?
|
||||
# AllowAdd yes
|
||||
|
||||
# Is FreeBSD Update allowed to delete files?
|
||||
# AllowDelete yes
|
||||
|
||||
# If the user has modified file ownership, permissions, or flags, should
|
||||
# FreeBSD Update retain this modified metadata when installing a new version
|
||||
# of that file?
|
||||
# KeepModifiedMetadata yes
|
||||
|
||||
# When upgrading between releases, should the list of Components be
|
||||
# read strictly (StrictComponents yes) or merely as a list of components
|
||||
# which *might* be installed of which FreeBSD Update should figure out
|
||||
# which actually are installed and upgrade those (StrictComponents no)?
|
||||
StrictComponents yes
|
||||
|
||||
# When installing a new kernel perform a backup of the old one first
|
||||
# so it is possible to boot the old kernel in case of problems.
|
||||
BackupKernel no
|
||||
|
||||
# If BackupKernel is enabled, the backup kernel is saved to this
|
||||
# directory.
|
||||
# BackupKernelDir /boot/kernel.old
|
||||
|
||||
# When backing up a kernel also back up debug symbol files?
|
||||
BackupKernelSymbolFiles no
|
||||
|
||||
# Create a new boot environment when installing patches
|
||||
CreateBootEnv no
|
||||
`
|
||||
|
||||
gDefaultsJson = `{
|
||||
"CONFIG_VERSION": "27",
|
||||
"allow_chflags": 0,
|
||||
"allow_mlock": 0,
|
||||
"allow_mount": 0,
|
||||
"allow_mount_devfs": 0,
|
||||
"allow_mount_fusefs": 0,
|
||||
"allow_mount_nullfs": 0,
|
||||
"allow_mount_procfs": 0,
|
||||
"allow_mount_tmpfs": 0,
|
||||
"allow_mount_zfs": 0,
|
||||
"allow_quotas": 0,
|
||||
"allow_raw_sockets": 0,
|
||||
"allow_set_hostname": 1,
|
||||
"allow_socket_af": 0,
|
||||
"allow_sysvipc": 0,
|
||||
"allow_tun": 0,
|
||||
"allow_vmm": 0,
|
||||
"assign_localhost": 0,
|
||||
"available": "readonly",
|
||||
"basejail": 0,
|
||||
"boot": 0,
|
||||
"bpf": 0,
|
||||
"children_max": "0",
|
||||
"comment": "none",
|
||||
"compression": "lz4",
|
||||
"compressratio": "readonly",
|
||||
"coredumpsize": "off",
|
||||
"count": "1",
|
||||
"cpuset": "off",
|
||||
"cputime": "off",
|
||||
"datasize": "off",
|
||||
"dedup": "off",
|
||||
"defaultrouter": "auto",
|
||||
"defaultrouter6": "auto",
|
||||
"depends": "none",
|
||||
"devfs_ruleset": "4",
|
||||
"dhcp": 0,
|
||||
"enforce_statfs": "2",
|
||||
"exec_clean": 1,
|
||||
"exec_created": "/usr/bin/true",
|
||||
"exec_fib": "0",
|
||||
"exec_jail_user": "root",
|
||||
"exec_poststart": "/usr/bin/true",
|
||||
"exec_poststop": "/usr/bin/true",
|
||||
"exec_prestart": "/usr/bin/true",
|
||||
"exec_prestop": "/usr/bin/true",
|
||||
"exec_start": "/bin/sh /etc/rc",
|
||||
"exec_stop": "/bin/sh /etc/rc.shutdown",
|
||||
"exec_system_jail_user": "0",
|
||||
"exec_system_user": "root",
|
||||
"exec_timeout": "60",
|
||||
"host_domainname": "none",
|
||||
"host_time": 1,
|
||||
"hostid": "TO-BE-REPLACED-WITH-HOSTID",
|
||||
"hostid_strict_check": 0,
|
||||
"interfaces": "vnet0:TO-BE-REPLACED-WITH-BRIDGE",
|
||||
"ip4": "new",
|
||||
"ip4_addr": "none",
|
||||
"ip4_saddrsel": 1,
|
||||
"ip6": "new",
|
||||
"ip6_addr": "none",
|
||||
"ip6_saddrsel": 1,
|
||||
"ip_hostname": 0,
|
||||
"jail_zfs": 0,
|
||||
"jail_zfs_mountpoint": "none",
|
||||
"last_started": "none",
|
||||
"localhost_ip": "none",
|
||||
"login_flags": "-f root",
|
||||
"mac_prefix": "2c44fd",
|
||||
"maxproc": "off",
|
||||
"memorylocked": "off",
|
||||
"memoryuse": "off",
|
||||
"min_dyn_devfs_ruleset": "1000",
|
||||
"mount_devfs": 1,
|
||||
"mount_fdescfs": 1,
|
||||
"mount_linprocfs": 0,
|
||||
"mount_procfs": 0,
|
||||
"mountpoint": "readonly",
|
||||
"msgqqueued": "off",
|
||||
"msgqsize": "off",
|
||||
"nat": 0,
|
||||
"nat_backend": "ipfw",
|
||||
"nat_forwards": "none",
|
||||
"nat_interface": "none",
|
||||
"nat_prefix": "172.16",
|
||||
"nmsgq": "off",
|
||||
"notes": "none",
|
||||
"nsem": "off",
|
||||
"nsemop": "off",
|
||||
"nshm": "off",
|
||||
"nthr": "off",
|
||||
"openfiles": "off",
|
||||
"origin": "readonly",
|
||||
"owner": "root",
|
||||
"pcpu": "off",
|
||||
"plugin_name": "none",
|
||||
"plugin_repository": "none",
|
||||
"priority": "99",
|
||||
"pseudoterminals": "off",
|
||||
"quota": "none",
|
||||
"readbps": "off",
|
||||
"readiops": "off",
|
||||
"reservation": "none",
|
||||
"resolver": "/etc/resolv.conf",
|
||||
"rlimits": "off",
|
||||
"rtsold": 0,
|
||||
"securelevel": "2",
|
||||
"shmsize": "off",
|
||||
"stacksize": "off",
|
||||
"stop_timeout": "30",
|
||||
"swapuse": "off",
|
||||
"sync_state": "none",
|
||||
"sync_target": "none",
|
||||
"sync_tgt_zpool": "none",
|
||||
"sysvmsg": "new",
|
||||
"sysvsem": "new",
|
||||
"sysvshm": "new",
|
||||
"template": 0,
|
||||
"type": "jail",
|
||||
"used": "readonly",
|
||||
"vmemoryuse": "off",
|
||||
"vnet": 0,
|
||||
"vnet0_mac": "none",
|
||||
"vnet1_mac": "none",
|
||||
"vnet2_mac": "none",
|
||||
"vnet3_mac": "none",
|
||||
"vnet_default_interface": "auto",
|
||||
"vnet_interfaces": "none",
|
||||
"wallclock": "off",
|
||||
"writebps": "off",
|
||||
"writeiops": "off"
|
||||
}
|
||||
`
|
||||
)
|
||||
|
||||
@ -362,7 +443,7 @@ func executeCommand(cmdline string) (string, error) {
|
||||
out, err = exec.Command(cmd[0]).CombinedOutput()
|
||||
}
|
||||
|
||||
return string(out), err
|
||||
return strings.TrimSuffix(string(out), "\n"), err
|
||||
}
|
||||
|
||||
/* From iocage:
|
||||
@ -812,7 +893,9 @@ func zfsCreateDataset(dataset, mountpoint, compression string) error {
|
||||
}
|
||||
// Return dataset name for a given mountpoint
|
||||
func zfsGetDatasetByMountpoint(mountpoint string) (string, error) {
|
||||
cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
|
||||
// We dont want no recursivity
|
||||
//cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
|
||||
cmd := fmt.Sprintf("zfs list -p -H -o name %s", mountpoint)
|
||||
out, err := executeCommand(cmd)
|
||||
if err != nil {
|
||||
return "", errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
|
||||
@ -866,6 +949,17 @@ func getPermissions(path string) (os.FileInfo, error) {
|
||||
return os.Stat(path)
|
||||
}
|
||||
|
||||
func doFileExist(filePath string) (bool, error) {
|
||||
if _, err := os.Stat(filePath); err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return false, nil
|
||||
} else {
|
||||
return false, err
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* rc.conf management
|
||||
@ -891,7 +985,7 @@ func disableRcKey(rcconfpath string, key string) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
cmd = fmt.Sprintf("/usr/sbin/sysrc -f %s -x %s", rcconfpath, key)
|
||||
_, err = executeCommand(cmd)
|
||||
if err != nil {
|
||||
@ -900,6 +994,43 @@ func disableRcKey(rcconfpath string, key string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// returns no error if rc key does not exist
|
||||
func getCurrentRcKeyValue(rcconfpath string, key string) (string, error) {
|
||||
cmd := "/usr/sbin/sysrc -a"
|
||||
kvs, err := executeCommand(cmd)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
for _, kv := range strings.Split(string(kvs), "\n") {
|
||||
fmt.Printf("%s\n", kv)
|
||||
if strings.HasPrefix(kv, fmt.Sprintf("%s:", key)) {
|
||||
return strings.TrimPrefix(strings.Join(strings.Split(kv, ":")[1:], ":"), " "), nil
|
||||
}
|
||||
}
|
||||
|
||||
return "", nil
|
||||
}
|
||||
|
||||
// Add a value to current existing key value
|
||||
func addRcKeyValue(rcconfpath string, key string, value string) error {
|
||||
var nv string
|
||||
cv, err := getCurrentRcKeyValue(rcconfpath, key)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(cv) > 0 {
|
||||
log.Debugf("Current value of %s: %s\n", key, cv)
|
||||
nv = fmt.Sprintf("\"%s %s\"", cv, value)
|
||||
} else {
|
||||
nv = fmt.Sprintf("\"%s\"", value)
|
||||
}
|
||||
cmd := fmt.Sprintf("/usr/sbin/sysrc -f %s %s=%s", rcconfpath, key, nv)
|
||||
_, err = executeCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
/*****************************************************************************
|
||||
* Parse an fstab file, returning an array of Mount
|
||||
*****************************************************************************/
|
||||
|
||||
29
go.mod
29
go.mod
@ -10,8 +10,8 @@ require (
|
||||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
|
||||
github.com/otiai10/copy v1.12.0
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
github.com/spf13/cobra v1.2.1
|
||||
github.com/spf13/viper v1.9.0
|
||||
github.com/spf13/cobra v1.8.1
|
||||
github.com/spf13/viper v1.19.0
|
||||
golang.org/x/net v0.25.0
|
||||
)
|
||||
|
||||
@ -20,7 +20,7 @@ require (
|
||||
github.com/bytedance/sonic/loader v0.1.1 // indirect
|
||||
github.com/cloudwego/base64x v0.1.4 // indirect
|
||||
github.com/cloudwego/iasm v0.2.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.5.1 // indirect
|
||||
github.com/fsnotify/fsnotify v1.7.0 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
@ -28,30 +28,33 @@ require (
|
||||
github.com/go-playground/validator/v10 v10.20.0 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/magiconair/properties v1.8.5 // indirect
|
||||
github.com/magiconair/properties v1.8.7 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/mitchellh/mapstructure v1.4.2 // indirect
|
||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/pelletier/go-toml v1.9.4 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
||||
github.com/spf13/afero v1.6.0 // indirect
|
||||
github.com/spf13/cast v1.4.1 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||
github.com/sagikazarmark/locafero v0.4.0 // indirect
|
||||
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
|
||||
github.com/sourcegraph/conc v0.3.0 // indirect
|
||||
github.com/spf13/afero v1.11.0 // indirect
|
||||
github.com/spf13/cast v1.6.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/subosito/gotenv v1.2.0 // indirect
|
||||
github.com/subosito/gotenv v1.6.0 // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||
go.uber.org/atomic v1.9.0 // indirect
|
||||
go.uber.org/multierr v1.9.0 // indirect
|
||||
golang.org/x/arch v0.8.0 // indirect
|
||||
golang.org/x/crypto v0.23.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
|
||||
golang.org/x/sys v0.20.0 // indirect
|
||||
golang.org/x/text v0.15.0 // indirect
|
||||
google.golang.org/protobuf v1.34.1 // indirect
|
||||
gopkg.in/ini.v1 v1.63.2 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user