24d9449 Move rc script starting to pkgdb_register — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Move rc script starting to pkgdb_register

Baptiste Daroussin committed 14 years ago

commit 24d944969116614f3f1dc80b30153966d8478051
parent e8db4d0

2 files changed +18 -8

modified libpkg/pkg_add.c

@@ -218,14 +218,6 @@ pkg_add(struct pkgdb *db, const char *path, int flags)

 	else
 		pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL);
 	/*
 	 * start the different related services if the users do want that
 	 * and that the service is running
 	 */
 	handle_rc = pkg_config("HANDLE_RC_SCRIPTS");
 	if (handle_rc && ((strcmp(handle_rc, "yes") == 0) || (strcmp(handle_rc, "YES") == 0)))
 		pkg_start_rc_scripts(pkg);
 	cleanup_reg:
 	if ((flags & PKG_ADD_UPGRADE) == 0)
 		pkgdb_register_finale(db, retcode);

modified libpkg/pkgdb.c

@@ -1627,6 +1627,16 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	if (stmt_users != NULL)
 		sqlite3_finalize(stmt_users);
 	if (!complete) {
 		/*
 		 * start the different related services if the users do want that
 		 * and that the service is running
 		 */
 		handle_rc = pkg_config("HANDLE_RC_SCRIPTS");
 		if (handle_rc && ((strcmp(handle_rc, "yes") == 0) || (strcmp(handle_rc, "YES") == 0)))
 			pkg_start_rc_scripts(pkg);
 	}
 	return (retcode);
 }

@@ -1649,6 +1659,14 @@ pkgdb_register_finale(struct pkgdb *db, int retcode)

 	PKGDB_UNSET_FLAG(db, PKGDB_FLAG_IN_FLIGHT);
 	/*
 	 * start the different related services if the users do want that
 	 * and that the service is running
 	 */
 	handle_rc = pkg_config("HANDLE_RC_SCRIPTS");
 	if (handle_rc && ((strcmp(handle_rc, "yes") == 0) || (strcmp(handle_rc, "YES") == 0)))
 		pkg_start_rc_scripts(pkg);
 	return (ret);
 }