San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2008 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 17 | #define ATRACE_TAG ATRACE_TAG_PACKAGE_MANAGER |
| 18 | |
Jeff Sharkey | 11c2d38 | 2017-09-11 10:32:01 -0600 | [diff] [blame] | 19 | #include "model/Disk.h" |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 20 | #include "VolumeManager.h" |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 21 | #include "NetlinkManager.h" |
Jeff Sharkey | 068c6be | 2017-09-06 13:47:40 -0600 | [diff] [blame] | 22 | #include "VoldNativeService.h" |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 23 | #include "VoldUtil.h" |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 24 | #include "cryptfs.h" |
| 25 | #include "sehandle.h" |
| 26 | |
Elliott Hughes | 7e128fb | 2015-12-04 15:50:53 -0800 | [diff] [blame] | 27 | #include <android-base/logging.h> |
Jeff Sharkey | 3472e52 | 2017-10-06 18:02:53 -0600 | [diff] [blame] | 28 | #include <android-base/properties.h> |
Elliott Hughes | 7e128fb | 2015-12-04 15:50:53 -0800 | [diff] [blame] | 29 | #include <android-base/stringprintf.h> |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 30 | #include <cutils/klog.h> |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 31 | #include <utils/Trace.h> |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 32 | |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 33 | #include <stdio.h> |
| 34 | #include <stdlib.h> |
| 35 | #include <errno.h> |
| 36 | #include <string.h> |
San Mehat | 3578c41 | 2009-10-12 14:51:52 -0700 | [diff] [blame] | 37 | #include <sys/stat.h> |
| 38 | #include <sys/types.h> |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 39 | #include <getopt.h> |
San Mehat | 3578c41 | 2009-10-12 14:51:52 -0700 | [diff] [blame] | 40 | #include <fcntl.h> |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 41 | #include <dirent.h> |
Ken Sumrall | 56ad03c | 2013-02-13 13:00:19 -0800 | [diff] [blame] | 42 | #include <fs_mgr.h> |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 43 | |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 44 | static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quota, |
| 45 | bool* has_reserved); |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 46 | static void coldboot(const char *path); |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 47 | static void parse_args(int argc, char** argv); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 48 | |
Stephen Smalley | 684e662 | 2014-09-30 10:29:24 -0400 | [diff] [blame] | 49 | struct selabel_handle *sehandle; |
| 50 | |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 51 | using android::base::StringPrintf; |
| 52 | |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 53 | int main(int argc, char** argv) { |
Paul Crowley | 0fd2626 | 2018-01-30 09:48:19 -0800 | [diff] [blame] | 54 | atrace_set_tracing_enabled(false); |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 55 | setenv("ANDROID_LOG_TAGS", "*:v", 1); |
Jeff Sharkey | 5bad378 | 2015-04-18 16:15:10 -0700 | [diff] [blame] | 56 | android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM)); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 57 | |
Paul Crowley | 0fd2626 | 2018-01-30 09:48:19 -0800 | [diff] [blame] | 58 | LOG(INFO) << "Vold 3.0 (the awakening) firing up"; |
| 59 | |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 60 | ATRACE_BEGIN("main"); |
| 61 | |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 62 | |
Jeff Sharkey | d0640f6 | 2015-05-21 22:35:42 -0700 | [diff] [blame] | 63 | LOG(VERBOSE) << "Detected support for:" |
Dan Pasanen | d195266 | 2015-10-27 22:52:37 -0500 | [diff] [blame] | 64 | << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "") |
Jeff Sharkey | d0640f6 | 2015-05-21 22:35:42 -0700 | [diff] [blame] | 65 | << (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "") |
| 66 | << (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "") |
Dan Pasanen | d195266 | 2015-10-27 22:52:37 -0500 | [diff] [blame] | 67 | << (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "") |
Jeff Sharkey | d0640f6 | 2015-05-21 22:35:42 -0700 | [diff] [blame] | 68 | << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : ""); |
| 69 | |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 70 | VolumeManager *vm; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 71 | NetlinkManager *nm; |
| 72 | |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 73 | parse_args(argc, argv); |
San Mehat | a2677e4 | 2009-12-13 10:40:18 -0800 | [diff] [blame] | 74 | |
Stephen Smalley | 684e662 | 2014-09-30 10:29:24 -0400 | [diff] [blame] | 75 | sehandle = selinux_android_file_context_handle(); |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 76 | if (sehandle) { |
Stephen Smalley | 684e662 | 2014-09-30 10:29:24 -0400 | [diff] [blame] | 77 | selinux_android_set_sehandle(sehandle); |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 78 | } |
Stephen Smalley | 684e662 | 2014-09-30 10:29:24 -0400 | [diff] [blame] | 79 | |
San Mehat | a2677e4 | 2009-12-13 10:40:18 -0800 | [diff] [blame] | 80 | mkdir("/dev/block/vold", 0755); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 81 | |
Ken Sumrall | b9738ea | 2013-03-19 19:42:30 -0700 | [diff] [blame] | 82 | /* For when cryptfs checks and mounts an encrypted filesystem */ |
| 83 | klog_set_level(6); |
| 84 | |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 85 | /* Create our singleton managers */ |
| 86 | if (!(vm = VolumeManager::Instance())) { |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 87 | LOG(ERROR) << "Unable to create VolumeManager"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 88 | exit(1); |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 89 | } |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 90 | |
| 91 | if (!(nm = NetlinkManager::Instance())) { |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 92 | LOG(ERROR) << "Unable to create NetlinkManager"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 93 | exit(1); |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 94 | } |
San Mehat | a2677e4 | 2009-12-13 10:40:18 -0800 | [diff] [blame] | 95 | |
Jeff Sharkey | 3472e52 | 2017-10-06 18:02:53 -0600 | [diff] [blame] | 96 | if (android::base::GetBoolProperty("vold.debug", false)) { |
Jeff Sharkey | b066787 | 2015-04-29 08:57:18 -0700 | [diff] [blame] | 97 | vm->setDebug(true); |
| 98 | } |
| 99 | |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 100 | if (vm->start()) { |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 101 | PLOG(ERROR) << "Unable to start VolumeManager"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 102 | exit(1); |
| 103 | } |
| 104 | |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 105 | bool has_adoptable; |
Jeff Sharkey | 95a92f9 | 2017-07-17 13:57:18 -0600 | [diff] [blame] | 106 | bool has_quota; |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 107 | bool has_reserved; |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 108 | |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 109 | if (process_config(vm, &has_adoptable, &has_quota, &has_reserved)) { |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 110 | PLOG(ERROR) << "Error reading configuration... continuing anyways"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 111 | } |
| 112 | |
Paul Crowley | 3188805 | 2017-09-27 10:56:54 -0700 | [diff] [blame] | 113 | ATRACE_BEGIN("VoldNativeService::start"); |
| 114 | if (android::vold::VoldNativeService::start() != android::OK) { |
| 115 | LOG(ERROR) << "Unable to start VoldNativeService"; |
| 116 | exit(1); |
| 117 | } |
| 118 | ATRACE_END(); |
| 119 | |
Paul Crowley | 0fd2626 | 2018-01-30 09:48:19 -0800 | [diff] [blame] | 120 | LOG(DEBUG) << "VoldNativeService::start() completed OK"; |
| 121 | |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 122 | ATRACE_BEGIN("NetlinkManager::start"); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 123 | if (nm->start()) { |
Jeff Sharkey | 9f18fe7 | 2015-04-01 23:32:18 -0700 | [diff] [blame] | 124 | PLOG(ERROR) << "Unable to start NetlinkManager"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 125 | exit(1); |
| 126 | } |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 127 | ATRACE_END(); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 128 | |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 129 | // This call should go after listeners are started to avoid |
| 130 | // a deadlock between vold and init (see b/34278978 for details) |
Jeff Sharkey | 3472e52 | 2017-10-06 18:02:53 -0600 | [diff] [blame] | 131 | android::base::SetProperty("vold.has_adoptable", has_adoptable ? "1" : "0"); |
| 132 | android::base::SetProperty("vold.has_quota", has_quota ? "1" : "0"); |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 133 | android::base::SetProperty("vold.has_reserved", has_reserved ? "1" : "0"); |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 134 | |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 135 | // Do coldboot here so it won't block booting, |
| 136 | // also the cold boot is needed in case we have flash drive |
| 137 | // connected before Vold launched |
| 138 | coldboot("/sys/block"); |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 139 | |
| 140 | ATRACE_END(); |
| 141 | |
Jeff Sharkey | 93396c1 | 2017-10-18 16:52:48 -0600 | [diff] [blame] | 142 | android::IPCThreadState::self()->joinThreadPool(); |
| 143 | LOG(INFO) << "vold shutting down"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 144 | |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 145 | exit(0); |
| 146 | } |
| 147 | |
Jeff Sharkey | 95c87cc | 2015-04-01 11:54:32 -0700 | [diff] [blame] | 148 | static void parse_args(int argc, char** argv) { |
| 149 | static struct option opts[] = { |
| 150 | {"blkid_context", required_argument, 0, 'b' }, |
| 151 | {"blkid_untrusted_context", required_argument, 0, 'B' }, |
| 152 | {"fsck_context", required_argument, 0, 'f' }, |
| 153 | {"fsck_untrusted_context", required_argument, 0, 'F' }, |
| 154 | }; |
| 155 | |
| 156 | int c; |
| 157 | while ((c = getopt_long(argc, argv, "", opts, nullptr)) != -1) { |
| 158 | switch (c) { |
| 159 | case 'b': android::vold::sBlkidContext = optarg; break; |
| 160 | case 'B': android::vold::sBlkidUntrustedContext = optarg; break; |
| 161 | case 'f': android::vold::sFsckContext = optarg; break; |
| 162 | case 'F': android::vold::sFsckUntrustedContext = optarg; break; |
| 163 | } |
| 164 | } |
| 165 | |
| 166 | CHECK(android::vold::sBlkidContext != nullptr); |
| 167 | CHECK(android::vold::sBlkidUntrustedContext != nullptr); |
| 168 | CHECK(android::vold::sFsckContext != nullptr); |
| 169 | CHECK(android::vold::sFsckUntrustedContext != nullptr); |
| 170 | } |
| 171 | |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 172 | static void do_coldboot(DIR *d, int lvl) { |
| 173 | struct dirent *de; |
| 174 | int dfd, fd; |
| 175 | |
| 176 | dfd = dirfd(d); |
| 177 | |
| 178 | fd = openat(dfd, "uevent", O_WRONLY | O_CLOEXEC); |
| 179 | if(fd >= 0) { |
| 180 | write(fd, "add\n", 4); |
| 181 | close(fd); |
| 182 | } |
| 183 | |
| 184 | while((de = readdir(d))) { |
| 185 | DIR *d2; |
| 186 | |
| 187 | if (de->d_name[0] == '.') |
| 188 | continue; |
| 189 | |
| 190 | if (de->d_type != DT_DIR && lvl > 0) |
| 191 | continue; |
| 192 | |
Jeff Sharkey | fd3dc3c | 2017-03-27 10:49:21 -0600 | [diff] [blame] | 193 | fd = openat(dfd, de->d_name, O_RDONLY | O_DIRECTORY | O_CLOEXEC); |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 194 | if(fd < 0) |
| 195 | continue; |
| 196 | |
| 197 | d2 = fdopendir(fd); |
| 198 | if(d2 == 0) |
| 199 | close(fd); |
| 200 | else { |
| 201 | do_coldboot(d2, lvl + 1); |
| 202 | closedir(d2); |
| 203 | } |
| 204 | } |
| 205 | } |
| 206 | |
| 207 | static void coldboot(const char *path) { |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 208 | ATRACE_NAME("coldboot"); |
Wei Wang | 2edbe28 | 2017-03-06 17:27:05 -0800 | [diff] [blame] | 209 | DIR *d = opendir(path); |
| 210 | if(d) { |
| 211 | do_coldboot(d, 0); |
| 212 | closedir(d); |
| 213 | } |
| 214 | } |
| 215 | |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 216 | static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quota, |
| 217 | bool* has_reserved) { |
Jeff Sharkey | 67b8c49 | 2017-09-21 17:08:43 -0600 | [diff] [blame] | 218 | ATRACE_NAME("process_config"); |
| 219 | |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 220 | fstab_default = fs_mgr_read_fstab_default(); |
| 221 | if (!fstab_default) { |
Bowgo Tsai | e8fb6c3 | 2017-03-09 23:11:33 +0800 | [diff] [blame] | 222 | PLOG(ERROR) << "Failed to open default fstab"; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 223 | return -1; |
| 224 | } |
| 225 | |
Ken Sumrall | 56ad03c | 2013-02-13 13:00:19 -0800 | [diff] [blame] | 226 | /* Loop through entries looking for ones that vold manages */ |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 227 | *has_adoptable = false; |
Jeff Sharkey | 95a92f9 | 2017-07-17 13:57:18 -0600 | [diff] [blame] | 228 | *has_quota = false; |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 229 | *has_reserved = false; |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 230 | for (int i = 0; i < fstab_default->num_entries; i++) { |
| 231 | auto rec = &fstab_default->recs[i]; |
| 232 | if (fs_mgr_is_quota(rec)) { |
Jeff Sharkey | 95a92f9 | 2017-07-17 13:57:18 -0600 | [diff] [blame] | 233 | *has_quota = true; |
| 234 | } |
Jeff Sharkey | 53d5d7c | 2018-01-08 10:43:00 -0700 | [diff] [blame] | 235 | if (rec->reserved_size > 0) { |
| 236 | *has_reserved = true; |
| 237 | } |
Jeff Sharkey | 95a92f9 | 2017-07-17 13:57:18 -0600 | [diff] [blame] | 238 | |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 239 | if (fs_mgr_is_voldmanaged(rec)) { |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 240 | std::string sysPattern(rec->blk_device); |
Tom Marshall | d18795d | 2015-11-05 11:20:54 -0800 | [diff] [blame] | 241 | std::string fstype; |
| 242 | if (rec->fs_type) { |
| 243 | fstype = rec->fs_type; |
| 244 | } |
| 245 | std::string mntopts; |
| 246 | if (rec->fs_options) { |
| 247 | mntopts = rec->fs_options; |
| 248 | } |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 249 | std::string nickname(rec->label); |
Tom Marshall | af69324 | 2015-11-04 15:44:44 -0800 | [diff] [blame] | 250 | int partnum = rec->partnum; |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 251 | int flags = 0; |
| 252 | |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 253 | if (fs_mgr_is_encryptable(rec)) { |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 254 | flags |= android::vold::Disk::Flags::kAdoptable; |
Dimitry Ivanov | c976e73 | 2017-01-19 12:48:27 -0800 | [diff] [blame] | 255 | *has_adoptable = true; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 256 | } |
Paul Crowley | e2ee152 | 2017-09-26 14:05:26 -0700 | [diff] [blame] | 257 | if (fs_mgr_is_noemulatedsd(rec) |
Jeff Sharkey | 3472e52 | 2017-10-06 18:02:53 -0600 | [diff] [blame] | 258 | || android::base::GetBoolProperty("vold.debug.default_primary", false)) { |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 259 | flags |= android::vold::Disk::Flags::kDefaultPrimary; |
Jeff Sharkey | ba6ae8d | 2013-07-15 18:14:25 -0700 | [diff] [blame] | 260 | } |
Tom Marshall | af69324 | 2015-11-04 15:44:44 -0800 | [diff] [blame] | 261 | if (fs_mgr_is_nonremovable(rec)) { |
| 262 | flags |= android::vold::Disk::Flags::kNonRemovable; |
| 263 | } |
Ken Sumrall | 29d8da8 | 2011-05-18 17:20:07 -0700 | [diff] [blame] | 264 | |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 265 | vm->addDiskSource(std::shared_ptr<VolumeManager::DiskSource>( |
Tom Marshall | d18795d | 2015-11-05 11:20:54 -0800 | [diff] [blame] | 266 | new VolumeManager::DiskSource(sysPattern, nickname, partnum, flags, |
| 267 | fstype, mntopts))); |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 268 | } |
| 269 | } |
Jeff Sharkey | 36801cc | 2015-03-13 16:09:20 -0700 | [diff] [blame] | 270 | return 0; |
San Mehat | f1b736b | 2009-10-10 17:22:08 -0700 | [diff] [blame] | 271 | } |