diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-11 17:27:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-03-11 17:43:41 +0100 |
| commit | 98b2f766b24c84fc49a4df954717b1f96bbce00d (patch) | |
| tree | 202c1630316aadd44af6214e9efe78c6fcd14515 | |
| parent | f401e2b24ba17452f9655993a6dedefdffe06d23 (diff) | |
gpt-auto-generator: rename root device node symlink to /dev/gpt-auto-root
Before it was placed in /dev/disk/by-id, which makes it a bit too much
API. However, it's mostly an implementation detail for now, hence move
it out of the stable block device dir.
| -rw-r--r-- | rules/60-persistent-storage.rules | 2 | ||||
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 19e450de1c..475b151535 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -85,6 +85,6 @@ ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/ ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="disk/by-partlabel/$env{ID_PART_ENTRY_NAME}" # add symlink to GPT root disk -ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_GPT_AUTO_ROOT}=="1", SYMLINK+="disk/by-id/gpt-auto-root" +ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_GPT_AUTO_ROOT}=="1", SYMLINK+="gpt-auto-root" LABEL="persistent_storage_end" diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index be91977de9..e487f64386 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -702,7 +702,7 @@ static int add_root_mount(void) { return add_mount( "root", - "/dev/disk/by-id/gpt-auto-root", + "/dev/gpt-auto-root", in_initrd() ? "/sysroot" : "/", NULL, arg_root_rw ? "rw" : "ro", |