X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=9de2a1901ea16b41f1f78513bec59cfbfc302f87;hp=9246f0dd865ea3218f6bb5d6869553a64295e1ba;hb=6e5cd61065181460be8152a73dfc79f94ecd27fe;hpb=70907c3fc4b344d00ce900e6a536e9cc16a35216 diff --git a/discover/device-handler.c b/discover/device-handler.c index 9246f0d..9de2a19 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -862,7 +862,13 @@ int device_handler_discover(struct device_handler *handler, status = talloc_zero(handler, struct boot_status); status->type = BOOT_STATUS_INFO; - status->message = talloc_asprintf(status, "Processing %s device %s", + /* + * TRANSLATORS: this string will be passed the type and identifier + * of the device. For example, the first parameter could be "Disk", + * (which will be translated accordingly) and the second a Linux device + * identifier like 'sda1' (which will not be translated) + */ + status->message = talloc_asprintf(status, _("Processing %s device %s"), device_type_display_name(dev->device->type), dev->device->id); boot_status(handler, status); @@ -887,7 +893,11 @@ int device_handler_discover(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); out: - status->message = talloc_asprintf(status,"Processing %s complete\n", + /* + * TRANSLATORS: the format specifier in this string is a Linux + * device identifier, like 'sda1' + */ + status->message = talloc_asprintf(status,_("Processing %s complete"), dev->device->id); boot_status(handler, status); @@ -906,7 +916,11 @@ int device_handler_dhcp(struct device_handler *handler, status = talloc_zero(handler, struct boot_status); status->type = BOOT_STATUS_INFO; - status->message = talloc_asprintf(status, "Processing dhcp event on %s", + /* + * TRANSLATORS: this format specifier will be the name of a network + * device, like 'eth0'. + */ + status->message = talloc_asprintf(status, _("Processing dhcp event on %s"), dev->device->id); boot_status(handler, status); @@ -918,7 +932,11 @@ int device_handler_dhcp(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); - status->message = talloc_asprintf(status,"Processing %s complete\n", + /* + * TRANSLATORS: this format specifier will be the name of a network + * device, like 'eth0'. + */ + status->message = talloc_asprintf(status,_("Processing %s complete"), dev->device->id); boot_status(handler, status); @@ -937,7 +955,7 @@ int device_handler_conf(struct device_handler *handler, status = talloc_zero(handler, struct boot_status); status->type = BOOT_STATUS_INFO; - status->message = talloc_asprintf(status, "Processing user config"); + status->message = talloc_asprintf(status, _("Processing user config")); boot_status(handler, status); /* create our context */ @@ -949,7 +967,7 @@ int device_handler_conf(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); status->message = talloc_asprintf(status, - "Processing user config complete"); + _("Processing user config complete")); boot_status(handler, status); talloc_free(status); @@ -1081,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; } @@ -1107,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; @@ -1135,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) { @@ -1225,16 +1258,26 @@ static void device_handler_reinit_sources(struct device_handler *handler) handler->dry_run); } -static const char *fs_parameters(unsigned int rw_flags, const char *fstype) +static const char *fs_parameters(struct discover_device *dev, + unsigned int rw_flags) { + 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 ""; + if ((rw_flags | MS_RDONLY) != MS_RDONLY) return ""; - /* Avoid writing back to the disk on journaled filesystems */ + /* Avoid writes due to journal replay if we don't have a snapshot */ if (!strncmp(fstype, "ext4", strlen("ext4"))) return "norecovery"; - if (!strncmp(fstype, "xfs", strlen("xfs"))) - return "norecovery"; return ""; } @@ -1244,6 +1287,28 @@ static inline const char *get_device_path(struct discover_device *dev) return dev->ramdisk ? dev->ramdisk->snapshot : dev->device_path; } +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; + + if (strncmp(fstype, "btrfs", strlen("btrfs"))) + return dev->mount_path; + + /* 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; + } + + talloc_free(path); + return dev->mount_path; +} + static bool check_existing_mount(struct discover_device *dev) { struct stat devstat, mntstat; @@ -1285,6 +1350,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; @@ -1342,11 +1408,12 @@ static int mount_device(struct discover_device *dev) errno = 0; rc = mount(device_path, dev->mount_path, fstype, MS_RDONLY | MS_SILENT, - fs_parameters(MS_RDONLY, fstype)); + fs_parameters(dev, MS_RDONLY)); if (!rc) { dev->mounted = true; dev->mounted_rw = false; dev->unmount = true; + dev->root_path = check_subvols(dev); return 0; } @@ -1385,6 +1452,7 @@ static int umount_device(struct discover_device *dev) talloc_free(dev->mount_path); dev->mount_path = NULL; + dev->root_path = NULL; return 0; } @@ -1422,7 +1490,7 @@ int device_request_write(struct discover_device *dev, bool *release) rc = mount(device_path, dev->mount_path, fstype, MS_SILENT, - fs_parameters(MS_REMOUNT, fstype)); + fs_parameters(dev, MS_REMOUNT)); if (rc) goto mount_ro; @@ -1435,7 +1503,7 @@ mount_ro: device_path, strerror(errno)); if (mount(device_path, dev->mount_path, fstype, MS_RDONLY | MS_SILENT, - fs_parameters(MS_RDONLY, fstype))) + fs_parameters(dev, MS_RDONLY))) pb_log("Unable to recover mount for %s: %s\n", device_path, strerror(errno)); return -1; @@ -1444,7 +1512,6 @@ mount_ro: void device_release_write(struct discover_device *dev, bool release) { const char *fstype, *device_path; - int rc = 0; if (!release) return; @@ -1467,10 +1534,9 @@ void device_release_write(struct discover_device *dev, bool release) device_path = get_device_path(dev); } - mount(device_path, dev->mount_path, fstype, + if (mount(device_path, dev->mount_path, fstype, MS_RDONLY | MS_SILENT, - fs_parameters(MS_RDONLY, fstype)); - if (rc) + fs_parameters(dev, MS_RDONLY))) pb_log("Failed to remount %s read-only: %s\n", device_path, strerror(errno)); else