From 96361b80e7cf9486ebf97b47ffc0dcec5fb1b070 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Mon, 11 Oct 2021 15:35:53 +0200
Subject: [PATCH 1/3] [g5k-postinstall] Add missing hack in help text

---
 g5k-postinstall | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/g5k-postinstall b/g5k-postinstall
index 7ec8c2fd..7dce6efc 100755
--- a/g5k-postinstall
+++ b/g5k-postinstall
@@ -121,10 +121,13 @@ No reference API option:
 Disable hacks option:
   g5k-postinstall includes hacks that can optionally be disabled.
   Current hacks are:
-  - oot-i40e      install the i40e driver on chifflot and chiclet (lille) and
-                  grappe (nancy)
-  - beegfs-gr520  configure beegfs shares on grcinq and grvingt (nancy)
-Example: --disable-hacks oot-i40e
+  - oot-i40e        install the i40e driver on chifflot and chiclet (lille) and
+                    grappe (nancy) on debian9 environment.
+  - force-net-name  on several clusters, the predictible network interface name
+                    can change depending on udev version. This hack forces the
+                    predictible network interface name in such cases.
+  - beegfs-gr520    configure beegfs shares on grcinq and grvingt (nancy).
+Example: --disable-hacks oot-i40e,force-net-name
 
 DETAILS
 
-- 
GitLab


From 44cf2ca0eff54d84c6842051de9af79d40099a60 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Fri, 8 Oct 2021 20:22:47 +0200
Subject: [PATCH 2/3] Introduce new option --disk-aliases (disabled by default)

---
 g5k-postinstall | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/g5k-postinstall b/g5k-postinstall
index 7dce6efc..4ebd67d9 100755
--- a/g5k-postinstall
+++ b/g5k-postinstall
@@ -12,6 +12,7 @@ $inittab = nil
 $restrictuser = 'none'
 $no_ref_api = false
 $guix = true
+$disk_aliases = false
 $nfs_mount_options = '_netdev,rw,hard,async,nodev,nosuid,auto'
 $args = ARGV.dup
 $bootloader = []
@@ -52,6 +53,9 @@ BANNER
   opts.on("--no-guix", "Disable guix") do
     $guix = false
   end
+  opts.on("--disk-aliases", "Enable disk aliases (e.g. /dev/disk0p1)") do
+    $disk_aliases = true
+  end
 
   opts.separator <<DETAILS
 
@@ -557,11 +561,12 @@ end
 
 ########################### Disk aliases #####################################
 
-$myjson.fetch('storage_devices', []).each do |disk|
-  $logger.info("Writing udev rules for /dev/#{disk['id']} aliases")
-  pci_path = disk['by_path'].split('/').last
-  File::open("#{DSTDIR}/etc/udev/rules.d/90-disk-alias-#{disk['id']}-g5k.rules", "a") do |fd|
-    fd.puts <<-EOF
+if $disk_aliases
+  $myjson.fetch('storage_devices', []).each do |disk|
+    $logger.info("Writing udev rules for /dev/#{disk['id']} aliases")
+    pci_path = disk['by_path'].split('/').last
+    File::open("#{DSTDIR}/etc/udev/rules.d/90-disk-alias-#{disk['id']}-g5k.rules", "a") do |fd|
+      fd.puts <<-EOF
 SUBSYSTEM!="block", GOTO="end"
 
 # Normal rule
@@ -582,8 +587,9 @@ ENV{DEVTYPE}=="partition", ENV{G5K_ALIAS}=="?*", SYMLINK+="$env{G5K_ALIAS}"
 
 LABEL="end"
 EOF
-  end
-end
+    end # File::open
+  end # $myjson.fetch
+end # $disk_aliases
 
 ####################################### guix with autofs ###################################
 if $fstab.include?('nfs') and $guix and not $fstab.include?('no-autofs')
-- 
GitLab


From 484852fd34c6b16904ff66327357ab03c139ce1d Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Mon, 11 Oct 2021 15:44:34 +0200
Subject: [PATCH 3/3] [g5k-postinstall] Document new --disk-aliases option

---
 g5k-postinstall | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/g5k-postinstall b/g5k-postinstall
index 4ebd67d9..0157e82b 100755
--- a/g5k-postinstall
+++ b/g5k-postinstall
@@ -133,6 +133,16 @@ Disable hacks option:
   - beegfs-gr520    configure beegfs shares on grcinq and grvingt (nancy).
 Example: --disable-hacks oot-i40e,force-net-name
 
+Disk aliases option:
+  g5k-postinstall can optionally install udev rules to provide predictible disk aliases.
+  Example of disk aliases automatically created by these udev rules:
+    /dev/disk0   -> /dev/sdb
+    /dev/disk0p2 -> /dev/sdb2
+    /dev/disk1   -> /dev/nvme0n1
+    /dev/disk1p4 -> /dev/nvme0n1p4
+  This is useful because, starting from Linux 5.3, traditional block device names
+  are non-deterministic: /dev/sda might not refer to the same disk on every boot.
+
 DETAILS
 
 end.parse!
-- 
GitLab