Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37749628
en ru br
Репозитории ALT
5.1: 2.4.27-alt11
4.1: 2.4.27-alt11
4.0: 2.4.27-alt10
3.0: 2.4.27-alt4
www.altlinux.org/Changes

Группа :: Система/Ядро и оборудование
Пакет: modutils

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: modutils-2.4.27-alt-no-builtin.patch
Скачать


--- modutils-2.4.27/util/config.c.alt-no-builtin	2007-01-06 17:43:46 +0300
+++ modutils-2.4.27/util/config.c	2007-01-06 18:55:29 +0300
@@ -109,6 +109,7 @@
 int root_check_off = CONFIG_ROOT_CHECK_OFF;	/* Default is modules must be owned by root */
 static char *config_version;	/* Hack for config_add */
 int quick = 0;			/* Option -A */
+int flag_no_builtin = 0;	/* Option --no-builtin */
 
 /* The initialization order must match the gen_file_enum order in config.h */
 struct gen_files gen_file[] = {
@@ -731,19 +732,19 @@
 		/*
 		 * Build predef options
 		 */
-		if (all && optlist[0])
+		if (all && optlist[0] && !flag_no_builtin)
 			n_opt_list = build_list(optlist, &opt_list, version, 1);
 
 		/*
 		 * Build predef above
 		 */
-		if (all && above[0])
+		if (all && above[0] && !flag_no_builtin)
 			n_abovelist = build_list(above, &abovelist, version, 0);
 
 		/*
 		 * Build predef below
 		 */
-		if (all && below[0])
+		if (all && below[0] && !flag_no_builtin)
 			n_belowlist = build_list(below, &belowlist, version, 0);
 
 		/*
@@ -755,20 +756,20 @@
 		/*
 		 * Build predef aliases
 		 */
-		if (all && aliaslist[0])
+		if (all && aliaslist[0] && !flag_no_builtin)
 			n_aliases = build_list(aliaslist, &aliases, version, 0);
 		
 		/*
 		 * Build predef postinstalls
 		 */
-		if (all && post_install[0])
+		if (all && post_install[0] && !flag_no_builtin)
 			for (i=0 ; post_install[i] ; i++ )
 				decode_exec(xstrdup(post_install[i]), EXEC_POST_INSTALL);
 		
 		/*
 		 * Build predef preremoves
 		 */
-		if (all && pre_remove[0])
+		if (all && pre_remove[0] && !flag_no_builtin)
 			for (i=0 ; pre_remove[i] ; i++ )
 				decode_exec(xstrdup(pre_remove[i]), EXEC_PRE_REMOVE);
 
@@ -1542,7 +1543,7 @@
 		return -1;
 	}
 
-	if (access(MODUTILS_MACROS, R_OK) == 0){
+	if (!flag_no_builtin && access(MODUTILS_MACROS, R_OK) == 0){
 		r = do_read(all, force_ver, base_dir, MODUTILS_MACROS, 0);
 		r = do_read(all, force_ver, "", conf_file, 1);
 	} else {
--- modutils-2.4.27/insmod/modprobe.c.alt-no-builtin	2007-01-06 17:43:46 +0300
+++ modutils-2.4.27/insmod/modprobe.c	2007-01-06 18:49:44 +0300
@@ -1618,6 +1618,7 @@
 
 #define OPT_KERNEL_RELEASE	1000
 #define OPT_LIST_MODULE_FILES	1001
+#define OPT_NO_BUILTIN		1002
 
 int main(int argc, char *argv[])
 {
@@ -1649,6 +1650,7 @@
 		{"quiet", 1, 0, 'q'},
 		{"kernel-release", 1, 0, OPT_KERNEL_RELEASE},
 		{"list-module-files", 0, 0, OPT_LIST_MODULE_FILES},
+		{"no-builtin", 0, 0, OPT_NO_BUILTIN},
 		{"help", 0, 0, 'h'},
 		{0, 0, 0, 0}
 	};
@@ -1772,6 +1774,10 @@
 			flag_list_module_files = 1;
 			break;
 
+		case OPT_NO_BUILTIN:
+			flag_no_builtin = 1;
+			break;
+
 		default:
 			ret = -1;
 			break;
--- modutils-2.4.27/include/config.h.alt-no-builtin	2007-01-06 17:43:46 +0300
+++ modutils-2.4.27/include/config.h	2007-01-06 18:48:27 +0300
@@ -57,6 +57,7 @@
 
 /* config.c */
 extern int flag_autoclean;
+extern int flag_no_builtin;
 extern struct utsname uts_info;
 extern char *aliaslist[];
 extern struct PATH_TYPE *modpath;
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin