Commit d1416422 authored by Per Olofsson's avatar Per Olofsson

correct patches screwup, delete unnecessary-linkage.patch

parent 859c8366
......@@ -12,12 +12,12 @@ Last-Update: 2010-03-29
--- a/src/startup.c
+++ b/src/startup.c
@@ -186,7 +186,8 @@ static void load_config(void)
syslog(LOG_ERR, "chdir to %s failed: %m", configpath);
exit(EXIT_FAILURE);
}
- parse_configfile("config.opts");
+ if (parse_configfile("config.opts") == -1)
+ parse_configfile("/usr/lib/pcmciautils/config.opts");
return;
syslog(LOG_ERR, "chdir to %s failed: %m", configpath);
exit(EXIT_FAILURE);
}
- parse_configfile("config.opts");
+ if (parse_configfile("config.opts") == -1)
+ parse_configfile("/usr/lib/pcmciautils/config.opts");
return;
}
......@@ -6,7 +6,7 @@ Last-Update: 2010-03-29
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ endif
@@ -212,7 +212,7 @@ endif
#udev rules collection
UDEV_RULES_FILE = udev/60-pcmcia.rules
......
no-modprobe-rules.patch
config-opts-fallback.patch
unnecessary-linkage.patch
......@@ -182,13 +182,13 @@ static int disallow_irq(unsigned int socket_no, unsigned int irq)
static void load_config(void)
{
if (chdir(configpath) != 0) {
syslog(LOG_ERR, "chdir to %s failed: %m", configpath);
exit(EXIT_FAILURE);
}
if (parse_configfile("config.opts") == -1)
parse_configfile("/usr/lib/pcmciautils/config.opts");
return;
if (chdir(configpath) != 0) {
syslog(LOG_ERR, "chdir to %s failed: %m", configpath);
exit(EXIT_FAILURE);
}
if (parse_configfile("config.opts") == -1)
parse_configfile("/usr/lib/pcmciautils/config.opts");
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment