diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-22 12:55:39 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-22 21:22:39 +0000 |
| commit | 8eadc208e15023d9fa92cf08ff03c29ac55bf183 (patch) | |
| tree | def82eff864a01acb1e623aa15317006d207c0d5 /libpod/sql_state_internal.go | |
| parent | 6a4fcb168a47b0419b7a5cef48e3c7d0b42a9438 (diff) | |
| download | podman-8eadc208e15023d9fa92cf08ff03c29ac55bf183.tar.gz podman-8eadc208e15023d9fa92cf08ff03c29ac55bf183.tar.bz2 podman-8eadc208e15023d9fa92cf08ff03c29ac55bf183.zip | |
Remove No New Privs from DB as it's already in the spec
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #383
Approved by: rhatdan
Diffstat (limited to 'libpod/sql_state_internal.go')
| -rw-r--r-- | libpod/sql_state_internal.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go index 9cc4cd861..d0771e0d8 100644 --- a/libpod/sql_state_internal.go +++ b/libpod/sql_state_internal.go @@ -213,7 +213,6 @@ func prepareDB(db *sql.DB) (err error) { LogPath TEXT NOT NULL, Privileged INTEGER NOT NULL, - NoNewPrivs INTEGER NOT NULL, ProcessLabel TEXT NOT NULL, MountLabel TEXT NOT NULL, User TEXT NOT NULL, @@ -242,7 +241,6 @@ func prepareDB(db *sql.DB) (err error) { CHECK (ImageVolumes IN (0, 1)), CHECK (SHMSize>=0), CHECK (Privileged IN (0, 1)), - CHECK (NoNewPrivs IN (0, 1)), CHECK (CreateNetNS IN (0, 1)), CHECK (Stdin IN (0, 1)), CHECK (StopSignal>=0), @@ -448,7 +446,6 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) { logPath string privileged int - noNewPrivs int processLabel string mountLabel string user string @@ -503,7 +500,6 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) { &logPath, &privileged, - &noNewPrivs, &processLabel, &mountLabel, &user, @@ -566,7 +562,6 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) { ctr.config.LogPath = logPath ctr.config.Privileged = boolFromSQL(privileged) - ctr.config.NoNewPrivs = boolFromSQL(noNewPrivs) ctr.config.ProcessLabel = processLabel ctr.config.MountLabel = mountLabel ctr.config.User = user @@ -753,7 +748,7 @@ func (s *SQLState) addContainer(ctr *Container, pod *Pod) (err error) { ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, - ?, ?, ?, ? + ?, ?, ? );` addCtrState = `INSERT INTO containerState VALUES ( ?, ?, ?, ?, ?, @@ -881,7 +876,6 @@ func (s *SQLState) addContainer(ctr *Container, pod *Pod) (err error) { ctr.config.LogPath, boolToSQL(ctr.config.Privileged), - boolToSQL(ctr.config.NoNewPrivs), ctr.config.ProcessLabel, ctr.config.MountLabel, ctr.config.User, |