-#include "udev-helper.h"
+#include "parser.h"
#include "params.h"
#include "yaboot-cfg.h"
static struct device *dev;
static const char *mountpoint;
-static char partition_mntpoint[PATH_MAX];
static char *defimage;
char *
return buffer;
}
-static char *prepend_mountpoint(const char *path)
-{
- char *full_path;
-
- full_path = malloc(strlen(path) + strlen(mountpoint) + 2);
-
- strcpy(full_path, mountpoint);
- if (path[0] != '/')
- strcat(full_path, "/");
- strcat(full_path, path);
-
- return full_path;
-}
-
static int check_and_add_device(struct device *dev)
{
if (!dev->icon_file)
opt.name = label;
cfgopt = cfg_get_strg(label, "image");
- opt.boot_image_file = prepend_mountpoint(cfgopt);
+ opt.boot_image_file = resolve_path(cfgopt, mountpoint);
if (cfgopt == defimage)
- printf("This one is default. What do we do about it?\n");
+ pb_log("This one is default. What do we do about it?\n");
cfgopt = cfg_get_strg(label, "initrd");
if (cfgopt)
- opt.initrd_file = prepend_mountpoint(cfgopt);
+ opt.initrd_file = resolve_path(cfgopt, mountpoint);
opt.boot_args = make_params(label, NULL);
mountpoint = _mountpoint;
- filepath = prepend_mountpoint("/etc/yaboot.conf");
+ filepath = join_paths(mountpoint, "/etc/yaboot.conf");
fd = open(filepath, O_RDONLY);
if (fd < 0) {
free(filepath);
- filepath = prepend_mountpoint("/yaboot.conf");
+ filepath = join_paths(mountpoint, "/yaboot.conf");
fd = open(filepath, O_RDONLY);
if (fd < 0)
close(fd);
if (cfg_parse(filepath, conf_file, conf_len)) {
- printf("Error parsing yaboot.conf\n");
+ pb_log("Error parsing yaboot.conf\n");
return 0;
}
}
dev->icon_file = strdup(generic_icon_file(guess_device_type()));
- /* Mount the 'partition' which is what all the image filenames
- are relative to */
+ /* If we have a 'partiton=' directive, update the default mountpoint
+ * to use that instead of the current mountpoint */
tmpstr = cfg_get_strg(0, "partition");
if (tmpstr) {
char *endp;
/* and add our own... */
sprintf(endp+1, "%d", partnr);
- /* FIXME: udev may not have created the device node
- yet. And on removal, unmount_device() only unmounts
- it once, while in fact it may be mounted twice. */
- if (mount_device(new_dev, partition_mntpoint)) {
- printf("Error mounting image partition\n");
- return 0;
- }
- mountpoint = partition_mntpoint;
+ mountpoint = mountpoint_for_device(new_dev);
dev->id = new_dev;
- }
+ }
}
defimage = cfg_get_default();