X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=489ecd7364fb7bd8582af14b9ba777098c0c688f;hp=3804b34da08fcf781438db1abfaf04205c4cc373;hb=a2441c75956929293359888a4169114267a5fdbf;hpb=eea8cf830616dbbd9024b7d704cf0ccf2dac4767 diff --git a/discover/device-handler.c b/discover/device-handler.c index 3804b34..489ecd7 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -1099,10 +1099,12 @@ static char *device_from_addr(void *ctx, struct pb_url *url) rc = process_run_sync(p); - if (rc) { + if (rc || p->exit_status) { /* ip has complained for some reason; most likely * there is no route to the host - bail out */ - pb_debug("%s: No route to %s\n",__func__,url->host); + pb_debug("%s: `ip` returns non-zero exit status\n", __func__); + pb_debug("ip buf: %s\n", p->stdout_buf); + process_release(p); return NULL; } @@ -1125,9 +1127,8 @@ static char *device_from_addr(void *ctx, struct pb_url *url) return dev; } - void device_handler_process_url(struct device_handler *handler, - const char *url) + const char *url, const char *mac, const char *ip) { struct discover_context *ctx; struct discover_device *dev; @@ -1153,11 +1154,25 @@ void device_handler_process_url(struct device_handler *handler, event->type = EVENT_TYPE_USER; event->action = EVENT_ACTION_CONF; - event->params = talloc_array(event, struct param, 1); - param = &event->params[0]; - param->name = talloc_strdup(event, "pxeconffile"); - param->value = talloc_strdup(event, url); - event->n_params = 1; + if (url[strlen(url) - 1] == '/') { + event->params = talloc_array(event, struct param, 3); + param = &event->params[0]; + param->name = talloc_strdup(event, "pxepathprefix"); + param->value = talloc_strdup(event, url); + param = &event->params[1]; + param->name = talloc_strdup(event, "mac"); + param->value = talloc_strdup(event, mac); + param = &event->params[2]; + param->name = talloc_strdup(event, "ip"); + param->value = talloc_strdup(event, ip); + event->n_params = 3; + } else { + event->params = talloc_array(event, struct param, 1); + param = &event->params[0]; + param->name = talloc_strdup(event, "pxeconffile"); + param->value = talloc_strdup(event, url); + event->n_params = 1; + } pb_url = pb_url_parse(event, event->params->value); if (!pb_url || !pb_url->host) { @@ -1243,33 +1258,31 @@ static void device_handler_reinit_sources(struct device_handler *handler) handler->dry_run); } -static const char *fs_parameters(struct discover_device *dev, - unsigned int rw_flags) +static inline const char *get_device_path(struct discover_device *dev) { - const char *fstype = discover_device_get_param(dev, "ID_FS_TYPE"); - - /* XFS journals are not cross-endian compatible; don't try recovery - * even if we have a snapshot */ - if (!strncmp(fstype, "xfs", strlen("xfs"))) - return "norecovery"; - - /* If we have a snapshot available allow touching the filesystem */ - if (dev->ramdisk) - return ""; + return dev->ramdisk ? dev->ramdisk->snapshot : dev->device_path; +} - if ((rw_flags | MS_RDONLY) != MS_RDONLY) - return ""; +static char *check_subvols(struct discover_device *dev) +{ + const char *fstype = discover_device_get_param(dev, "ID_FS_TYPE"); + struct stat sb; + char *path; + int rc; - /* Avoid writes due to journal replay if we don't have a snapshot */ - if (!strncmp(fstype, "ext4", strlen("ext4"))) - return "norecovery"; + if (strncmp(fstype, "btrfs", strlen("btrfs"))) + return dev->mount_path; - return ""; -} + /* On btrfs a device's root may be under a subvolume path */ + path = join_paths(dev, dev->mount_path, "@"); + rc = stat(path, &sb); + if (!rc && S_ISDIR(sb.st_mode)) { + pb_debug("Using '%s' for btrfs root path\n", path); + return path; + } -static inline const char *get_device_path(struct discover_device *dev) -{ - return dev->ramdisk ? dev->ramdisk->snapshot : dev->device_path; + talloc_free(path); + return dev->mount_path; } static bool check_existing_mount(struct discover_device *dev) @@ -1313,6 +1326,7 @@ static bool check_existing_mount(struct discover_device *dev) if (mntstat.st_rdev == devstat.st_rdev) { dev->mount_path = talloc_strdup(dev, mnt->mnt_dir); + dev->root_path = check_subvols(dev); dev->mounted_rw = !!hasmntopt(mnt, "rw"); dev->mounted = true; dev->unmount = false; @@ -1330,6 +1344,52 @@ static bool check_existing_mount(struct discover_device *dev) return mnt != NULL; } +/* + * Attempt to mount a filesystem safely, while handling certain filesytem- + * specific options + */ +static int try_mount(const char *device_path, const char *mount_path, + const char *fstype, unsigned long flags, + bool have_snapshot) +{ + const char *fs, *safe_opts; + int rc; + + /* Mount ext3 as ext4 instead so 'norecovery' can be used */ + if (strncmp(fstype, "ext3", strlen("ext3")) == 0) { + pb_debug("Mounting ext3 filesystem as ext4\n"); + fs = "ext4"; + } else + fs = fstype; + + if (strncmp(fs, "xfs", strlen("xfs")) == 0 || + strncmp(fs, "ext4", strlen("ext4")) == 0) + safe_opts = "norecovery"; + else + safe_opts = NULL; + + errno = 0; + /* If no snapshot is available don't attempt recovery */ + if (!have_snapshot) + return mount(device_path, mount_path, fs, flags, safe_opts); + + rc = mount(device_path, mount_path, fs, flags, NULL); + + if (!rc) + return rc; + + /* Mounting failed; some filesystems will fail to mount if a recovery + * journal exists (eg. cross-endian XFS), so try again with norecovery + * where that option is available. + * If mounting read-write just return the error as norecovery is not a + * valid option */ + if ((flags & MS_RDONLY) != MS_RDONLY || !safe_opts) + return rc; + + errno = 0; + return mount(device_path, mount_path, fs, flags, safe_opts); +} + static int mount_device(struct discover_device *dev) { const char *fstype, *device_path; @@ -1348,13 +1408,6 @@ static int mount_device(struct discover_device *dev) if (!fstype) return 0; - /* ext3 treats the norecovery option as an error, so mount the device - * as an ext4 filesystem instead */ - if (!strncmp(fstype, "ext3", strlen("ext3"))) { - pb_debug("Mounting ext3 filesystem as ext4\n"); - fstype = talloc_asprintf(dev, "ext4"); - } - dev->mount_path = join_paths(dev, mount_base(), dev->device_path); @@ -1367,14 +1420,14 @@ static int mount_device(struct discover_device *dev) device_path = get_device_path(dev); pb_log("mounting device %s read-only\n", dev->device_path); - errno = 0; - rc = mount(device_path, dev->mount_path, fstype, - MS_RDONLY | MS_SILENT, - fs_parameters(dev, MS_RDONLY)); + rc = try_mount(device_path, dev->mount_path, fstype, + MS_RDONLY | MS_SILENT, dev->ramdisk); + if (!rc) { dev->mounted = true; dev->mounted_rw = false; dev->unmount = true; + dev->root_path = check_subvols(dev); return 0; } @@ -1413,6 +1466,7 @@ static int umount_device(struct discover_device *dev) talloc_free(dev->mount_path); dev->mount_path = NULL; + dev->root_path = NULL; return 0; } @@ -1448,9 +1502,8 @@ int device_request_write(struct discover_device *dev, bool *release) return -1; } - rc = mount(device_path, dev->mount_path, fstype, - MS_SILENT, - fs_parameters(dev, MS_REMOUNT)); + rc = try_mount(device_path, dev->mount_path, fstype, + MS_SILENT, dev->ramdisk); if (rc) goto mount_ro; @@ -1461,9 +1514,9 @@ int device_request_write(struct discover_device *dev, bool *release) mount_ro: pb_log("Unable to remount device %s read-write: %s\n", device_path, strerror(errno)); - if (mount(device_path, dev->mount_path, fstype, - MS_RDONLY | MS_SILENT, - fs_parameters(dev, MS_RDONLY))) + rc = try_mount(device_path, dev->mount_path, fstype, + MS_RDONLY | MS_SILENT, dev->ramdisk); + if (rc) pb_log("Unable to recover mount for %s: %s\n", device_path, strerror(errno)); return -1; @@ -1494,9 +1547,8 @@ void device_release_write(struct discover_device *dev, bool release) device_path = get_device_path(dev); } - if (mount(device_path, dev->mount_path, fstype, - MS_RDONLY | MS_SILENT, - fs_parameters(dev, MS_RDONLY))) + if (try_mount(device_path, dev->mount_path, fstype, + MS_RDONLY | MS_SILENT, dev->ramdisk)) pb_log("Failed to remount %s read-only: %s\n", device_path, strerror(errno)); else