Browse Source

Merge "update gentoo systemd profile to 17.1 from 17.0"

tags/2.26.0
Zuul 1 month ago
parent
commit
3de4b71b9e

+ 5
- 5
diskimage_builder/elements/gentoo/README.rst View File

@@ -26,11 +26,11 @@ Notes:
26 26
 * Other profiles can be used by exporting GENTOO_PROFILE with a valid profile.
27 27
   A list of valid profiles follows:
28 28
 
29
-    default/linux/amd64/17.0
30
-    default/linux/amd64/17.0/no-multilib
31
-    default/linux/amd64/17.0/hardened
32
-    default/linux/amd64/17.0/no-multilib/hardened
33
-    default/linux/amd64/17.0/systemd
29
+    default/linux/amd64/17.1
30
+    default/linux/amd64/17.1/no-multilib
31
+    default/linux/amd64/17.1/hardened
32
+    default/linux/amd64/17.1/no-multilib/hardened
33
+    default/linux/amd64/17.1/systemd
34 34
 
35 35
 * You can set the `GENTOO_PORTAGE_CLEANUP` environment variable to False to
36 36
   disable the clean up of portage repositories (including overlays).  This

+ 2
- 2
diskimage_builder/elements/gentoo/root.d/10-gentoo-image View File

@@ -51,7 +51,7 @@ elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/hardened" ]]; then
51 51
 elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/no-multilib/hardened" ]]; then
52 52
     FILENAME_BASE='gentoo-stage4-hardened-nomultilib'
53 53
     SIGNED_SOURCE_SUFFIX='hardened+minimal-nomultilib'
54
-elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.0/systemd" ]]; then
54
+elif [[ "${GENTOO_PROFILE}" == "default/linux/amd64/17.1/systemd" ]]; then
55 55
     FILENAME_BASE='gentoo-stage4-systemd'
56 56
     SIGNED_SOURCE_SUFFIX='systemd'
57 57
 else
@@ -60,7 +60,7 @@ else
60 60
     echo 'default/linux/amd64/17.1/no-multilib'
61 61
     echo 'default/linux/amd64/17.1/hardened'
62 62
     echo 'default/linux/amd64/17.1/no-multilib/hardened'
63
-    echo 'default/linux/amd64/17.0/systemd'
63
+    echo 'default/linux/amd64/17.1/systemd'
64 64
     exit 1
65 65
 fi
66 66
 

Loading…
Cancel
Save