Merge pull request #1370 from evgenyz/chroot

matusmarhefka · web-flow · commit b0362cc59bcf · 2019-07-15T13:06:13.000+02:00
Fix #1173, RHBZ#1603347: Double chdir/chroot in probe rpmverifypackage
diff --git a/src/OVAL/probes/unix/linux/rpmverifypackage_probe.c b/src/OVAL/probes/unix/linux/rpmverifypackage_probe.c
@@ -314,8 +314,7 @@ static int rpmverify_collect(probe_ctx *ctx,
 
 int rpmverifypackage_probe_offline_mode_supported()
 {
-	// TODO: Switch this to OFFLINE_MODE_OWN once rpmtsSetRootDir is fully supported by librpm
-	return PROBE_OFFLINE_CHROOT;
+	return PROBE_OFFLINE_OWN;
 }
 
 void *rpmverifypackage_probe_init(void)

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ static int rpmverify_collect(probe_ctx *ctx,`
`314`	`314`
`315`	`315`	`int rpmverifypackage_probe_offline_mode_supported()`
`316`	`316`	`{`
`317`		`- // TODO: Switch this to OFFLINE_MODE_OWN once rpmtsSetRootDir is fully supported by librpm`
`318`		`- return PROBE_OFFLINE_CHROOT;`
	`317`	`+ return PROBE_OFFLINE_OWN;`
`319`	`318`	`}`
`320`	`319`
`321`	`320`	`void *rpmverifypackage_probe_init(void)`