aboutsummaryrefslogtreecommitdiffstats
path: root/libinstaller
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-06-24 13:30:49 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-24 13:30:49 -0700
commit8ab23dd287bba04d19db1e66828320d12739c0e3 (patch)
treec7b494f18dbfb3cf80ef356cbfaa3880371998cb /libinstaller
parent2e8b89f8b2d711a1689067834113483610fa18cd (diff)
parent06b5bd5a470cf4aad212aa81a26c8a5e03a48b2c (diff)
downloadsyslinux-8ab23dd287bba04d19db1e66828320d12739c0e3.tar.gz
syslinux-8ab23dd287bba04d19db1e66828320d12739c0e3.tar.xz
syslinux-8ab23dd287bba04d19db1e66828320d12739c0e3.zip
Merge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinuxsyslinux-4.00-pre59
Diffstat (limited to 'libinstaller')
-rw-r--r--libinstaller/advio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libinstaller/advio.c b/libinstaller/advio.c
index 3112fa42..7bfc098c 100644
--- a/libinstaller/advio.c
+++ b/libinstaller/advio.c
@@ -36,8 +36,8 @@
/*
* Read the ADV from an existing instance, or initialize if invalid.
- * Returns -1 on fatal errors, 0 if ADV is okay, and 1 if no valid
- * ADV was found.
+ * Returns -1 on fatal errors, 0 if ADV is okay, 1 if the ADV is
+ * invalid, and 2 if the file does not exist.
*/
int read_adv(const char *path, const char *cfg)
{
@@ -60,6 +60,7 @@ int read_adv(const char *path, const char *cfg)
err = -1;
} else {
syslinux_reset_adv(syslinux_adv);
+ err = 2; /* Nonexistence is not a fatal error */
}
} else if (fstat(fd, &st)) {
err = -1;