From: Lennart Poettering Date: Tue, 11 Mar 2014 16:27:58 +0000 (+0100) Subject: gpt-auto-generator: rename root device node symlink to /dev/gpt-auto-root X-Git-Tag: v211~22 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=98b2f766b24c84fc49a4df954717b1f96bbce00d;ds=sidebyside 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. --- diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 19e450de1..475b15153 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 be91977de..e487f6438 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",