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 19e450de1cd1d427ad9d5519a93331d959bcf0a8..475b15153525b20ce4fee819da3c943cea1a08e1 100644 (file)
--- 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_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"
 
 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 be91977de9aa298b79653d288a9d7cb8287ca535..e487f64386892d4e0917c918a711c3369e0c49e8 100644 (file)
--- 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",
 
         return add_mount(
                         "root",

-                        "/dev/disk/by-id/gpt-auto-root",
+                        "/dev/gpt-auto-root",

                         in_initrd() ? "/sysroot" : "/",
                         NULL,
                         arg_root_rw ? "rw" : "ro",
                         in_initrd() ? "/sysroot" : "/",
                         NULL,
                         arg_root_rw ? "rw" : "ro",